diff --git a/composer.json b/composer.json
index 65f58d17ea8e987fe3f3b0f3ca6687998d5c1ee9..035602189a791a0a91da70b81c2f1593e82acb2b 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
     "kriswallsmith/assetic": "1.1.*@alpha",
     "symfony-cmf/routing": "1.1.*@alpha",
     "easyrdf/easyrdf": "0.8.*",
-    "phpunit/phpunit": "3.7.*",
+    "phpunit/phpunit": "4.1.*",
     "zendframework/zend-feed": "2.2.*"
   },
   "autoload": {
diff --git a/composer.lock b/composer.lock
index 60e69087103de7e4f59298fc70ee23fc6c31ff9e..4b007c90ce7bcea96e10dc91c19ec2d59504c7cf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "15b33bcba2392fb947bc320f35fcc14e",
+    "hash": "cca4a51cbd3445ccdba4df24bdd2f49e",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -648,35 +648,44 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "1.2.11",
+            "version": "2.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "1.2.11"
+                "reference": "58401826c8cfc8fd689b60026e91c337df374bca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.11",
-                "reference": "1.2.11",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/58401826c8cfc8fd689b60026e91c337df374bca",
+                "reference": "58401826c8cfc8fd689b60026e91c337df374bca",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "phpunit/php-file-iterator": ">=1.3.0@stable",
-                "phpunit/php-text-template": ">=1.1.1@stable",
-                "phpunit/php-token-stream": ">=1.1.3@stable"
+                "phpunit/php-file-iterator": "~1.3.1",
+                "phpunit/php-text-template": "~1.2.0",
+                "phpunit/php-token-stream": "~1.2.2",
+                "sebastian/environment": "~1.0.0",
+                "sebastian/version": "~1.0.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "3.7.*"
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4.0.14"
             },
             "suggest": {
                 "ext-dom": "*",
-                "ext-xdebug": ">=2.0.5"
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
-                    "PHP/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -700,7 +709,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2013-05-23 18:23:24"
+            "time": "2014-05-26 14:55:24"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -749,16 +758,16 @@
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "1.1.4",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
-                "url": "git://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "1.1.4"
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4",
-                "reference": "1.1.4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
                 "shasum": ""
             },
             "require": {
@@ -789,20 +798,20 @@
             "keywords": [
                 "template"
             ],
-            "time": "2012-10-31 11:15:28"
+            "time": "2014-01-30 17:20:04"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.4",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
-                "url": "git://github.com/sebastianbergmann/php-timer.git",
-                "reference": "1.0.4"
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4",
-                "reference": "1.0.4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
                 "shasum": ""
             },
             "require": {
@@ -829,24 +838,24 @@
                 }
             ],
             "description": "Utility class for timing",
-            "homepage": "http://www.phpunit.de/",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
             "keywords": [
                 "timer"
             ],
-            "time": "2012-10-11 04:45:58"
+            "time": "2013-08-02 07:42:54"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.1.5",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
-                "url": "git://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "1.1.5"
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5",
-                "reference": "1.1.5",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32",
+                "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32",
                 "shasum": ""
             },
             "require": {
@@ -854,6 +863,11 @@
                 "php": ">=5.3.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "PHP/"
@@ -874,60 +888,60 @@
                 }
             ],
             "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "http://www.phpunit.de/",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2012-10-11 04:47:14"
+            "time": "2014-03-03 05:10:30"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "3.7.21",
+            "version": "4.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3.7.21"
+                "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.21",
-                "reference": "3.7.21",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/939cb801b3b2aa253aedd0b279f40bb8f35cec91",
+                "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-json": "*",
                 "ext-pcre": "*",
                 "ext-reflection": "*",
                 "ext-spl": "*",
                 "php": ">=5.3.3",
-                "phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
-                "phpunit/php-file-iterator": ">=1.3.1",
-                "phpunit/php-text-template": ">=1.1.1",
-                "phpunit/php-timer": ">=1.0.2,<1.1.0",
-                "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
-                "symfony/yaml": ">=2.0,<3.0"
-            },
-            "require-dev": {
-                "pear-pear/pear": "1.9.4"
+                "phpunit/php-code-coverage": "~2.0",
+                "phpunit/php-file-iterator": "~1.3.1",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "~1.0.2",
+                "phpunit/phpunit-mock-objects": "~2.1",
+                "sebastian/comparator": "~1.0",
+                "sebastian/diff": "~1.1",
+                "sebastian/environment": "~1.0",
+                "sebastian/exporter": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.0"
             },
             "suggest": {
-                "ext-json": "*",
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "phpunit/php-invoker": ">=1.1.0,<1.2.0"
+                "phpunit/php-invoker": "~1.1"
             },
             "bin": [
-                "composer/bin/phpunit"
+                "phpunit"
             ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.7.x-dev"
+                    "dev-master": "4.1.x-dev"
                 }
             },
             "autoload": {
                 "classmap": [
-                    "PHPUnit/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -952,33 +966,41 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2013-05-23 18:54:29"
+            "time": "2014-06-11 14:15:47"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "1.2.3",
+            "version": "2.1.4",
             "source": {
                 "type": "git",
-                "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "1.2.3"
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip",
-                "reference": "1.2.3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f",
+                "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "phpunit/php-text-template": ">=1.1.1@stable"
+                "phpunit/php-text-template": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.1"
             },
             "suggest": {
                 "ext-soap": "*"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
-                    "PHPUnit/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1001,7 +1023,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2013-01-13 10:24:48"
+            "time": "2014-06-07 16:22:57"
         },
         {
             "name": "psr/log",
@@ -1085,6 +1107,274 @@
             ],
             "time": "2013-09-27 01:15:21"
         },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2",
+                "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.1",
+                "sebastian/exporter": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2014-05-02 07:05:58"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
+                "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "http://www.github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2013-08-03 16:46:33"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/79517609ec01139cd7e9fded0dd7ce08c952ef6a",
+                "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.0.*@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2014-02-18 16:17:19"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529",
+                "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.0.*@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net",
+                    "role": "Lead"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2014-02-16 08:26:31"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2014-03-07 15:35:33"
+        },
         {
             "name": "symfony-cmf/routing",
             "version": "1.1.0",
@@ -2103,8 +2393,12 @@
             "time": "2013-06-12 19:46:58"
         }
     ],
-    "packages-dev": [],
-    "aliases": [],
+    "packages-dev": [
+
+    ],
+    "aliases": [
+
+    ],
     "minimum-stability": "stable",
     "stability-flags": {
         "symfony/yaml": 20,
@@ -2116,5 +2410,7 @@
     "platform": {
         "php": ">=5.4.2"
     },
-    "platform-dev": []
+    "platform-dev": [
+
+    ]
 }
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index bec96c44b3ea4ff2494a727df0e27cb8656cd24f..4cfc261f53148977802d84402e325f0a1df480aa 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -779,6 +779,7 @@ function simpletest_phpunit_get_available_tests($module = NULL) {
     // Find all the tests and get a list of unique class names.
     $test_suite = $configuration->getTestSuiteConfiguration(NULL);
     $test_classes = array();
+    /** @var $test_suite \PHPUnit_Framework_TestSuite[] */
     foreach ($test_suite as $test) {
       // PHPUnit returns a warning message if something is wrong with a test,
       // throw an exception to avoid an error when trying to call getInfo() on
@@ -787,9 +788,9 @@ function simpletest_phpunit_get_available_tests($module = NULL) {
         throw new RuntimeException($test->getMessage());
       }
 
-      $name = get_class($test);
-      if (!array_key_exists($name, $test_classes) && (!$module || substr($name, 0, $n) == $prefix)) {
-        $test_classes[$name] = $test->getInfo();
+      $name = $test->getName();
+      if ($test instanceof \Drupal\Tests\UnitTestCase && !array_key_exists($name, $test_classes) && (!$module || substr($name, 0, $n) == $prefix)) {
+        $test_classes[$name] = $test::getInfo();
       }
     }
 
diff --git a/core/vendor/bin/phpunit b/core/vendor/bin/phpunit
index d284b32d0c57e018c28a273169cdb1cdd6025e26..2c48930310589e25e38ac71f5439db0eb1887daf 120000
--- a/core/vendor/bin/phpunit
+++ b/core/vendor/bin/phpunit
@@ -1 +1 @@
-../phpunit/phpunit/composer/bin/phpunit
\ No newline at end of file
+../phpunit/phpunit/phpunit
\ No newline at end of file
diff --git a/core/vendor/composer/autoload_classmap.php b/core/vendor/composer/autoload_classmap.php
index 96f77f2d4929111dccd0f8fc4fc9a5820570d72f..fb97a3912e8083e85363bfa2650096875b235fa3 100644
--- a/core/vendor/composer/autoload_classmap.php
+++ b/core/vendor/composer/autoload_classmap.php
@@ -9,182 +9,197 @@
     'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/File/Iterator.php',
     'File_Iterator_Facade' => $vendorDir . '/phpunit/php-file-iterator/File/Iterator/Facade.php',
     'File_Iterator_Factory' => $vendorDir . '/phpunit/php-file-iterator/File/Iterator/Factory.php',
-    'PHPUnit_Extensions_GroupTestSuite' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/GroupTestSuite.php',
-    'PHPUnit_Extensions_PhptTestCase' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase.php',
-    'PHPUnit_Extensions_PhptTestCase_Logger' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase/Logger.php',
-    'PHPUnit_Extensions_PhptTestSuite' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/PhptTestSuite.php',
-    'PHPUnit_Extensions_RepeatedTest' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/RepeatedTest.php',
-    'PHPUnit_Extensions_TestDecorator' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/TestDecorator.php',
-    'PHPUnit_Extensions_TicketListener' => $vendorDir . '/phpunit/phpunit/PHPUnit/Extensions/TicketListener.php',
-    'PHPUnit_Framework_Assert' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Assert.php',
-    'PHPUnit_Framework_AssertionFailedError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/AssertionFailedError.php',
-    'PHPUnit_Framework_Comparator' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator.php',
-    'PHPUnit_Framework_ComparatorFactory' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/ComparatorFactory.php',
-    'PHPUnit_Framework_Comparator_Array' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Array.php',
-    'PHPUnit_Framework_Comparator_DOMDocument' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/DOMDocument.php',
-    'PHPUnit_Framework_Comparator_Double' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Double.php',
-    'PHPUnit_Framework_Comparator_Exception' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Exception.php',
-    'PHPUnit_Framework_Comparator_MockObject' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/MockObject.php',
-    'PHPUnit_Framework_Comparator_Numeric' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Numeric.php',
-    'PHPUnit_Framework_Comparator_Object' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Object.php',
-    'PHPUnit_Framework_Comparator_Resource' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Resource.php',
-    'PHPUnit_Framework_Comparator_Scalar' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Scalar.php',
-    'PHPUnit_Framework_Comparator_SplObjectStorage' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/SplObjectStorage.php',
-    'PHPUnit_Framework_Comparator_Type' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Comparator/Type.php',
-    'PHPUnit_Framework_ComparisonFailure' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/ComparisonFailure.php',
-    'PHPUnit_Framework_Constraint' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint.php',
-    'PHPUnit_Framework_Constraint_And' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/And.php',
-    'PHPUnit_Framework_Constraint_ArrayHasKey' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ArrayHasKey.php',
-    'PHPUnit_Framework_Constraint_Attribute' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Attribute.php',
-    'PHPUnit_Framework_Constraint_Callback' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Callback.php',
-    'PHPUnit_Framework_Constraint_ClassHasAttribute' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasAttribute.php',
-    'PHPUnit_Framework_Constraint_ClassHasStaticAttribute' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php',
-    'PHPUnit_Framework_Constraint_Composite' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Composite.php',
-    'PHPUnit_Framework_Constraint_Count' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Count.php',
-    'PHPUnit_Framework_Constraint_Exception' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Exception.php',
-    'PHPUnit_Framework_Constraint_ExceptionCode' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionCode.php',
-    'PHPUnit_Framework_Constraint_ExceptionMessage' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionMessage.php',
-    'PHPUnit_Framework_Constraint_FileExists' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/FileExists.php',
-    'PHPUnit_Framework_Constraint_GreaterThan' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/GreaterThan.php',
-    'PHPUnit_Framework_Constraint_IsAnything' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsAnything.php',
-    'PHPUnit_Framework_Constraint_IsEmpty' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEmpty.php',
-    'PHPUnit_Framework_Constraint_IsEqual' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEqual.php',
-    'PHPUnit_Framework_Constraint_IsFalse' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsFalse.php',
-    'PHPUnit_Framework_Constraint_IsIdentical' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsIdentical.php',
-    'PHPUnit_Framework_Constraint_IsInstanceOf' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsInstanceOf.php',
-    'PHPUnit_Framework_Constraint_IsJson' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsJson.php',
-    'PHPUnit_Framework_Constraint_IsNull' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsNull.php',
-    'PHPUnit_Framework_Constraint_IsTrue' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsTrue.php',
-    'PHPUnit_Framework_Constraint_IsType' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/IsType.php',
-    'PHPUnit_Framework_Constraint_JsonMatches' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches.php',
-    'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches/ErrorMessageProvider.php',
-    'PHPUnit_Framework_Constraint_LessThan' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/LessThan.php',
-    'PHPUnit_Framework_Constraint_Not' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Not.php',
-    'PHPUnit_Framework_Constraint_ObjectHasAttribute' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/ObjectHasAttribute.php',
-    'PHPUnit_Framework_Constraint_Or' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Or.php',
-    'PHPUnit_Framework_Constraint_PCREMatch' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/PCREMatch.php',
-    'PHPUnit_Framework_Constraint_SameSize' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/SameSize.php',
-    'PHPUnit_Framework_Constraint_StringContains' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/StringContains.php',
-    'PHPUnit_Framework_Constraint_StringEndsWith' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/StringEndsWith.php',
-    'PHPUnit_Framework_Constraint_StringMatches' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/StringMatches.php',
-    'PHPUnit_Framework_Constraint_StringStartsWith' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/StringStartsWith.php',
-    'PHPUnit_Framework_Constraint_TraversableContains' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContains.php',
-    'PHPUnit_Framework_Constraint_TraversableContainsOnly' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContainsOnly.php',
-    'PHPUnit_Framework_Constraint_Xor' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Constraint/Xor.php',
-    'PHPUnit_Framework_Error' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Error.php',
-    'PHPUnit_Framework_Error_Deprecated' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Error/Deprecated.php',
-    'PHPUnit_Framework_Error_Notice' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Error/Notice.php',
-    'PHPUnit_Framework_Error_Warning' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Error/Warning.php',
-    'PHPUnit_Framework_Exception' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Exception.php',
-    'PHPUnit_Framework_ExpectationFailedException' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/ExpectationFailedException.php',
-    'PHPUnit_Framework_IncompleteTest' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/IncompleteTest.php',
-    'PHPUnit_Framework_IncompleteTestError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/IncompleteTestError.php',
-    'PHPUnit_Framework_MockObject_Builder_Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Identity.php',
-    'PHPUnit_Framework_MockObject_Builder_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/InvocationMocker.php',
-    'PHPUnit_Framework_MockObject_Builder_Match' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Match.php',
-    'PHPUnit_Framework_MockObject_Builder_MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/MethodNameMatch.php',
-    'PHPUnit_Framework_MockObject_Builder_Namespace' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Namespace.php',
-    'PHPUnit_Framework_MockObject_Builder_ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/ParametersMatch.php',
-    'PHPUnit_Framework_MockObject_Builder_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Stub.php',
-    'PHPUnit_Framework_MockObject_Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php',
-    'PHPUnit_Framework_MockObject_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation.php',
-    'PHPUnit_Framework_MockObject_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/InvocationMocker.php',
-    'PHPUnit_Framework_MockObject_Invocation_Object' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Object.php',
-    'PHPUnit_Framework_MockObject_Invocation_Static' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Static.php',
-    'PHPUnit_Framework_MockObject_Invokable' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invokable.php',
-    'PHPUnit_Framework_MockObject_Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher.php',
-    'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyInvokedCount.php',
-    'PHPUnit_Framework_MockObject_Matcher_AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyParameters.php',
-    'PHPUnit_Framework_MockObject_Matcher_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Invocation.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtIndex.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedCount.php',
-    'PHPUnit_Framework_MockObject_Matcher_InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedRecorder.php',
-    'PHPUnit_Framework_MockObject_Matcher_MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/MethodName.php',
-    'PHPUnit_Framework_MockObject_Matcher_Parameters' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Parameters.php',
-    'PHPUnit_Framework_MockObject_Matcher_StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/StatelessInvocation.php',
-    'PHPUnit_Framework_MockObject_MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockBuilder.php',
-    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockObject.php',
-    'PHPUnit_Framework_MockObject_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub.php',
-    'PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php',
-    'PHPUnit_Framework_MockObject_Stub_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Exception.php',
-    'PHPUnit_Framework_MockObject_Stub_MatcherCollection' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/MatcherCollection.php',
-    'PHPUnit_Framework_MockObject_Stub_Return' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Return.php',
-    'PHPUnit_Framework_MockObject_Stub_ReturnArgument' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnArgument.php',
-    'PHPUnit_Framework_MockObject_Stub_ReturnCallback' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnCallback.php',
-    'PHPUnit_Framework_MockObject_Stub_ReturnSelf' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php',
-    'PHPUnit_Framework_MockObject_Stub_ReturnValueMap' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php',
-    'PHPUnit_Framework_MockObject_Verifiable' => $vendorDir . '/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Verifiable.php',
-    'PHPUnit_Framework_OutputError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/OutputError.php',
-    'PHPUnit_Framework_SelfDescribing' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SelfDescribing.php',
-    'PHPUnit_Framework_SkippedTest' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SkippedTest.php',
-    'PHPUnit_Framework_SkippedTestError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SkippedTestError.php',
-    'PHPUnit_Framework_SkippedTestSuiteError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SkippedTestSuiteError.php',
-    'PHPUnit_Framework_SyntheticError' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/SyntheticError.php',
-    'PHPUnit_Framework_Test' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Test.php',
-    'PHPUnit_Framework_TestCase' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestCase.php',
-    'PHPUnit_Framework_TestFailure' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestFailure.php',
-    'PHPUnit_Framework_TestListener' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestListener.php',
-    'PHPUnit_Framework_TestResult' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestResult.php',
-    'PHPUnit_Framework_TestSuite' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestSuite.php',
-    'PHPUnit_Framework_TestSuite_DataProvider' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/TestSuite/DataProvider.php',
-    'PHPUnit_Framework_Warning' => $vendorDir . '/phpunit/phpunit/PHPUnit/Framework/Warning.php',
-    'PHPUnit_Runner_BaseTestRunner' => $vendorDir . '/phpunit/phpunit/PHPUnit/Runner/BaseTestRunner.php',
-    'PHPUnit_Runner_StandardTestSuiteLoader' => $vendorDir . '/phpunit/phpunit/PHPUnit/Runner/StandardTestSuiteLoader.php',
-    'PHPUnit_Runner_TestSuiteLoader' => $vendorDir . '/phpunit/phpunit/PHPUnit/Runner/TestSuiteLoader.php',
-    'PHPUnit_Runner_Version' => $vendorDir . '/phpunit/phpunit/PHPUnit/Runner/Version.php',
-    'PHPUnit_TextUI_Command' => $vendorDir . '/phpunit/phpunit/PHPUnit/TextUI/Command.php',
-    'PHPUnit_TextUI_ResultPrinter' => $vendorDir . '/phpunit/phpunit/PHPUnit/TextUI/ResultPrinter.php',
-    'PHPUnit_TextUI_TestRunner' => $vendorDir . '/phpunit/phpunit/PHPUnit/TextUI/TestRunner.php',
-    'PHPUnit_Util_Class' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Class.php',
-    'PHPUnit_Util_Configuration' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Configuration.php',
-    'PHPUnit_Util_DeprecatedFeature' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature.php',
-    'PHPUnit_Util_DeprecatedFeature_Logger' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature/Logger.php',
-    'PHPUnit_Util_Diff' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Diff.php',
-    'PHPUnit_Util_ErrorHandler' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/ErrorHandler.php',
-    'PHPUnit_Util_Fileloader' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Fileloader.php',
-    'PHPUnit_Util_Filesystem' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Filesystem.php',
-    'PHPUnit_Util_Filter' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Filter.php',
-    'PHPUnit_Util_Getopt' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Getopt.php',
-    'PHPUnit_Util_GlobalState' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/GlobalState.php',
-    'PHPUnit_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/InvalidArgumentHelper.php',
-    'PHPUnit_Util_Log_JSON' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Log/JSON.php',
-    'PHPUnit_Util_Log_JUnit' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Log/JUnit.php',
-    'PHPUnit_Util_Log_TAP' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Log/TAP.php',
-    'PHPUnit_Util_PHP' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/PHP.php',
-    'PHPUnit_Util_PHP_Default' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/PHP/Default.php',
-    'PHPUnit_Util_PHP_Windows' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/PHP/Windows.php',
-    'PHPUnit_Util_Printer' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Printer.php',
-    'PHPUnit_Util_String' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/String.php',
-    'PHPUnit_Util_Test' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Test.php',
-    'PHPUnit_Util_TestDox_NamePrettifier' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestDox/NamePrettifier.php',
-    'PHPUnit_Util_TestDox_ResultPrinter' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter.php',
-    'PHPUnit_Util_TestDox_ResultPrinter_HTML' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/HTML.php',
-    'PHPUnit_Util_TestDox_ResultPrinter_Text' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/Text.php',
-    'PHPUnit_Util_TestSuiteIterator' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/TestSuiteIterator.php',
-    'PHPUnit_Util_Type' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/Type.php',
-    'PHPUnit_Util_XML' => $vendorDir . '/phpunit/phpunit/PHPUnit/Util/XML.php',
-    'PHP_CodeCoverage' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage.php',
-    'PHP_CodeCoverage_Driver' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Driver.php',
-    'PHP_CodeCoverage_Driver_Xdebug' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Driver/Xdebug.php',
-    'PHP_CodeCoverage_Exception' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Exception.php',
-    'PHP_CodeCoverage_Filter' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Filter.php',
-    'PHP_CodeCoverage_Report_Clover' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Clover.php',
-    'PHP_CodeCoverage_Report_Factory' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Factory.php',
-    'PHP_CodeCoverage_Report_HTML' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML.php',
-    'PHP_CodeCoverage_Report_HTML_Renderer' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php',
-    'PHP_CodeCoverage_Report_HTML_Renderer_Dashboard' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
-    'PHP_CodeCoverage_Report_HTML_Renderer_Directory' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php',
-    'PHP_CodeCoverage_Report_HTML_Renderer_File' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php',
-    'PHP_CodeCoverage_Report_Node' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php',
-    'PHP_CodeCoverage_Report_Node_Directory' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Directory.php',
-    'PHP_CodeCoverage_Report_Node_File' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/File.php',
-    'PHP_CodeCoverage_Report_Node_Iterator' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Iterator.php',
-    'PHP_CodeCoverage_Report_PHP' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/PHP.php',
-    'PHP_CodeCoverage_Report_Text' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Text.php',
-    'PHP_CodeCoverage_Util' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Util.php',
-    'PHP_CodeCoverage_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Util/InvalidArgumentHelper.php',
-    'PHP_CodeCoverage_Version' => $vendorDir . '/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php',
+    'PHPUnit_Exception' => $vendorDir . '/phpunit/phpunit/src/Exception.php',
+    'PHPUnit_Extensions_GroupTestSuite' => $vendorDir . '/phpunit/phpunit/src/Extensions/GroupTestSuite.php',
+    'PHPUnit_Extensions_PhptTestCase' => $vendorDir . '/phpunit/phpunit/src/Extensions/PhptTestCase.php',
+    'PHPUnit_Extensions_PhptTestSuite' => $vendorDir . '/phpunit/phpunit/src/Extensions/PhptTestSuite.php',
+    'PHPUnit_Extensions_RepeatedTest' => $vendorDir . '/phpunit/phpunit/src/Extensions/RepeatedTest.php',
+    'PHPUnit_Extensions_TestDecorator' => $vendorDir . '/phpunit/phpunit/src/Extensions/TestDecorator.php',
+    'PHPUnit_Extensions_TicketListener' => $vendorDir . '/phpunit/phpunit/src/Extensions/TicketListener.php',
+    'PHPUnit_Framework_Assert' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert.php',
+    'PHPUnit_Framework_AssertionFailedError' => $vendorDir . '/phpunit/phpunit/src/Framework/AssertionFailedError.php',
+    'PHPUnit_Framework_BaseTestListener' => $vendorDir . '/phpunit/phpunit/src/Framework/BaseTestListener.php',
+    'PHPUnit_Framework_CodeCoverageException' => $vendorDir . '/phpunit/phpunit/src/Framework/CodeCoverageException.php',
+    'PHPUnit_Framework_Constraint' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint.php',
+    'PHPUnit_Framework_Constraint_And' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/And.php',
+    'PHPUnit_Framework_Constraint_ArrayHasKey' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php',
+    'PHPUnit_Framework_Constraint_Attribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Attribute.php',
+    'PHPUnit_Framework_Constraint_Callback' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Callback.php',
+    'PHPUnit_Framework_Constraint_ClassHasAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php',
+    'PHPUnit_Framework_Constraint_ClassHasStaticAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php',
+    'PHPUnit_Framework_Constraint_Composite' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Composite.php',
+    'PHPUnit_Framework_Constraint_Count' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Count.php',
+    'PHPUnit_Framework_Constraint_Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Exception.php',
+    'PHPUnit_Framework_Constraint_ExceptionCode' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php',
+    'PHPUnit_Framework_Constraint_ExceptionMessage' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php',
+    'PHPUnit_Framework_Constraint_FileExists' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/FileExists.php',
+    'PHPUnit_Framework_Constraint_GreaterThan' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php',
+    'PHPUnit_Framework_Constraint_IsAnything' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsAnything.php',
+    'PHPUnit_Framework_Constraint_IsEmpty' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php',
+    'PHPUnit_Framework_Constraint_IsEqual' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsEqual.php',
+    'PHPUnit_Framework_Constraint_IsFalse' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsFalse.php',
+    'PHPUnit_Framework_Constraint_IsIdentical' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php',
+    'PHPUnit_Framework_Constraint_IsInstanceOf' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php',
+    'PHPUnit_Framework_Constraint_IsJson' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsJson.php',
+    'PHPUnit_Framework_Constraint_IsNull' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsNull.php',
+    'PHPUnit_Framework_Constraint_IsTrue' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsTrue.php',
+    'PHPUnit_Framework_Constraint_IsType' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsType.php',
+    'PHPUnit_Framework_Constraint_JsonMatches' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php',
+    'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php',
+    'PHPUnit_Framework_Constraint_LessThan' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/LessThan.php',
+    'PHPUnit_Framework_Constraint_Not' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Not.php',
+    'PHPUnit_Framework_Constraint_ObjectHasAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php',
+    'PHPUnit_Framework_Constraint_Or' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Or.php',
+    'PHPUnit_Framework_Constraint_PCREMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php',
+    'PHPUnit_Framework_Constraint_SameSize' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/SameSize.php',
+    'PHPUnit_Framework_Constraint_StringContains' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringContains.php',
+    'PHPUnit_Framework_Constraint_StringEndsWith' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php',
+    'PHPUnit_Framework_Constraint_StringMatches' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringMatches.php',
+    'PHPUnit_Framework_Constraint_StringStartsWith' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php',
+    'PHPUnit_Framework_Constraint_TraversableContains' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php',
+    'PHPUnit_Framework_Constraint_TraversableContainsOnly' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php',
+    'PHPUnit_Framework_Constraint_Xor' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Xor.php',
+    'PHPUnit_Framework_Error' => $vendorDir . '/phpunit/phpunit/src/Framework/Error.php',
+    'PHPUnit_Framework_Error_Deprecated' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Deprecated.php',
+    'PHPUnit_Framework_Error_Notice' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Notice.php',
+    'PHPUnit_Framework_Error_Warning' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Warning.php',
+    'PHPUnit_Framework_Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception.php',
+    'PHPUnit_Framework_ExpectationFailedException' => $vendorDir . '/phpunit/phpunit/src/Framework/ExpectationFailedException.php',
+    'PHPUnit_Framework_IncompleteTest' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTest.php',
+    'PHPUnit_Framework_IncompleteTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
+    'PHPUnit_Framework_InvalidCoversTargetError' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php',
+    'PHPUnit_Framework_InvalidCoversTargetException' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
+    'PHPUnit_Framework_MockObject_BadMethodCallException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php',
+    'PHPUnit_Framework_MockObject_Builder_Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php',
+    'PHPUnit_Framework_MockObject_Builder_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php',
+    'PHPUnit_Framework_MockObject_Builder_Match' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php',
+    'PHPUnit_Framework_MockObject_Builder_MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php',
+    'PHPUnit_Framework_MockObject_Builder_Namespace' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php',
+    'PHPUnit_Framework_MockObject_Builder_ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php',
+    'PHPUnit_Framework_MockObject_Builder_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php',
+    'PHPUnit_Framework_MockObject_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php',
+    'PHPUnit_Framework_MockObject_Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php',
+    'PHPUnit_Framework_MockObject_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php',
+    'PHPUnit_Framework_MockObject_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php',
+    'PHPUnit_Framework_MockObject_Invocation_Object' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php',
+    'PHPUnit_Framework_MockObject_Invocation_Static' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php',
+    'PHPUnit_Framework_MockObject_Invokable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php',
+    'PHPUnit_Framework_MockObject_Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php',
+    'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
+    'PHPUnit_Framework_MockObject_Matcher_AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php',
+    'PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
+    'PHPUnit_Framework_MockObject_Matcher_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php',
+    'PHPUnit_Framework_MockObject_Matcher_MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php',
+    'PHPUnit_Framework_MockObject_Matcher_Parameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php',
+    'PHPUnit_Framework_MockObject_Matcher_StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php',
+    'PHPUnit_Framework_MockObject_MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php',
+    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php',
+    'PHPUnit_Framework_MockObject_RuntimeException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php',
+    'PHPUnit_Framework_MockObject_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php',
+    'PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
+    'PHPUnit_Framework_MockObject_Stub_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php',
+    'PHPUnit_Framework_MockObject_Stub_MatcherCollection' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php',
+    'PHPUnit_Framework_MockObject_Stub_Return' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php',
+    'PHPUnit_Framework_MockObject_Stub_ReturnArgument' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php',
+    'PHPUnit_Framework_MockObject_Stub_ReturnCallback' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php',
+    'PHPUnit_Framework_MockObject_Stub_ReturnSelf' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php',
+    'PHPUnit_Framework_MockObject_Stub_ReturnValueMap' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php',
+    'PHPUnit_Framework_MockObject_Verifiable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php',
+    'PHPUnit_Framework_OutputError' => $vendorDir . '/phpunit/phpunit/src/Framework/OutputError.php',
+    'PHPUnit_Framework_RiskyTest' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTest.php',
+    'PHPUnit_Framework_RiskyTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
+    'PHPUnit_Framework_SelfDescribing' => $vendorDir . '/phpunit/phpunit/src/Framework/SelfDescribing.php',
+    'PHPUnit_Framework_SkippedTest' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTest.php',
+    'PHPUnit_Framework_SkippedTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestError.php',
+    'PHPUnit_Framework_SkippedTestSuiteError' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php',
+    'PHPUnit_Framework_SyntheticError' => $vendorDir . '/phpunit/phpunit/src/Framework/SyntheticError.php',
+    'PHPUnit_Framework_Test' => $vendorDir . '/phpunit/phpunit/src/Framework/Test.php',
+    'PHPUnit_Framework_TestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/TestCase.php',
+    'PHPUnit_Framework_TestFailure' => $vendorDir . '/phpunit/phpunit/src/Framework/TestFailure.php',
+    'PHPUnit_Framework_TestListener' => $vendorDir . '/phpunit/phpunit/src/Framework/TestListener.php',
+    'PHPUnit_Framework_TestResult' => $vendorDir . '/phpunit/phpunit/src/Framework/TestResult.php',
+    'PHPUnit_Framework_TestSuite' => $vendorDir . '/phpunit/phpunit/src/Framework/TestSuite.php',
+    'PHPUnit_Framework_TestSuite_DataProvider' => $vendorDir . '/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php',
+    'PHPUnit_Framework_UnintentionallyCoveredCodeError' => $vendorDir . '/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php',
+    'PHPUnit_Framework_Warning' => $vendorDir . '/phpunit/phpunit/src/Framework/Warning.php',
+    'PHPUnit_Runner_BaseTestRunner' => $vendorDir . '/phpunit/phpunit/src/Runner/BaseTestRunner.php',
+    'PHPUnit_Runner_Exception' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception.php',
+    'PHPUnit_Runner_Filter_Factory' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Factory.php',
+    'PHPUnit_Runner_Filter_GroupFilterIterator' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group.php',
+    'PHPUnit_Runner_Filter_Group_Exclude' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php',
+    'PHPUnit_Runner_Filter_Group_Include' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group/Include.php',
+    'PHPUnit_Runner_Filter_Test' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Test.php',
+    'PHPUnit_Runner_StandardTestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php',
+    'PHPUnit_Runner_TestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
+    'PHPUnit_Runner_Version' => $vendorDir . '/phpunit/phpunit/src/Runner/Version.php',
+    'PHPUnit_TextUI_Command' => $vendorDir . '/phpunit/phpunit/src/TextUI/Command.php',
+    'PHPUnit_TextUI_ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
+    'PHPUnit_TextUI_TestRunner' => $vendorDir . '/phpunit/phpunit/src/TextUI/TestRunner.php',
+    'PHPUnit_Util_Blacklist' => $vendorDir . '/phpunit/phpunit/src/Util/Blacklist.php',
+    'PHPUnit_Util_Configuration' => $vendorDir . '/phpunit/phpunit/src/Util/Configuration.php',
+    'PHPUnit_Util_DeprecatedFeature' => $vendorDir . '/phpunit/phpunit/src/Util/DeprecatedFeature.php',
+    'PHPUnit_Util_DeprecatedFeature_Logger' => $vendorDir . '/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php',
+    'PHPUnit_Util_ErrorHandler' => $vendorDir . '/phpunit/phpunit/src/Util/ErrorHandler.php',
+    'PHPUnit_Util_Fileloader' => $vendorDir . '/phpunit/phpunit/src/Util/Fileloader.php',
+    'PHPUnit_Util_Filesystem' => $vendorDir . '/phpunit/phpunit/src/Util/Filesystem.php',
+    'PHPUnit_Util_Filter' => $vendorDir . '/phpunit/phpunit/src/Util/Filter.php',
+    'PHPUnit_Util_Getopt' => $vendorDir . '/phpunit/phpunit/src/Util/Getopt.php',
+    'PHPUnit_Util_GlobalState' => $vendorDir . '/phpunit/phpunit/src/Util/GlobalState.php',
+    'PHPUnit_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/phpunit/src/Util/InvalidArgumentHelper.php',
+    'PHPUnit_Util_Log_JSON' => $vendorDir . '/phpunit/phpunit/src/Util/Log/JSON.php',
+    'PHPUnit_Util_Log_JUnit' => $vendorDir . '/phpunit/phpunit/src/Util/Log/JUnit.php',
+    'PHPUnit_Util_Log_TAP' => $vendorDir . '/phpunit/phpunit/src/Util/Log/TAP.php',
+    'PHPUnit_Util_PHP' => $vendorDir . '/phpunit/phpunit/src/Util/PHP.php',
+    'PHPUnit_Util_PHP_Default' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/Default.php',
+    'PHPUnit_Util_PHP_Windows' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/Windows.php',
+    'PHPUnit_Util_Printer' => $vendorDir . '/phpunit/phpunit/src/Util/Printer.php',
+    'PHPUnit_Util_String' => $vendorDir . '/phpunit/phpunit/src/Util/String.php',
+    'PHPUnit_Util_Test' => $vendorDir . '/phpunit/phpunit/src/Util/Test.php',
+    'PHPUnit_Util_TestDox_NamePrettifier' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php',
+    'PHPUnit_Util_TestDox_ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php',
+    'PHPUnit_Util_TestDox_ResultPrinter_HTML' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php',
+    'PHPUnit_Util_TestDox_ResultPrinter_Text' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php',
+    'PHPUnit_Util_TestSuiteIterator' => $vendorDir . '/phpunit/phpunit/src/Util/TestSuiteIterator.php',
+    'PHPUnit_Util_Type' => $vendorDir . '/phpunit/phpunit/src/Util/Type.php',
+    'PHPUnit_Util_XML' => $vendorDir . '/phpunit/phpunit/src/Util/XML.php',
+    'PHP_CodeCoverage' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage.php',
+    'PHP_CodeCoverage_Driver' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver.php',
+    'PHP_CodeCoverage_Driver_HHVM' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php',
+    'PHP_CodeCoverage_Driver_Xdebug' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php',
+    'PHP_CodeCoverage_Exception' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Exception.php',
+    'PHP_CodeCoverage_Exception_UnintentionallyCoveredCode' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php',
+    'PHP_CodeCoverage_Filter' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Filter.php',
+    'PHP_CodeCoverage_Report_Clover' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php',
+    'PHP_CodeCoverage_Report_Crap4j' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php',
+    'PHP_CodeCoverage_Report_Factory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php',
+    'PHP_CodeCoverage_Report_HTML' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php',
+    'PHP_CodeCoverage_Report_HTML_Renderer' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php',
+    'PHP_CodeCoverage_Report_HTML_Renderer_Dashboard' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
+    'PHP_CodeCoverage_Report_HTML_Renderer_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php',
+    'PHP_CodeCoverage_Report_HTML_Renderer_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php',
+    'PHP_CodeCoverage_Report_Node' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php',
+    'PHP_CodeCoverage_Report_Node_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php',
+    'PHP_CodeCoverage_Report_Node_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php',
+    'PHP_CodeCoverage_Report_Node_Iterator' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php',
+    'PHP_CodeCoverage_Report_PHP' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php',
+    'PHP_CodeCoverage_Report_Text' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php',
+    'PHP_CodeCoverage_Report_XML' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php',
+    'PHP_CodeCoverage_Report_XML_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php',
+    'PHP_CodeCoverage_Report_XML_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php',
+    'PHP_CodeCoverage_Report_XML_File_Coverage' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php',
+    'PHP_CodeCoverage_Report_XML_File_Method' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php',
+    'PHP_CodeCoverage_Report_XML_File_Report' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php',
+    'PHP_CodeCoverage_Report_XML_File_Unit' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php',
+    'PHP_CodeCoverage_Report_XML_Node' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php',
+    'PHP_CodeCoverage_Report_XML_Project' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php',
+    'PHP_CodeCoverage_Report_XML_Tests' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php',
+    'PHP_CodeCoverage_Report_XML_Totals' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php',
+    'PHP_CodeCoverage_Util' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Util.php',
+    'PHP_CodeCoverage_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php',
     'PHP_Timer' => $vendorDir . '/phpunit/php-timer/PHP/Timer.php',
     'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_TokenWithScope' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
@@ -209,6 +224,7 @@
     'PHP_Token_CHARACTER' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_CLASS' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_CLASS_C' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
+    'PHP_Token_CLASS_NAME_CONSTANT' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_CLONE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_CLOSE_BRACKET' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_CLOSE_CURLY' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
@@ -257,6 +273,7 @@
     'PHP_Token_EXTENDS' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_FILE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_FINAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
+    'PHP_Token_FINALLY' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_FOR' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_FOREACH' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_FUNCTION' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
@@ -348,6 +365,32 @@
     'PHP_Token_WHILE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_WHITESPACE' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
     'PHP_Token_XOR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
+    'PHP_Token_YIELD' => $vendorDir . '/phpunit/php-token-stream/PHP/Token.php',
+    'SebastianBergmann\\Comparator\\ArrayComparator' => $vendorDir . '/sebastian/comparator/src/ArrayComparator.php',
+    'SebastianBergmann\\Comparator\\Comparator' => $vendorDir . '/sebastian/comparator/src/Comparator.php',
+    'SebastianBergmann\\Comparator\\ComparisonFailure' => $vendorDir . '/sebastian/comparator/src/ComparisonFailure.php',
+    'SebastianBergmann\\Comparator\\DOMNodeComparator' => $vendorDir . '/sebastian/comparator/src/DOMNodeComparator.php',
+    'SebastianBergmann\\Comparator\\DateTimeComparator' => $vendorDir . '/sebastian/comparator/src/DateTimeComparator.php',
+    'SebastianBergmann\\Comparator\\DoubleComparator' => $vendorDir . '/sebastian/comparator/src/DoubleComparator.php',
+    'SebastianBergmann\\Comparator\\ExceptionComparator' => $vendorDir . '/sebastian/comparator/src/ExceptionComparator.php',
+    'SebastianBergmann\\Comparator\\Factory' => $vendorDir . '/sebastian/comparator/src/Factory.php',
+    'SebastianBergmann\\Comparator\\MockObjectComparator' => $vendorDir . '/sebastian/comparator/src/MockObjectComparator.php',
+    'SebastianBergmann\\Comparator\\NumericComparator' => $vendorDir . '/sebastian/comparator/src/NumericComparator.php',
+    'SebastianBergmann\\Comparator\\ObjectComparator' => $vendorDir . '/sebastian/comparator/src/ObjectComparator.php',
+    'SebastianBergmann\\Comparator\\ResourceComparator' => $vendorDir . '/sebastian/comparator/src/ResourceComparator.php',
+    'SebastianBergmann\\Comparator\\ScalarComparator' => $vendorDir . '/sebastian/comparator/src/ScalarComparator.php',
+    'SebastianBergmann\\Comparator\\SplObjectStorageComparator' => $vendorDir . '/sebastian/comparator/src/SplObjectStorageComparator.php',
+    'SebastianBergmann\\Comparator\\TypeComparator' => $vendorDir . '/sebastian/comparator/src/TypeComparator.php',
+    'SebastianBergmann\\Diff\\Chunk' => $vendorDir . '/sebastian/diff/src/Chunk.php',
+    'SebastianBergmann\\Diff\\Diff' => $vendorDir . '/sebastian/diff/src/Diff.php',
+    'SebastianBergmann\\Diff\\Differ' => $vendorDir . '/sebastian/diff/src/Differ.php',
+    'SebastianBergmann\\Diff\\Line' => $vendorDir . '/sebastian/diff/src/Line.php',
+    'SebastianBergmann\\Diff\\Parser' => $vendorDir . '/sebastian/diff/src/Parser.php',
+    'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php',
+    'SebastianBergmann\\Exporter\\Context' => $vendorDir . '/sebastian/exporter/src/Context.php',
+    'SebastianBergmann\\Exporter\\Exception' => $vendorDir . '/sebastian/exporter/src/Exception.php',
+    'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
+    'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
     'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Symfony/Component/HttpFoundation/Resources/stubs/SessionHandlerInterface.php',
     'Text_Template' => $vendorDir . '/phpunit/php-text-template/Text/Template.php',
 );
diff --git a/core/vendor/composer/include_paths.php b/core/vendor/composer/include_paths.php
index 79db17e1ac599978e9a39287c609a80846bd6a24..771d07b204ee0d73d46337855c3fccda64e34e33 100644
--- a/core/vendor/composer/include_paths.php
+++ b/core/vendor/composer/include_paths.php
@@ -10,8 +10,8 @@
     $vendorDir . '/phpunit/phpunit-mock-objects',
     $vendorDir . '/phpunit/php-timer',
     $vendorDir . '/phpunit/php-token-stream',
+    $vendorDir . '/phpunit/php-file-iterator',
     $vendorDir . '/phpunit/php-code-coverage',
     $vendorDir . '/phpunit/phpunit',
     $vendorDir . '/symfony/yaml',
-    $vendorDir . '/phpunit/php-file-iterator',
 );
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index 72d35e82ad288366f47b31c61dca303b3ff60930..342fc76c40f8a3fe96e01511c43f4107b4358b88 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -113,491 +113,826 @@
         ]
     },
     {
-        "name": "phpunit/php-text-template",
-        "version": "1.1.4",
-        "version_normalized": "1.1.4.0",
+        "name": "zendframework/zend-stdlib",
+        "version": "2.2.1",
+        "version_normalized": "2.2.1.0",
+        "target-dir": "Zend/Stdlib",
         "source": {
             "type": "git",
-            "url": "git://github.com/sebastianbergmann/php-text-template.git",
-            "reference": "1.1.4"
+            "url": "https://github.com/zendframework/Component_ZendStdlib.git",
+            "reference": "release-2.2.1"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4",
-            "reference": "1.1.4",
+            "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/release-2.2.1",
+            "reference": "release-2.2.1",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "time": "2012-10-31 11:15:28",
+        "suggest": {
+            "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+            "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+        },
+        "time": "2013-06-12 19:46:58",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.2-dev",
+                "dev-develop": "2.3-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
-            "classmap": [
-                "Text/"
-            ]
+            "psr-0": {
+                "Zend\\Stdlib\\": ""
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
-        "include-path": [
-            ""
-        ],
         "license": [
             "BSD-3-Clause"
         ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Simple template engine.",
-        "homepage": "https://github.com/sebastianbergmann/php-text-template/",
         "keywords": [
-            "template"
+            "stdlib",
+            "zf2"
         ]
     },
     {
-        "name": "phpunit/phpunit-mock-objects",
-        "version": "1.2.3",
-        "version_normalized": "1.2.3.0",
+        "name": "zendframework/zend-escaper",
+        "version": "2.2.1",
+        "version_normalized": "2.2.1.0",
+        "target-dir": "Zend/Escaper",
         "source": {
             "type": "git",
-            "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
-            "reference": "1.2.3"
+            "url": "https://github.com/zendframework/Component_ZendEscaper.git",
+            "reference": "release-2.2.1"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip",
-            "reference": "1.2.3",
+            "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/release-2.2.1",
+            "reference": "release-2.2.1",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3",
-            "phpunit/php-text-template": ">=1.1.1@stable"
-        },
-        "suggest": {
-            "ext-soap": "*"
+            "php": ">=5.3.3"
         },
-        "time": "2013-01-13 10:24:48",
+        "time": "2013-05-01 21:53:03",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.2-dev",
+                "dev-develop": "2.3-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
-            "classmap": [
-                "PHPUnit/"
-            ]
+            "psr-0": {
+                "Zend\\Escaper\\": ""
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
-        "include-path": [
-            ""
-        ],
         "license": [
             "BSD-3-Clause"
         ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Mock Object library for PHPUnit",
-        "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
         "keywords": [
-            "mock",
-            "xunit"
+            "escaper",
+            "zf2"
         ]
     },
     {
-        "name": "phpunit/php-timer",
-        "version": "1.0.4",
-        "version_normalized": "1.0.4.0",
+        "name": "zendframework/zend-feed",
+        "version": "2.2.1",
+        "version_normalized": "2.2.1.0",
+        "target-dir": "Zend/Feed",
         "source": {
             "type": "git",
-            "url": "git://github.com/sebastianbergmann/php-timer.git",
-            "reference": "1.0.4"
+            "url": "https://github.com/zendframework/Component_ZendFeed.git",
+            "reference": "release-2.2.1"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4",
-            "reference": "1.0.4",
+            "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/release-2.2.1",
+            "reference": "release-2.2.1",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "php": ">=5.3.3",
+            "zendframework/zend-escaper": "self.version",
+            "zendframework/zend-stdlib": "self.version"
         },
-        "time": "2012-10-11 04:45:58",
+        "suggest": {
+            "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
+            "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
+            "zendframework/zend-validator": "Zend\\Validator component"
+        },
+        "time": "2013-06-12 19:45:31",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.2-dev",
+                "dev-develop": "2.3-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
-            "classmap": [
-                "PHP/"
-            ]
+            "psr-0": {
+                "Zend\\Feed\\": ""
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
-        "include-path": [
-            ""
-        ],
         "license": [
             "BSD-3-Clause"
         ],
-        "authors": [
-            {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
-            }
-        ],
-        "description": "Utility class for timing",
-        "homepage": "http://www.phpunit.de/",
+        "description": "provides functionality for consuming RSS and Atom feeds",
         "keywords": [
-            "timer"
+            "feed",
+            "zf2"
         ]
     },
     {
-        "name": "phpunit/php-token-stream",
-        "version": "1.1.5",
-        "version_normalized": "1.1.5.0",
+        "name": "doctrine/lexer",
+        "version": "v1.0",
+        "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
-            "url": "git://github.com/sebastianbergmann/php-token-stream.git",
-            "reference": "1.1.5"
+            "url": "https://github.com/doctrine/lexer.git",
+            "reference": "v1.0"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5",
-            "reference": "1.1.5",
+            "url": "https://github.com/doctrine/lexer/archive/v1.0.zip",
+            "reference": "v1.0",
             "shasum": ""
         },
         "require": {
-            "ext-tokenizer": "*",
-            "php": ">=5.3.3"
+            "php": ">=5.3.2"
         },
-        "time": "2012-10-11 04:47:14",
+        "time": "2013-01-12 18:59:04",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
-            "classmap": [
-                "PHP/"
-            ]
+            "psr-0": {
+                "Doctrine\\Common\\Lexer\\": "lib/"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
-        "include-path": [
-            ""
-        ],
         "license": [
-            "BSD-3-Clause"
+            "MIT"
         ],
         "authors": [
             {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com",
+                "homepage": "http://www.instaclick.com"
+            },
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Johannes M. Schmitt",
+                "email": "schmittjoh@gmail.com",
+                "homepage": "https://github.com/schmittjoh",
+                "role": "Developer of wrapped JMSSerializerBundle"
             }
         ],
-        "description": "Wrapper around PHP's tokenizer extension.",
-        "homepage": "http://www.phpunit.de/",
+        "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+        "homepage": "http://www.doctrine-project.org",
         "keywords": [
-            "tokenizer"
+            "lexer",
+            "parser"
         ]
     },
     {
-        "name": "phpunit/php-code-coverage",
-        "version": "1.2.11",
-        "version_normalized": "1.2.11.0",
+        "name": "doctrine/collections",
+        "version": "v1.1",
+        "version_normalized": "1.1.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-            "reference": "1.2.11"
+            "url": "https://github.com/doctrine/collections.git",
+            "reference": "v1.1"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.11",
-            "reference": "1.2.11",
+            "url": "https://api.github.com/repos/doctrine/collections/zipball/v1.1",
+            "reference": "v1.1",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3",
-            "phpunit/php-file-iterator": ">=1.3.0@stable",
-            "phpunit/php-text-template": ">=1.1.1@stable",
-            "phpunit/php-token-stream": ">=1.1.3@stable"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "3.7.*"
-        },
-        "suggest": {
-            "ext-dom": "*",
-            "ext-xdebug": ">=2.0.5"
+            "php": ">=5.3.2"
         },
-        "time": "2013-05-23 18:23:24",
+        "time": "2013-03-07 12:15:54",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.1.x-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
-            "classmap": [
-                "PHP/"
-            ]
+            "psr-0": {
+                "Doctrine\\Common\\Collections\\": "lib/"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
-        "include-path": [
-            ""
-        ],
         "license": [
-            "BSD-3-Clause"
+            "MIT"
         ],
         "authors": [
             {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com",
+                "homepage": "http://www.jwage.com/"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com",
+                "homepage": "http://www.instaclick.com"
+            },
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Johannes M. Schmitt",
+                "email": "schmittjoh@gmail.com",
+                "homepage": "https://github.com/schmittjoh",
+                "role": "Developer of wrapped JMSSerializerBundle"
             }
         ],
-        "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-        "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+        "description": "Collections Abstraction library",
+        "homepage": "http://www.doctrine-project.org",
         "keywords": [
-            "coverage",
-            "testing",
-            "xunit"
+            "array",
+            "collections",
+            "iterator"
         ]
     },
     {
-        "name": "phpunit/phpunit",
-        "version": "3.7.21",
-        "version_normalized": "3.7.21.0",
+        "name": "doctrine/cache",
+        "version": "v1.0",
+        "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/sebastianbergmann/phpunit.git",
-            "reference": "3.7.21"
+            "url": "https://github.com/doctrine/cache.git",
+            "reference": "v1.0"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.21",
-            "reference": "3.7.21",
+            "url": "https://github.com/doctrine/cache/archive/v1.0.zip",
+            "reference": "v1.0",
             "shasum": ""
         },
         "require": {
-            "ext-dom": "*",
-            "ext-pcre": "*",
-            "ext-reflection": "*",
-            "ext-spl": "*",
-            "php": ">=5.3.3",
-            "phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
-            "phpunit/php-file-iterator": ">=1.3.1",
-            "phpunit/php-text-template": ">=1.1.1",
-            "phpunit/php-timer": ">=1.0.2,<1.1.0",
-            "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
-            "symfony/yaml": ">=2.0,<3.0"
+            "php": ">=5.3.2"
+        },
+        "time": "2013-01-10 22:43:46",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Doctrine\\Common\\Cache\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com",
+                "homepage": "http://www.jwage.com/"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com",
+                "homepage": "http://www.instaclick.com"
+            },
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Johannes M. Schmitt",
+                "email": "schmittjoh@gmail.com",
+                "homepage": "https://github.com/schmittjoh",
+                "role": "Developer of wrapped JMSSerializerBundle"
+            }
+        ],
+        "description": "Caching library offering an object-oriented API for many cache backends",
+        "homepage": "http://www.doctrine-project.org",
+        "keywords": [
+            "cache",
+            "caching"
+        ]
+    },
+    {
+        "name": "doctrine/inflector",
+        "version": "v1.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/doctrine/inflector.git",
+            "reference": "v1.0"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://github.com/doctrine/inflector/archive/v1.0.zip",
+            "reference": "v1.0",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.2"
+        },
+        "time": "2013-01-10 21:49:15",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Doctrine\\Common\\Inflector\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com",
+                "homepage": "http://www.jwage.com/"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com",
+                "homepage": "http://www.instaclick.com"
+            },
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Johannes M. Schmitt",
+                "email": "schmittjoh@gmail.com",
+                "homepage": "https://github.com/schmittjoh",
+                "role": "Developer of wrapped JMSSerializerBundle"
+            }
+        ],
+        "description": "Common String Manipulations with regard to casing and singular/plural rules.",
+        "homepage": "http://www.doctrine-project.org",
+        "keywords": [
+            "inflection",
+            "pluarlize",
+            "singuarlize",
+            "string"
+        ]
+    },
+    {
+        "name": "symfony/debug",
+        "version": "v2.3.4",
+        "version_normalized": "2.3.4.0",
+        "target-dir": "Symfony/Component/Debug",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/Debug.git",
+            "reference": "729f6d19cfc401c4942e43fcc1059103bd6df130"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/Debug/zipball/729f6d19cfc401c4942e43fcc1059103bd6df130",
+            "reference": "729f6d19cfc401c4942e43fcc1059103bd6df130",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
         },
         "require-dev": {
-            "pear-pear/pear": "1.9.4"
+            "symfony/http-foundation": "~2.1",
+            "symfony/http-kernel": "~2.1"
         },
         "suggest": {
-            "ext-json": "*",
-            "ext-simplexml": "*",
-            "ext-tokenizer": "*",
-            "phpunit/php-invoker": ">=1.1.0,<1.2.0"
+            "symfony/class-loader": "",
+            "symfony/http-foundation": "",
+            "symfony/http-kernel": ""
         },
-        "time": "2013-05-23 18:54:29",
-        "bin": [
-            "composer/bin/phpunit"
+        "time": "2013-08-08 14:16:10",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.3-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Symfony\\Component\\Debug\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
+            }
         ],
+        "description": "Symfony Debug Component",
+        "homepage": "http://symfony.com"
+    },
+    {
+        "name": "symfony/translation",
+        "version": "v2.3.4",
+        "version_normalized": "2.3.4.0",
+        "target-dir": "Symfony/Component/Translation",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/Translation.git",
+            "reference": "65f888291f0896ad492f9abc6dc05c998373aded"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/Translation/zipball/65f888291f0896ad492f9abc6dc05c998373aded",
+            "reference": "65f888291f0896ad492f9abc6dc05c998373aded",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "symfony/config": "~2.0",
+            "symfony/yaml": "~2.2"
+        },
+        "suggest": {
+            "symfony/config": "",
+            "symfony/yaml": ""
+        },
+        "time": "2013-08-26 05:49:51",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "3.7.x-dev"
+                "dev-master": "2.3-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "classmap": [
-                "PHPUnit/"
-            ]
+            "psr-0": {
+                "Symfony\\Component\\Translation\\": ""
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
-        "include-path": [
-            "",
-            "../../symfony/yaml/"
+        "license": [
+            "MIT"
         ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Translation Component",
+        "homepage": "http://symfony.com"
+    },
+    {
+        "name": "symfony/process",
+        "version": "v2.3.4",
+        "version_normalized": "2.3.4.0",
+        "target-dir": "Symfony/Component/Process",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/Process.git",
+            "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/Process/zipball/1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b",
+            "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "time": "2013-08-22 06:42:25",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.3-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Symfony\\Component\\Process\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "BSD-3-Clause"
+            "MIT"
         ],
         "authors": [
             {
-                "name": "Sebastian Bergmann",
-                "email": "sebastian@phpunit.de",
-                "role": "lead"
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "The PHP Unit Testing framework.",
-        "homepage": "http://www.phpunit.de/",
+        "description": "Symfony Process Component",
+        "homepage": "http://symfony.com"
+    },
+    {
+        "name": "sdboyer/gliph",
+        "version": "0.1.4",
+        "version_normalized": "0.1.4.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sdboyer/gliph.git",
+            "reference": "aad932ef7d808105341cc9a36538e9fe2cb5ee82"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sdboyer/gliph/zipball/aad932ef7d808105341cc9a36538e9fe2cb5ee82",
+            "reference": "aad932ef7d808105341cc9a36538e9fe2cb5ee82",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3"
+        },
+        "time": "2013-09-27 01:15:21",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Gliph": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Sam Boyer",
+                "email": "tech@samboyer.org"
+            }
+        ],
+        "description": "A graph library for PHP.",
+        "homepage": "http://github.com/sdboyer/gliph",
         "keywords": [
-            "phpunit",
-            "testing",
-            "xunit"
+            "gliph",
+            "graph",
+            "library",
+            "php",
+            "spl"
         ]
     },
     {
-        "name": "zendframework/zend-stdlib",
-        "version": "2.2.1",
-        "version_normalized": "2.2.1.0",
-        "target-dir": "Zend/Stdlib",
+        "name": "symfony-cmf/routing",
+        "version": "1.1.0",
+        "version_normalized": "1.1.0.0",
+        "target-dir": "Symfony/Cmf/Component/Routing",
         "source": {
             "type": "git",
-            "url": "https://github.com/zendframework/Component_ZendStdlib.git",
-            "reference": "release-2.2.1"
+            "url": "https://github.com/symfony-cmf/Routing.git",
+            "reference": "9f8607950cbf888ec678713a35f3d0088857c85f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/Component_ZendStdlib/zipball/release-2.2.1",
-            "reference": "release-2.2.1",
+            "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/9f8607950cbf888ec678713a35f3d0088857c85f",
+            "reference": "9f8607950cbf888ec678713a35f3d0088857c85f",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "php": ">=5.3.3",
+            "psr/log": "~1.0",
+            "symfony/http-kernel": "~2.2",
+            "symfony/routing": "~2.2"
+        },
+        "require-dev": {
+            "symfony/config": "~2.2",
+            "symfony/dependency-injection": "~2.0",
+            "symfony/event-dispatcher": "~2.1"
         },
         "suggest": {
-            "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
-            "zendframework/zend-servicemanager": "To support hydrator plugin manager usage"
+            "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1"
         },
-        "time": "2013-06-12 19:46:58",
+        "time": "2013-10-14 15:32:46",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.2-dev",
-                "dev-develop": "2.3-dev"
+                "dev-master": "1.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Zend\\Stdlib\\": ""
+                "Symfony\\Cmf\\Component\\Routing": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "BSD-3-Clause"
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Symfony CMF Community",
+                "homepage": "https://github.com/symfony-cmf/Routing/contributors"
+            }
         ],
+        "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
+        "homepage": "http://cmf.symfony.com",
         "keywords": [
-            "stdlib",
-            "zf2"
+            "database",
+            "routing"
         ]
     },
     {
-        "name": "zendframework/zend-escaper",
-        "version": "2.2.1",
-        "version_normalized": "2.2.1.0",
-        "target-dir": "Zend/Escaper",
+        "name": "doctrine/annotations",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
         "source": {
             "type": "git",
-            "url": "https://github.com/zendframework/Component_ZendEscaper.git",
-            "reference": "release-2.2.1"
+            "url": "https://github.com/doctrine/annotations.git",
+            "reference": "463d926a8dcc49271cb7db5a08364a70ed6e3cd3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/Component_ZendEscaper/zipball/release-2.2.1",
-            "reference": "release-2.2.1",
+            "url": "https://api.github.com/repos/doctrine/annotations/zipball/463d926a8dcc49271cb7db5a08364a70ed6e3cd3",
+            "reference": "463d926a8dcc49271cb7db5a08364a70ed6e3cd3",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "doctrine/lexer": "1.*",
+            "php": ">=5.3.2"
         },
-        "time": "2013-05-01 21:53:03",
+        "require-dev": {
+            "doctrine/cache": "1.*"
+        },
+        "time": "2013-11-19 05:59:59",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.2-dev",
-                "dev-develop": "2.3-dev"
+                "dev-master": "1.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Zend\\Escaper\\": ""
+                "Doctrine\\Common\\Annotations\\": "lib/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "BSD-3-Clause"
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com",
+                "homepage": "http://www.jwage.com/",
+                "role": "Creator"
+            },
+            {
+                "name": "Guilherme Blanco",
+                "email": "guilhermeblanco@gmail.com",
+                "homepage": "http://www.instaclick.com"
+            },
+            {
+                "name": "Roman Borschel",
+                "email": "roman@code-factory.org"
+            },
+            {
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Johannes Schmitt",
+                "email": "schmittjoh@gmail.com",
+                "homepage": "http://jmsyst.com",
+                "role": "Developer of wrapped JMSSerializerBundle"
+            }
         ],
+        "description": "Docblock Annotations Parser",
+        "homepage": "http://www.doctrine-project.org",
         "keywords": [
-            "escaper",
-            "zf2"
+            "annotations",
+            "docblock",
+            "parser"
         ]
     },
     {
-        "name": "zendframework/zend-feed",
-        "version": "2.2.1",
-        "version_normalized": "2.2.1.0",
-        "target-dir": "Zend/Feed",
+        "name": "twig/twig",
+        "version": "v1.15.0",
+        "version_normalized": "1.15.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/zendframework/Component_ZendFeed.git",
-            "reference": "release-2.2.1"
+            "url": "https://github.com/fabpot/Twig.git",
+            "reference": "85e4ff98000157ff753d934b9f13659a953f5666"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zendframework/Component_ZendFeed/zipball/release-2.2.1",
-            "reference": "release-2.2.1",
+            "url": "https://api.github.com/repos/fabpot/Twig/zipball/85e4ff98000157ff753d934b9f13659a953f5666",
+            "reference": "85e4ff98000157ff753d934b9f13659a953f5666",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3",
-            "zendframework/zend-escaper": "self.version",
-            "zendframework/zend-stdlib": "self.version"
-        },
-        "suggest": {
-            "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
-            "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for default/recommended ExtensionManager implementations",
-            "zendframework/zend-validator": "Zend\\Validator component"
+            "php": ">=5.2.4"
         },
-        "time": "2013-06-12 19:45:31",
+        "time": "2013-12-06 07:47:10",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.2-dev",
-                "dev-develop": "2.3-dev"
+                "dev-master": "1.15-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Zend\\Feed\\": ""
+                "Twig_": "lib/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
             "BSD-3-Clause"
         ],
-        "description": "provides functionality for consuming RSS and Atom feeds",
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Armin Ronacher",
+                "email": "armin.ronacher@active-4.com"
+            }
+        ],
+        "description": "Twig, the flexible, fast, and secure template language for PHP",
+        "homepage": "http://twig.sensiolabs.org",
         "keywords": [
-            "feed",
-            "zf2"
+            "templating"
         ]
     },
     {
-        "name": "doctrine/lexer",
-        "version": "v1.0",
-        "version_normalized": "1.0.0.0",
+        "name": "doctrine/common",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
         "source": {
             "type": "git",
-            "url": "https://github.com/doctrine/lexer.git",
-            "reference": "v1.0"
+            "url": "https://github.com/doctrine/common.git",
+            "reference": "a45d110f71c323e29f41eb0696fa230e3fa1b1b5"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/doctrine/lexer/archive/v1.0.zip",
-            "reference": "v1.0",
+            "url": "https://api.github.com/repos/doctrine/common/zipball/a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
+            "reference": "a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
             "shasum": ""
         },
         "require": {
+            "doctrine/annotations": "1.*",
+            "doctrine/cache": "1.*",
+            "doctrine/collections": "1.*",
+            "doctrine/inflector": "1.*",
+            "doctrine/lexer": "1.*",
             "php": ">=5.3.2"
         },
-        "time": "2013-01-12 18:59:04",
+        "require-dev": {
+            "phpunit/phpunit": "~3.7"
+        },
+        "time": "2014-01-12 22:00:08",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.5.x-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Doctrine\\Common\\Lexer\\": "lib/"
+                "Doctrine\\Common\\": "lib/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -605,6 +940,12 @@
             "MIT"
         ],
         "authors": [
+            {
+                "name": "Jonathan Wage",
+                "email": "jonwage@gmail.com",
+                "homepage": "http://www.jwage.com/",
+                "role": "Creator"
+            },
             {
                 "name": "Guilherme Blanco",
                 "email": "guilhermeblanco@gmail.com",
@@ -615,48 +956,59 @@
                 "email": "roman@code-factory.org"
             },
             {
-                "name": "Johannes M. Schmitt",
+                "name": "Benjamin Eberlei",
+                "email": "kontakt@beberlei.de"
+            },
+            {
+                "name": "Johannes Schmitt",
                 "email": "schmittjoh@gmail.com",
-                "homepage": "https://github.com/schmittjoh",
+                "homepage": "http://jmsyst.com",
                 "role": "Developer of wrapped JMSSerializerBundle"
             }
         ],
-        "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+        "description": "Common Library for Doctrine projects",
         "homepage": "http://www.doctrine-project.org",
         "keywords": [
-            "lexer",
-            "parser"
+            "annotations",
+            "collections",
+            "eventmanager",
+            "persistence",
+            "spl"
         ]
     },
     {
-        "name": "doctrine/collections",
-        "version": "v1.1",
-        "version_normalized": "1.1.0.0",
+        "name": "symfony/class-loader",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/ClassLoader",
         "source": {
             "type": "git",
-            "url": "https://github.com/doctrine/collections.git",
-            "reference": "v1.1"
+            "url": "https://github.com/symfony/ClassLoader.git",
+            "reference": "6a2ebedbc780130f07b3a15363743d08eb46820c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/collections/zipball/v1.1",
-            "reference": "v1.1",
+            "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/6a2ebedbc780130f07b3a15363743d08eb46820c",
+            "reference": "6a2ebedbc780130f07b3a15363743d08eb46820c",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.2"
+            "php": ">=5.3.3"
         },
-        "time": "2013-03-07 12:15:54",
+        "require-dev": {
+            "symfony/finder": "~2.0"
+        },
+        "time": "2013-11-26 16:40:27",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.1.x-dev"
+                "dev-master": "2.4-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Doctrine\\Common\\Collections\\": "lib/"
+                "Symfony\\Component\\ClassLoader\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -665,63 +1017,110 @@
         ],
         "authors": [
             {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com",
-                "homepage": "http://www.jwage.com/"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com",
-                "homepage": "http://www.instaclick.com"
-            },
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
             },
             {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony ClassLoader Component",
+        "homepage": "http://symfony.com"
+    },
+    {
+        "name": "symfony/dependency-injection",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/DependencyInjection",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/DependencyInjection.git",
+            "reference": "7e5bde3a607dde1f8ddef5180759068ad53d259c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/7e5bde3a607dde1f8ddef5180759068ad53d259c",
+            "reference": "7e5bde3a607dde1f8ddef5180759068ad53d259c",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "symfony/config": "~2.2",
+            "symfony/expression-language": "~2.4",
+            "symfony/yaml": "~2.0"
+        },
+        "suggest": {
+            "symfony/config": "",
+            "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+            "symfony/yaml": ""
+        },
+        "time": "2014-01-01 09:02:49",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.4-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Symfony\\Component\\DependencyInjection\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
             },
             {
-                "name": "Johannes M. Schmitt",
-                "email": "schmittjoh@gmail.com",
-                "homepage": "https://github.com/schmittjoh",
-                "role": "Developer of wrapped JMSSerializerBundle"
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Collections Abstraction library",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "array",
-            "collections",
-            "iterator"
-        ]
+        "description": "Symfony DependencyInjection Component",
+        "homepage": "http://symfony.com"
     },
     {
-        "name": "doctrine/cache",
-        "version": "v1.0",
-        "version_normalized": "1.0.0.0",
+        "name": "symfony/http-foundation",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/HttpFoundation",
         "source": {
             "type": "git",
-            "url": "https://github.com/doctrine/cache.git",
-            "reference": "v1.0"
+            "url": "https://github.com/symfony/HttpFoundation.git",
+            "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/doctrine/cache/archive/v1.0.zip",
-            "reference": "v1.0",
+            "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/6c6b8a7bcd7e2cc920cd6acace563fdbf121d844",
+            "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.2"
+            "php": ">=5.3.3"
         },
-        "time": "2013-01-10 22:43:46",
+        "time": "2014-01-05 02:10:50",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.4-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Doctrine\\Common\\Cache\\": "lib/"
-            }
+                "Symfony\\Component\\HttpFoundation\\": ""
+            },
+            "classmap": [
+                "Symfony/Component/HttpFoundation/Resources/stubs"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -729,61 +1128,54 @@
         ],
         "authors": [
             {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com",
-                "homepage": "http://www.jwage.com/"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com",
-                "homepage": "http://www.instaclick.com"
-            },
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
             },
             {
-                "name": "Johannes M. Schmitt",
-                "email": "schmittjoh@gmail.com",
-                "homepage": "https://github.com/schmittjoh",
-                "role": "Developer of wrapped JMSSerializerBundle"
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Caching library offering an object-oriented API for many cache backends",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "cache",
-            "caching"
-        ]
+        "description": "Symfony HttpFoundation Component",
+        "homepage": "http://symfony.com"
     },
     {
-        "name": "doctrine/inflector",
-        "version": "v1.0",
-        "version_normalized": "1.0.0.0",
+        "name": "symfony/event-dispatcher",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/EventDispatcher",
         "source": {
             "type": "git",
-            "url": "https://github.com/doctrine/inflector.git",
-            "reference": "v1.0"
+            "url": "https://github.com/symfony/EventDispatcher.git",
+            "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601"
         },
         "dist": {
             "type": "zip",
-            "url": "https://github.com/doctrine/inflector/archive/v1.0.zip",
-            "reference": "v1.0",
+            "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e3ba42f6a70554ed05749e61b829550f6ac33601",
+            "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.2"
+            "php": ">=5.3.3"
         },
-        "time": "2013-01-10 21:49:15",
+        "require-dev": {
+            "symfony/dependency-injection": "~2.0"
+        },
+        "suggest": {
+            "symfony/dependency-injection": "",
+            "symfony/http-kernel": ""
+        },
+        "time": "2013-12-28 08:12:03",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.4-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Doctrine\\Common\\Inflector\\": "lib/"
+                "Symfony\\Component\\EventDispatcher\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -792,78 +1184,71 @@
         ],
         "authors": [
             {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com",
-                "homepage": "http://www.jwage.com/"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com",
-                "homepage": "http://www.instaclick.com"
-            },
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
             },
             {
-                "name": "Johannes M. Schmitt",
-                "email": "schmittjoh@gmail.com",
-                "homepage": "https://github.com/schmittjoh",
-                "role": "Developer of wrapped JMSSerializerBundle"
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-        "homepage": "http://www.doctrine-project.org",
-        "keywords": [
-            "inflection",
-            "pluarlize",
-            "singuarlize",
-            "string"
-        ]
+        "description": "Symfony EventDispatcher Component",
+        "homepage": "http://symfony.com"
     },
     {
-        "name": "symfony/debug",
-        "version": "v2.3.4",
-        "version_normalized": "2.3.4.0",
-        "target-dir": "Symfony/Component/Debug",
+        "name": "symfony/http-kernel",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/HttpKernel",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/Debug.git",
-            "reference": "729f6d19cfc401c4942e43fcc1059103bd6df130"
+            "url": "https://github.com/symfony/HttpKernel.git",
+            "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Debug/zipball/729f6d19cfc401c4942e43fcc1059103bd6df130",
-            "reference": "729f6d19cfc401c4942e43fcc1059103bd6df130",
+            "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0605eedeb52c4d3a3144128d8336395a57be60d4",
+            "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "php": ">=5.3.3",
+            "psr/log": "~1.0",
+            "symfony/debug": "~2.3",
+            "symfony/event-dispatcher": "~2.1",
+            "symfony/http-foundation": "~2.4"
         },
         "require-dev": {
-            "symfony/http-foundation": "~2.1",
-            "symfony/http-kernel": "~2.1"
+            "symfony/browser-kit": "~2.2",
+            "symfony/class-loader": "~2.1",
+            "symfony/config": "~2.0",
+            "symfony/console": "~2.2",
+            "symfony/dependency-injection": "~2.0",
+            "symfony/finder": "~2.0",
+            "symfony/process": "~2.0",
+            "symfony/routing": "~2.2",
+            "symfony/stopwatch": "~2.2",
+            "symfony/templating": "~2.2"
         },
         "suggest": {
+            "symfony/browser-kit": "",
             "symfony/class-loader": "",
-            "symfony/http-foundation": "",
-            "symfony/http-kernel": ""
+            "symfony/config": "",
+            "symfony/console": "",
+            "symfony/dependency-injection": "",
+            "symfony/finder": ""
         },
-        "time": "2013-08-08 14:16:10",
+        "time": "2014-01-05 02:12:11",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.3-dev"
+                "dev-master": "2.4-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Symfony\\Component\\Debug\\": ""
+                "Symfony\\Component\\HttpKernel\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -880,47 +1265,52 @@
                 "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Debug Component",
+        "description": "Symfony HttpKernel Component",
         "homepage": "http://symfony.com"
     },
     {
-        "name": "symfony/translation",
-        "version": "v2.3.4",
-        "version_normalized": "2.3.4.0",
-        "target-dir": "Symfony/Component/Translation",
+        "name": "symfony/routing",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/Routing",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/Translation.git",
-            "reference": "65f888291f0896ad492f9abc6dc05c998373aded"
+            "url": "https://github.com/symfony/Routing.git",
+            "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Translation/zipball/65f888291f0896ad492f9abc6dc05c998373aded",
-            "reference": "65f888291f0896ad492f9abc6dc05c998373aded",
+            "url": "https://api.github.com/repos/symfony/Routing/zipball/4abfb500aab8be458c9e3a227ea56b190584f78a",
+            "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
         "require-dev": {
-            "symfony/config": "~2.0",
-            "symfony/yaml": "~2.2"
+            "doctrine/annotations": "~1.0",
+            "psr/log": "~1.0",
+            "symfony/config": "~2.2",
+            "symfony/expression-language": "~2.4",
+            "symfony/yaml": "~2.0"
         },
         "suggest": {
-            "symfony/config": "",
-            "symfony/yaml": ""
+            "doctrine/annotations": "For using the annotation loader",
+            "symfony/config": "For using the all-in-one router or any loader",
+            "symfony/expression-language": "For using expression matching",
+            "symfony/yaml": "For using the YAML loader"
         },
-        "time": "2013-08-26 05:49:51",
+        "time": "2014-01-05 02:10:50",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.3-dev"
+                "dev-master": "2.4-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Symfony\\Component\\Translation\\": ""
+                "Symfony\\Component\\Routing\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -937,39 +1327,45 @@
                 "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Translation Component",
-        "homepage": "http://symfony.com"
+        "description": "Symfony Routing Component",
+        "homepage": "http://symfony.com",
+        "keywords": [
+            "router",
+            "routing",
+            "uri",
+            "url"
+        ]
     },
     {
-        "name": "symfony/process",
-        "version": "v2.3.4",
-        "version_normalized": "2.3.4.0",
-        "target-dir": "Symfony/Component/Process",
+        "name": "symfony/serializer",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/Serializer",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/Process.git",
-            "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b"
+            "url": "https://github.com/symfony/Serializer.git",
+            "reference": "60c54346958604379392672a3a998650a169a7f4"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Process/zipball/1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b",
-            "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b",
+            "url": "https://api.github.com/repos/symfony/Serializer/zipball/60c54346958604379392672a3a998650a169a7f4",
+            "reference": "60c54346958604379392672a3a998650a169a7f4",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "time": "2013-08-22 06:42:25",
+        "time": "2014-01-01 08:14:50",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.3-dev"
+                "dev-master": "2.4-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Symfony\\Component\\Process\\": ""
+                "Symfony\\Component\\Serializer\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -986,33 +1382,39 @@
                 "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Symfony Process Component",
+        "description": "Symfony Serializer Component",
         "homepage": "http://symfony.com"
     },
     {
-        "name": "sdboyer/gliph",
-        "version": "0.1.4",
-        "version_normalized": "0.1.4.0",
+        "name": "symfony/property-access",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/PropertyAccess",
         "source": {
             "type": "git",
-            "url": "https://github.com/sdboyer/gliph.git",
-            "reference": "aad932ef7d808105341cc9a36538e9fe2cb5ee82"
+            "url": "https://github.com/symfony/PropertyAccess.git",
+            "reference": "274951234150e303c83099a2429be6be35629fe9"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/sdboyer/gliph/zipball/aad932ef7d808105341cc9a36538e9fe2cb5ee82",
-            "reference": "aad932ef7d808105341cc9a36538e9fe2cb5ee82",
+            "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/274951234150e303c83099a2429be6be35629fe9",
+            "reference": "274951234150e303c83099a2429be6be35629fe9",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3"
+            "php": ">=5.3.3"
         },
-        "time": "2013-09-27 01:15:21",
+        "time": "2013-11-13 21:30:16",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.4-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Gliph": "src/"
+                "Symfony\\Component\\PropertyAccess\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -1021,61 +1423,76 @@
         ],
         "authors": [
             {
-                "name": "Sam Boyer",
-                "email": "tech@samboyer.org"
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "A graph library for PHP.",
-        "homepage": "http://github.com/sdboyer/gliph",
+        "description": "Symfony PropertyAccess Component",
+        "homepage": "http://symfony.com",
         "keywords": [
-            "gliph",
-            "graph",
-            "library",
-            "php",
-            "spl"
+            "access",
+            "array",
+            "extraction",
+            "index",
+            "injection",
+            "object",
+            "property",
+            "property path",
+            "reflection"
         ]
     },
     {
-        "name": "symfony-cmf/routing",
-        "version": "1.1.0",
-        "version_normalized": "1.1.0.0",
-        "target-dir": "Symfony/Cmf/Component/Routing",
+        "name": "symfony/validator",
+        "version": "v2.4.1",
+        "version_normalized": "2.4.1.0",
+        "target-dir": "Symfony/Component/Validator",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony-cmf/Routing.git",
-            "reference": "9f8607950cbf888ec678713a35f3d0088857c85f"
+            "url": "https://github.com/symfony/Validator.git",
+            "reference": "7ea4e53f8d68bf3ae9cca28765d49d7930618730"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/9f8607950cbf888ec678713a35f3d0088857c85f",
-            "reference": "9f8607950cbf888ec678713a35f3d0088857c85f",
+            "url": "https://api.github.com/repos/symfony/Validator/zipball/7ea4e53f8d68bf3ae9cca28765d49d7930618730",
+            "reference": "7ea4e53f8d68bf3ae9cca28765d49d7930618730",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3",
-            "psr/log": "~1.0",
-            "symfony/http-kernel": "~2.2",
-            "symfony/routing": "~2.2"
+            "symfony/property-access": "~2.2",
+            "symfony/translation": "~2.0"
         },
         "require-dev": {
+            "doctrine/annotations": "~1.0",
+            "doctrine/cache": "~1.0",
             "symfony/config": "~2.2",
-            "symfony/dependency-injection": "~2.0",
-            "symfony/event-dispatcher": "~2.1"
+            "symfony/http-foundation": "~2.1",
+            "symfony/intl": "~2.3",
+            "symfony/yaml": "~2.0"
         },
         "suggest": {
-            "symfony/event-dispatcher": "DynamicRouter can optionally trigger an event at the start of matching. Minimal version ~2.1"
+            "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
+            "doctrine/cache": "For using the default cached annotation reader",
+            "symfony/config": "",
+            "symfony/http-foundation": "",
+            "symfony/intl": "",
+            "symfony/yaml": ""
         },
-        "time": "2013-10-14 15:32:46",
+        "time": "2014-01-01 08:14:50",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.1-dev"
+                "dev-master": "2.4-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Symfony\\Cmf\\Component\\Routing": ""
+                "Symfony\\Component\\Validator\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -1084,227 +1501,164 @@
         ],
         "authors": [
             {
-                "name": "Symfony CMF Community",
-                "homepage": "https://github.com/symfony-cmf/Routing/contributors"
-            }
-        ],
-        "description": "Extends the Symfony2 routing component for dynamic routes and chaining several routers",
-        "homepage": "http://cmf.symfony.com",
-        "keywords": [
-            "database",
-            "routing"
-        ]
-    },
-    {
-        "name": "phpunit/php-file-iterator",
-        "version": "1.3.4",
-        "version_normalized": "1.3.4.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-            "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-            "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "time": "2013-10-10 15:34:57",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "classmap": [
-                "File/"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "include-path": [
-            ""
-        ],
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
             {
-                "name": "Sebastian Bergmann",
-                "email": "sb@sebastian-bergmann.de",
-                "role": "lead"
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-        "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-        "keywords": [
-            "filesystem",
-            "iterator"
-        ]
+        "description": "Symfony Validator Component",
+        "homepage": "http://symfony.com"
     },
     {
-        "name": "doctrine/annotations",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
+        "name": "easyrdf/easyrdf",
+        "version": "0.8.0",
+        "version_normalized": "0.8.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/doctrine/annotations.git",
-            "reference": "463d926a8dcc49271cb7db5a08364a70ed6e3cd3"
+            "url": "https://github.com/njh/easyrdf.git",
+            "reference": "3e43ab7274004e9f4192e06b9fc147781e1f85c2"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/annotations/zipball/463d926a8dcc49271cb7db5a08364a70ed6e3cd3",
-            "reference": "463d926a8dcc49271cb7db5a08364a70ed6e3cd3",
+            "url": "https://api.github.com/repos/njh/easyrdf/zipball/3e43ab7274004e9f4192e06b9fc147781e1f85c2",
+            "reference": "3e43ab7274004e9f4192e06b9fc147781e1f85c2",
             "shasum": ""
         },
         "require": {
-            "doctrine/lexer": "1.*",
-            "php": ">=5.3.2"
+            "php": ">=5.2.8"
+        },
+        "replace": {
+            "njh/easyrdf": "self.version"
         },
         "require-dev": {
-            "doctrine/cache": "1.*"
+            "phpunit/phpunit": ">=3.5.15",
+            "sami/sami": "dev-master",
+            "squizlabs/php_codesniffer": ">=1.4.3"
         },
-        "time": "2013-11-19 05:59:59",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
+        "suggest": {
+            "ml/json-ld": "dev-master"
         },
+        "time": "2013-12-30 22:31:37",
+        "type": "library",
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Doctrine\\Common\\Annotations\\": "lib/"
+                "EasyRdf_": "lib/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com",
-                "homepage": "http://www.jwage.com/",
-                "role": "Creator"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com",
-                "homepage": "http://www.instaclick.com"
-            },
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com",
-                "homepage": "http://jmsyst.com",
-                "role": "Developer of wrapped JMSSerializerBundle"
+                "name": "Nicholas Humfrey",
+                "email": "njh@aelius.com",
+                "homepage": "http://www.aelius.com/njh/",
+                "role": "Developer"
             }
         ],
-        "description": "Docblock Annotations Parser",
-        "homepage": "http://www.doctrine-project.org",
+        "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.",
+        "homepage": "http://www.easyrdf.org/",
         "keywords": [
-            "annotations",
-            "docblock",
-            "parser"
+            "Linked Data",
+            "RDF",
+            "Semantic Web",
+            "Turtle",
+            "rdfa",
+            "sparql"
         ]
     },
     {
-        "name": "twig/twig",
-        "version": "v1.15.0",
-        "version_normalized": "1.15.0.0",
+        "name": "symfony/yaml",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "target-dir": "Symfony/Component/Yaml",
         "source": {
             "type": "git",
-            "url": "https://github.com/fabpot/Twig.git",
-            "reference": "85e4ff98000157ff753d934b9f13659a953f5666"
+            "url": "https://github.com/symfony/Yaml.git",
+            "reference": "e49a47d60348665261f6e279ba383241deb73cab"
         },
         "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fabpot/Twig/zipball/85e4ff98000157ff753d934b9f13659a953f5666",
-            "reference": "85e4ff98000157ff753d934b9f13659a953f5666",
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/Yaml/zipball/e49a47d60348665261f6e279ba383241deb73cab",
+            "reference": "e49a47d60348665261f6e279ba383241deb73cab",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.2.4"
+            "php": ">=5.3.3"
         },
-        "time": "2013-12-06 07:47:10",
+        "time": "2014-02-24 16:21:51",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.15-dev"
+                "dev-master": "2.5-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Twig_": "lib/"
+                "Symfony\\Component\\Yaml\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "BSD-3-Clause"
+            "MIT"
         ],
         "authors": [
             {
                 "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
+                "email": "fabien@symfony.com",
+                "homepage": "http://fabien.potencier.org",
+                "role": "Lead Developer"
             },
             {
-                "name": "Armin Ronacher",
-                "email": "armin.ronacher@active-4.com"
+                "name": "Symfony Community",
+                "homepage": "http://symfony.com/contributors"
             }
         ],
-        "description": "Twig, the flexible, fast, and secure template language for PHP",
-        "homepage": "http://twig.sensiolabs.org",
-        "keywords": [
-            "templating"
-        ]
+        "description": "Symfony Yaml Component",
+        "homepage": "http://symfony.com"
     },
     {
-        "name": "doctrine/common",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
+        "name": "guzzlehttp/streams",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/doctrine/common.git",
-            "reference": "a45d110f71c323e29f41eb0696fa230e3fa1b1b5"
+            "url": "https://github.com/guzzle/streams.git",
+            "reference": "d249beffe5fa5e0da3855974bcc2dd9082069ccf"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/doctrine/common/zipball/a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
-            "reference": "a45d110f71c323e29f41eb0696fa230e3fa1b1b5",
+            "url": "https://api.github.com/repos/guzzle/streams/zipball/d249beffe5fa5e0da3855974bcc2dd9082069ccf",
+            "reference": "d249beffe5fa5e0da3855974bcc2dd9082069ccf",
             "shasum": ""
         },
         "require": {
-            "doctrine/annotations": "1.*",
-            "doctrine/cache": "1.*",
-            "doctrine/collections": "1.*",
-            "doctrine/inflector": "1.*",
-            "doctrine/lexer": "1.*",
-            "php": ">=5.3.2"
+            "php": ">=5.4.0"
         },
         "require-dev": {
-            "phpunit/phpunit": "~3.7"
+            "phpunit/phpunit": "4.*"
         },
-        "time": "2014-01-12 22:00:08",
+        "time": "2014-03-25 18:31:28",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.5.x-dev"
+                "dev-master": "1.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Doctrine\\Common\\": "lib/"
-            }
+            "psr-4": {
+                "GuzzleHttp\\Stream\\": "src/"
+            },
+            "files": [
+                "src/functions.php"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -1312,64 +1666,38 @@
         ],
         "authors": [
             {
-                "name": "Jonathan Wage",
-                "email": "jonwage@gmail.com",
-                "homepage": "http://www.jwage.com/",
-                "role": "Creator"
-            },
-            {
-                "name": "Guilherme Blanco",
-                "email": "guilhermeblanco@gmail.com",
-                "homepage": "http://www.instaclick.com"
-            },
-            {
-                "name": "Roman Borschel",
-                "email": "roman@code-factory.org"
-            },
-            {
-                "name": "Benjamin Eberlei",
-                "email": "kontakt@beberlei.de"
-            },
-            {
-                "name": "Johannes Schmitt",
-                "email": "schmittjoh@gmail.com",
-                "homepage": "http://jmsyst.com",
-                "role": "Developer of wrapped JMSSerializerBundle"
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
             }
         ],
-        "description": "Common Library for Doctrine projects",
-        "homepage": "http://www.doctrine-project.org",
+        "description": "Provides a simple abstraction over streams of data (Guzzle 4+)",
+        "homepage": "http://guzzlephp.org/",
         "keywords": [
-            "annotations",
-            "collections",
-            "eventmanager",
-            "persistence",
-            "spl"
+            "Guzzle",
+            "stream"
         ]
     },
     {
-        "name": "symfony/class-loader",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/ClassLoader",
+        "name": "symfony/css-selector",
+        "version": "v2.4.4",
+        "version_normalized": "2.4.4.0",
+        "target-dir": "Symfony/Component/CssSelector",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/ClassLoader.git",
-            "reference": "6a2ebedbc780130f07b3a15363743d08eb46820c"
+            "url": "https://github.com/symfony/CssSelector.git",
+            "reference": "479a5b409723f596ffc3b5178034e4d76ce615b3"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/6a2ebedbc780130f07b3a15363743d08eb46820c",
-            "reference": "6a2ebedbc780130f07b3a15363743d08eb46820c",
+            "url": "https://api.github.com/repos/symfony/CssSelector/zipball/479a5b409723f596ffc3b5178034e4d76ce615b3",
+            "reference": "479a5b409723f596ffc3b5178034e4d76ce615b3",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "require-dev": {
-            "symfony/finder": "~2.0"
-        },
-        "time": "2013-11-26 16:40:27",
+        "time": "2014-04-18 20:37:09",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -1379,7 +1707,7 @@
         "installation-source": "dist",
         "autoload": {
             "psr-0": {
-                "Symfony\\Component\\ClassLoader\\": ""
+                "Symfony\\Component\\CssSelector\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -1389,57 +1717,65 @@
         "authors": [
             {
                 "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
+                "email": "fabien@symfony.com",
+                "homepage": "http://fabien.potencier.org",
+                "role": "Lead Developer"
             },
             {
                 "name": "Symfony Community",
                 "homepage": "http://symfony.com/contributors"
+            },
+            {
+                "name": "Jean-François Simon",
+                "email": "jeanfrancois.simon@sensiolabs.com"
             }
         ],
-        "description": "Symfony ClassLoader Component",
+        "description": "Symfony CssSelector Component",
         "homepage": "http://symfony.com"
     },
     {
-        "name": "symfony/dependency-injection",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/DependencyInjection",
+        "name": "guzzlehttp/guzzle",
+        "version": "4.1.0",
+        "version_normalized": "4.1.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/DependencyInjection.git",
-            "reference": "7e5bde3a607dde1f8ddef5180759068ad53d259c"
+            "url": "https://github.com/guzzle/guzzle.git",
+            "reference": "85a0ba7de064493c928a8bcdc5eef01e0bde9953"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/7e5bde3a607dde1f8ddef5180759068ad53d259c",
-            "reference": "7e5bde3a607dde1f8ddef5180759068ad53d259c",
+            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/85a0ba7de064493c928a8bcdc5eef01e0bde9953",
+            "reference": "85a0ba7de064493c928a8bcdc5eef01e0bde9953",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "ext-json": "*",
+            "guzzlehttp/streams": "~1.0",
+            "php": ">=5.4.0"
         },
         "require-dev": {
-            "symfony/config": "~2.2",
-            "symfony/expression-language": "~2.4",
-            "symfony/yaml": "~2.0"
+            "ext-curl": "*",
+            "phpunit/phpunit": "~4.0",
+            "psr/log": "~1.0"
         },
         "suggest": {
-            "symfony/config": "",
-            "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-            "symfony/yaml": ""
+            "ext-curl": "Guzzle will use specific adapters if cURL is present"
         },
-        "time": "2014-01-01 09:02:49",
+        "time": "2014-05-28 05:13:19",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.4-dev"
+                "dev-master": "4.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\DependencyInjection\\": ""
-            }
+            "psr-4": {
+                "GuzzleHttp\\": "src/"
+            },
+            "files": [
+                "src/functions.php"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
@@ -1447,728 +1783,692 @@
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
             }
         ],
-        "description": "Symfony DependencyInjection Component",
-        "homepage": "http://symfony.com"
+        "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
+        "homepage": "http://guzzlephp.org/",
+        "keywords": [
+            "client",
+            "curl",
+            "framework",
+            "http",
+            "http client",
+            "rest",
+            "web service"
+        ]
     },
     {
-        "name": "symfony/http-foundation",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/HttpFoundation",
+        "name": "sebastian/version",
+        "version": "1.0.3",
+        "version_normalized": "1.0.3.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/HttpFoundation.git",
-            "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844"
+            "url": "https://github.com/sebastianbergmann/version.git",
+            "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/6c6b8a7bcd7e2cc920cd6acace563fdbf121d844",
-            "reference": "6c6b8a7bcd7e2cc920cd6acace563fdbf121d844",
+            "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
+            "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43",
             "shasum": ""
         },
-        "require": {
-            "php": ">=5.3.3"
-        },
-        "time": "2014-01-05 02:10:50",
+        "time": "2014-03-07 15:35:33",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.4-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\HttpFoundation\\": ""
-            },
             "classmap": [
-                "Symfony/Component/HttpFoundation/Resources/stubs"
+                "src/"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
             }
         ],
-        "description": "Symfony HttpFoundation Component",
-        "homepage": "http://symfony.com"
+        "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+        "homepage": "https://github.com/sebastianbergmann/version"
     },
     {
-        "name": "symfony/event-dispatcher",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/EventDispatcher",
+        "name": "sebastian/exporter",
+        "version": "1.0.1",
+        "version_normalized": "1.0.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/EventDispatcher.git",
-            "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601"
+            "url": "https://github.com/sebastianbergmann/exporter.git",
+            "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e3ba42f6a70554ed05749e61b829550f6ac33601",
-            "reference": "e3ba42f6a70554ed05749e61b829550f6ac33601",
+            "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529",
+            "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
         "require-dev": {
-            "symfony/dependency-injection": "~2.0"
-        },
-        "suggest": {
-            "symfony/dependency-injection": "",
-            "symfony/http-kernel": ""
+            "phpunit/phpunit": "4.0.*@dev"
         },
-        "time": "2013-12-28 08:12:03",
+        "time": "2014-02-16 08:26:31",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.4-dev"
+                "dev-master": "1.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\EventDispatcher\\": ""
-            }
+            "classmap": [
+                "src/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
+            },
+            {
+                "name": "Jeff Welch",
+                "email": "whatthejeff@gmail.com"
             },
             {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Volker Dusch",
+                "email": "github@wallbash.com"
+            },
+            {
+                "name": "Adam Harvey",
+                "email": "aharvey@php.net",
+                "role": "Lead"
+            },
+            {
+                "name": "Bernhard Schussek",
+                "email": "bschussek@2bepublished.at"
             }
         ],
-        "description": "Symfony EventDispatcher Component",
-        "homepage": "http://symfony.com"
+        "description": "Provides the functionality to export PHP variables for visualization",
+        "homepage": "http://www.github.com/sebastianbergmann/exporter",
+        "keywords": [
+            "export",
+            "exporter"
+        ]
     },
     {
-        "name": "symfony/http-kernel",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/HttpKernel",
+        "name": "sebastian/environment",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/HttpKernel.git",
-            "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4"
+            "url": "https://github.com/sebastianbergmann/environment.git",
+            "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/0605eedeb52c4d3a3144128d8336395a57be60d4",
-            "reference": "0605eedeb52c4d3a3144128d8336395a57be60d4",
+            "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/79517609ec01139cd7e9fded0dd7ce08c952ef6a",
+            "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3",
-            "psr/log": "~1.0",
-            "symfony/debug": "~2.3",
-            "symfony/event-dispatcher": "~2.1",
-            "symfony/http-foundation": "~2.4"
+            "php": ">=5.3.3"
         },
         "require-dev": {
-            "symfony/browser-kit": "~2.2",
-            "symfony/class-loader": "~2.1",
-            "symfony/config": "~2.0",
-            "symfony/console": "~2.2",
-            "symfony/dependency-injection": "~2.0",
-            "symfony/finder": "~2.0",
-            "symfony/process": "~2.0",
-            "symfony/routing": "~2.2",
-            "symfony/stopwatch": "~2.2",
-            "symfony/templating": "~2.2"
-        },
-        "suggest": {
-            "symfony/browser-kit": "",
-            "symfony/class-loader": "",
-            "symfony/config": "",
-            "symfony/console": "",
-            "symfony/dependency-injection": "",
-            "symfony/finder": ""
+            "phpunit/phpunit": "4.0.*@dev"
         },
-        "time": "2014-01-05 02:12:11",
+        "time": "2014-02-18 16:17:19",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.4-dev"
+                "dev-master": "1.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\HttpKernel\\": ""
-            }
+            "classmap": [
+                "src/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
             }
         ],
-        "description": "Symfony HttpKernel Component",
-        "homepage": "http://symfony.com"
+        "description": "Provides functionality to handle HHVM/PHP environments",
+        "homepage": "http://www.github.com/sebastianbergmann/environment",
+        "keywords": [
+            "Xdebug",
+            "environment",
+            "hhvm"
+        ]
     },
     {
-        "name": "symfony/routing",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/Routing",
+        "name": "sebastian/diff",
+        "version": "1.1.0",
+        "version_normalized": "1.1.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/Routing.git",
-            "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a"
+            "url": "https://github.com/sebastianbergmann/diff.git",
+            "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Routing/zipball/4abfb500aab8be458c9e3a227ea56b190584f78a",
-            "reference": "4abfb500aab8be458c9e3a227ea56b190584f78a",
+            "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
+            "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "psr/log": "~1.0",
-            "symfony/config": "~2.2",
-            "symfony/expression-language": "~2.4",
-            "symfony/yaml": "~2.0"
-        },
-        "suggest": {
-            "doctrine/annotations": "For using the annotation loader",
-            "symfony/config": "For using the all-in-one router or any loader",
-            "symfony/expression-language": "For using expression matching",
-            "symfony/yaml": "For using the YAML loader"
-        },
-        "time": "2014-01-05 02:10:50",
+        "time": "2013-08-03 16:46:33",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.4-dev"
+                "dev-master": "1.1-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\Routing\\": ""
-            }
+            "classmap": [
+                "src/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
             },
             {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Kore Nordmann",
+                "email": "mail@kore-nordmann.de"
             }
         ],
-        "description": "Symfony Routing Component",
-        "homepage": "http://symfony.com",
+        "description": "Diff implementation",
+        "homepage": "http://www.github.com/sebastianbergmann/diff",
         "keywords": [
-            "router",
-            "routing",
-            "uri",
-            "url"
+            "diff"
         ]
     },
     {
-        "name": "symfony/serializer",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/Serializer",
+        "name": "sebastian/comparator",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/Serializer.git",
-            "reference": "60c54346958604379392672a3a998650a169a7f4"
+            "url": "https://github.com/sebastianbergmann/comparator.git",
+            "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Serializer/zipball/60c54346958604379392672a3a998650a169a7f4",
-            "reference": "60c54346958604379392672a3a998650a169a7f4",
+            "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2",
+            "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "php": ">=5.3.3",
+            "sebastian/diff": "~1.1",
+            "sebastian/exporter": "~1.0"
         },
-        "time": "2014-01-01 08:14:50",
+        "require-dev": {
+            "phpunit/phpunit": "~4.1"
+        },
+        "time": "2014-05-02 07:05:58",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.4-dev"
+                "dev-master": "1.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\Serializer\\": ""
-            }
+            "classmap": [
+                "src/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
             },
             {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Jeff Welch",
+                "email": "whatthejeff@gmail.com"
+            },
+            {
+                "name": "Volker Dusch",
+                "email": "github@wallbash.com"
+            },
+            {
+                "name": "Bernhard Schussek",
+                "email": "bschussek@2bepublished.at"
             }
         ],
-        "description": "Symfony Serializer Component",
-        "homepage": "http://symfony.com"
+        "description": "Provides the functionality to compare PHP values for equality",
+        "homepage": "http://www.github.com/sebastianbergmann/comparator",
+        "keywords": [
+            "comparator",
+            "compare",
+            "equality"
+        ]
     },
     {
-        "name": "symfony/property-access",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/PropertyAccess",
+        "name": "phpunit/php-text-template",
+        "version": "1.2.0",
+        "version_normalized": "1.2.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/PropertyAccess.git",
-            "reference": "274951234150e303c83099a2429be6be35629fe9"
+            "url": "https://github.com/sebastianbergmann/php-text-template.git",
+            "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/274951234150e303c83099a2429be6be35629fe9",
-            "reference": "274951234150e303c83099a2429be6be35629fe9",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+            "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3"
         },
-        "time": "2013-11-13 21:30:16",
+        "time": "2014-01-30 17:20:04",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.4-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\PropertyAccess\\": ""
-            }
+            "classmap": [
+                "Text/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
+        "include-path": [
+            ""
+        ],
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
             }
         ],
-        "description": "Symfony PropertyAccess Component",
-        "homepage": "http://symfony.com",
+        "description": "Simple template engine.",
+        "homepage": "https://github.com/sebastianbergmann/php-text-template/",
         "keywords": [
-            "access",
-            "array",
-            "extraction",
-            "index",
-            "injection",
-            "object",
-            "property",
-            "property path",
-            "reflection"
+            "template"
         ]
     },
     {
-        "name": "symfony/validator",
-        "version": "v2.4.1",
-        "version_normalized": "2.4.1.0",
-        "target-dir": "Symfony/Component/Validator",
+        "name": "phpunit/phpunit-mock-objects",
+        "version": "2.1.4",
+        "version_normalized": "2.1.4.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/Validator.git",
-            "reference": "7ea4e53f8d68bf3ae9cca28765d49d7930618730"
+            "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+            "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Validator/zipball/7ea4e53f8d68bf3ae9cca28765d49d7930618730",
-            "reference": "7ea4e53f8d68bf3ae9cca28765d49d7930618730",
+            "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f",
+            "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.3",
-            "symfony/property-access": "~2.2",
-            "symfony/translation": "~2.0"
+            "phpunit/php-text-template": "~1.2"
         },
         "require-dev": {
-            "doctrine/annotations": "~1.0",
-            "doctrine/cache": "~1.0",
-            "symfony/config": "~2.2",
-            "symfony/http-foundation": "~2.1",
-            "symfony/intl": "~2.3",
-            "symfony/yaml": "~2.0"
+            "phpunit/phpunit": "~4.1"
         },
         "suggest": {
-            "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
-            "doctrine/cache": "For using the default cached annotation reader",
-            "symfony/config": "",
-            "symfony/http-foundation": "",
-            "symfony/intl": "",
-            "symfony/yaml": ""
+            "ext-soap": "*"
         },
-        "time": "2014-01-01 08:14:50",
+        "time": "2014-06-07 16:22:57",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.4-dev"
+                "dev-master": "2.1.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\Validator\\": ""
-            }
+            "classmap": [
+                "src/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
+        "include-path": [
+            ""
+        ],
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
             }
         ],
-        "description": "Symfony Validator Component",
-        "homepage": "http://symfony.com"
+        "description": "Mock Object library for PHPUnit",
+        "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+        "keywords": [
+            "mock",
+            "xunit"
+        ]
     },
     {
-        "name": "easyrdf/easyrdf",
-        "version": "0.8.0",
-        "version_normalized": "0.8.0.0",
+        "name": "phpunit/php-timer",
+        "version": "1.0.5",
+        "version_normalized": "1.0.5.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/njh/easyrdf.git",
-            "reference": "3e43ab7274004e9f4192e06b9fc147781e1f85c2"
+            "url": "https://github.com/sebastianbergmann/php-timer.git",
+            "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/njh/easyrdf/zipball/3e43ab7274004e9f4192e06b9fc147781e1f85c2",
-            "reference": "3e43ab7274004e9f4192e06b9fc147781e1f85c2",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+            "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.2.8"
-        },
-        "replace": {
-            "njh/easyrdf": "self.version"
-        },
-        "require-dev": {
-            "phpunit/phpunit": ">=3.5.15",
-            "sami/sami": "dev-master",
-            "squizlabs/php_codesniffer": ">=1.4.3"
-        },
-        "suggest": {
-            "ml/json-ld": "dev-master"
+            "php": ">=5.3.3"
         },
-        "time": "2013-12-30 22:31:37",
+        "time": "2013-08-02 07:42:54",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "EasyRdf_": "lib/"
-            }
+            "classmap": [
+                "PHP/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
+        "include-path": [
+            ""
+        ],
         "license": [
             "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Nicholas Humfrey",
-                "email": "njh@aelius.com",
-                "homepage": "http://www.aelius.com/njh/",
-                "role": "Developer"
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
             }
         ],
-        "description": "EasyRdf is a PHP library designed to make it easy to consume and produce RDF.",
-        "homepage": "http://www.easyrdf.org/",
+        "description": "Utility class for timing",
+        "homepage": "https://github.com/sebastianbergmann/php-timer/",
         "keywords": [
-            "Linked Data",
-            "RDF",
-            "Semantic Web",
-            "Turtle",
-            "rdfa",
-            "sparql"
+            "timer"
         ]
     },
     {
-        "name": "symfony/yaml",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "target-dir": "Symfony/Component/Yaml",
+        "name": "phpunit/php-token-stream",
+        "version": "1.2.2",
+        "version_normalized": "1.2.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/Yaml.git",
-            "reference": "e49a47d60348665261f6e279ba383241deb73cab"
+            "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+            "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/Yaml/zipball/e49a47d60348665261f6e279ba383241deb73cab",
-            "reference": "e49a47d60348665261f6e279ba383241deb73cab",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32",
+            "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32",
             "shasum": ""
         },
         "require": {
+            "ext-tokenizer": "*",
             "php": ">=5.3.3"
         },
-        "time": "2014-02-24 16:21:51",
+        "time": "2014-03-03 05:10:30",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.5-dev"
+                "dev-master": "1.2-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\Yaml\\": ""
-            }
+            "classmap": [
+                "PHP/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
+        "include-path": [
+            ""
+        ],
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com",
-                "homepage": "http://fabien.potencier.org",
-                "role": "Lead Developer"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
             }
         ],
-        "description": "Symfony Yaml Component",
-        "homepage": "http://symfony.com"
+        "description": "Wrapper around PHP's tokenizer extension.",
+        "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+        "keywords": [
+            "tokenizer"
+        ]
     },
     {
-        "name": "guzzlehttp/streams",
-        "version": "1.0.0",
-        "version_normalized": "1.0.0.0",
+        "name": "phpunit/php-file-iterator",
+        "version": "1.3.4",
+        "version_normalized": "1.3.4.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/guzzle/streams.git",
-            "reference": "d249beffe5fa5e0da3855974bcc2dd9082069ccf"
+            "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+            "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/streams/zipball/d249beffe5fa5e0da3855974bcc2dd9082069ccf",
-            "reference": "d249beffe5fa5e0da3855974bcc2dd9082069ccf",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+            "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "4.*"
+            "php": ">=5.3.3"
         },
-        "time": "2014-03-25 18:31:28",
+        "time": "2013-10-10 15:34:57",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\Stream\\": "src/"
-            },
-            "files": [
-                "src/functions.php"
+            "classmap": [
+                "File/"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
+        "include-path": [
+            ""
+        ],
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
             }
         ],
-        "description": "Provides a simple abstraction over streams of data (Guzzle 4+)",
-        "homepage": "http://guzzlephp.org/",
+        "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+        "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
         "keywords": [
-            "Guzzle",
-            "stream"
+            "filesystem",
+            "iterator"
         ]
     },
     {
-        "name": "symfony/css-selector",
-        "version": "v2.4.4",
-        "version_normalized": "2.4.4.0",
-        "target-dir": "Symfony/Component/CssSelector",
+        "name": "phpunit/php-code-coverage",
+        "version": "2.0.8",
+        "version_normalized": "2.0.8.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/CssSelector.git",
-            "reference": "479a5b409723f596ffc3b5178034e4d76ce615b3"
+            "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+            "reference": "58401826c8cfc8fd689b60026e91c337df374bca"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/CssSelector/zipball/479a5b409723f596ffc3b5178034e4d76ce615b3",
-            "reference": "479a5b409723f596ffc3b5178034e4d76ce615b3",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/58401826c8cfc8fd689b60026e91c337df374bca",
+            "reference": "58401826c8cfc8fd689b60026e91c337df374bca",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "php": ">=5.3.3",
+            "phpunit/php-file-iterator": "~1.3.1",
+            "phpunit/php-text-template": "~1.2.0",
+            "phpunit/php-token-stream": "~1.2.2",
+            "sebastian/environment": "~1.0.0",
+            "sebastian/version": "~1.0.3"
         },
-        "time": "2014-04-18 20:37:09",
+        "require-dev": {
+            "ext-xdebug": ">=2.1.4",
+            "phpunit/phpunit": "~4.0.14"
+        },
+        "suggest": {
+            "ext-dom": "*",
+            "ext-xdebug": ">=2.2.1",
+            "ext-xmlwriter": "*"
+        },
+        "time": "2014-05-26 14:55:24",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "2.4-dev"
+                "dev-master": "2.0.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Symfony\\Component\\CssSelector\\": ""
-            }
+            "classmap": [
+                "src/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
+        "include-path": [
+            ""
+        ],
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Fabien Potencier",
-                "email": "fabien@symfony.com",
-                "homepage": "http://fabien.potencier.org",
-                "role": "Lead Developer"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "http://symfony.com/contributors"
-            },
-            {
-                "name": "Jean-François Simon",
-                "email": "jeanfrancois.simon@sensiolabs.com"
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
             }
         ],
-        "description": "Symfony CssSelector Component",
-        "homepage": "http://symfony.com"
+        "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+        "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+        "keywords": [
+            "coverage",
+            "testing",
+            "xunit"
+        ]
     },
     {
-        "name": "guzzlehttp/guzzle",
-        "version": "4.1.0",
-        "version_normalized": "4.1.0.0",
+        "name": "phpunit/phpunit",
+        "version": "4.1.3",
+        "version_normalized": "4.1.3.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/guzzle/guzzle.git",
-            "reference": "85a0ba7de064493c928a8bcdc5eef01e0bde9953"
+            "url": "https://github.com/sebastianbergmann/phpunit.git",
+            "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/guzzle/guzzle/zipball/85a0ba7de064493c928a8bcdc5eef01e0bde9953",
-            "reference": "85a0ba7de064493c928a8bcdc5eef01e0bde9953",
+            "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/939cb801b3b2aa253aedd0b279f40bb8f35cec91",
+            "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91",
             "shasum": ""
         },
         "require": {
+            "ext-dom": "*",
             "ext-json": "*",
-            "guzzlehttp/streams": "~1.0",
-            "php": ">=5.4.0"
-        },
-        "require-dev": {
-            "ext-curl": "*",
-            "phpunit/phpunit": "~4.0",
-            "psr/log": "~1.0"
+            "ext-pcre": "*",
+            "ext-reflection": "*",
+            "ext-spl": "*",
+            "php": ">=5.3.3",
+            "phpunit/php-code-coverage": "~2.0",
+            "phpunit/php-file-iterator": "~1.3.1",
+            "phpunit/php-text-template": "~1.2",
+            "phpunit/php-timer": "~1.0.2",
+            "phpunit/phpunit-mock-objects": "~2.1",
+            "sebastian/comparator": "~1.0",
+            "sebastian/diff": "~1.1",
+            "sebastian/environment": "~1.0",
+            "sebastian/exporter": "~1.0",
+            "sebastian/version": "~1.0",
+            "symfony/yaml": "~2.0"
         },
         "suggest": {
-            "ext-curl": "Guzzle will use specific adapters if cURL is present"
+            "phpunit/php-invoker": "~1.1"
         },
-        "time": "2014-05-28 05:13:19",
+        "time": "2014-06-11 14:15:47",
+        "bin": [
+            "phpunit"
+        ],
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "4.0.x-dev"
+                "dev-master": "4.1.x-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-4": {
-                "GuzzleHttp\\": "src/"
-            },
-            "files": [
-                "src/functions.php"
+            "classmap": [
+                "src/"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
+        "include-path": [
+            "",
+            "../../symfony/yaml/"
+        ],
         "license": [
-            "MIT"
+            "BSD-3-Clause"
         ],
         "authors": [
             {
-                "name": "Michael Dowling",
-                "email": "mtdowling@gmail.com",
-                "homepage": "https://github.com/mtdowling"
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
             }
         ],
-        "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients",
-        "homepage": "http://guzzlephp.org/",
+        "description": "The PHP Unit Testing framework.",
+        "homepage": "http://www.phpunit.de/",
         "keywords": [
-            "client",
-            "curl",
-            "framework",
-            "http",
-            "http client",
-            "rest",
-            "web service"
+            "phpunit",
+            "testing",
+            "xunit"
         ]
     }
 ]
diff --git a/core/vendor/phpunit/php-code-coverage/.gitignore b/core/vendor/phpunit/php-code-coverage/.gitignore
index 82b141c43538b4d5e40c6ed949ea698e70cdc376..b386531f05c19a95eb99fe5595c2ac73e1125708 100644
--- a/core/vendor/phpunit/php-code-coverage/.gitignore
+++ b/core/vendor/phpunit/php-code-coverage/.gitignore
@@ -7,3 +7,5 @@ cache.properties
 phpunit.xml
 /vendor
 /composer.lock
+/composer.phar
+/.idea
diff --git a/core/vendor/phpunit/php-code-coverage/.travis.yml b/core/vendor/phpunit/php-code-coverage/.travis.yml
index 35a8eb121ad68440c0d9013235ecff867ec45994..5c23715f513c58857194d2a67b635117a609849b 100644
--- a/core/vendor/phpunit/php-code-coverage/.travis.yml
+++ b/core/vendor/phpunit/php-code-coverage/.travis.yml
@@ -1,22 +1,20 @@
 language: php
 
 php:
+    - 5.3.3
     - 5.3
     - 5.4
+    - 5.5
+    - 5.6
 
 before_script:
-    - mkdir -p vendor/SebastianBergmann
-    - git clone --branch=3.7 --depth=100 --quiet git://github.com/sebastianbergmann/phpunit.git vendor/phpunit
-    - git clone --branch=1.2 --depth=100 --quiet git://github.com/sebastianbergmann/phpunit-mock-objects.git vendor/phpunit-mock-objects
-    - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-text-template.git vendor/php-text-template
-    - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-token-stream.git vendor/php-token-stream
-    - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-file-iterator.git vendor/php-file-iterator
-    - git clone --branch=1.0 --depth=100 --quiet git://github.com/sebastianbergmann/php-timer.git vendor/php-timer
-    - git clone --branch=master --depth=100 --quiet git://github.com/pear/pear-core.git vendor/pear-core
-    - git clone --branch=trunk --depth=100 --quiet git://github.com/pear/Console_Getopt.git vendor/console-getopt
+    - COMPOSER_ROOT_VERSION=dev-master composer install --dev --prefer-source
 
-script: php -d include_path=vendor/php-text-template:vendor/php-token-stream:vendor/php-file-iterator:vendor/phpunit:vendor/phpunit-mock-objects:vendor/php-timer:vendor/php-invoker:vendor/pear-core:vendor/console-getopt:vendor:. ./vendor/phpunit/phpunit.php --configuration ./build/travis-ci.xml
+script: vendor/bin/phpunit --configuration ./build/travis-ci.xml
 
 notifications:
   email: false
-  irc: "irc.freenode.org#phpunit"
+  irc:
+    channels:
+      - "irc.freenode.org#phpunit"
+    use_notice: true
diff --git a/core/vendor/phpunit/php-code-coverage/CONTRIBUTING.md b/core/vendor/phpunit/php-code-coverage/CONTRIBUTING.md
index b290539826403d0313b49cdf2735bbefee37a771..6f6ef3445223f8ccd29fd0a7ba66057f77f88bc5 100644
--- a/core/vendor/phpunit/php-code-coverage/CONTRIBUTING.md
+++ b/core/vendor/phpunit/php-code-coverage/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-Pull Requests for bug fixes should be made against the current release branch (1.2). 
+Pull Requests for bug fixes should be made against the current release branch (1.2).
 
 Pull Requests for new features should be made against master.
 
diff --git a/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown b/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown
deleted file mode 100644
index 60099511088e74ed393b577bca11b79d0264e099..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/ChangeLog.markdown
+++ /dev/null
@@ -1,81 +0,0 @@
-PHP_CodeCoverage 1.2
-====================
-
-This is the list of changes for the PHP_CodeCoverage 1.2 release series.
-
-PHP_CodeCoverage 1.2.11
------------------------
-
-* Fixed #151: Blacklisted PHPUnit Phar.
-* Fixed sebastianbergmann/phpunit#924.
-
-PHP_CodeCoverage 1.2.10
------------------------
-
-* Fixed #158: Executable code on a line that has a comment is processed incorrectly.
-* Eliminated the coupling to `PHPUnit_Util_Printer` in `PHP_CodeCoverage_Report_Text`.
-
-PHP_CodeCoverage 1.2.9
-----------------------
-
-* Improved rendering of "lines covered" numbers for functions and methods with long names or argument lists.
-* Fixed the title of the Y axis of the Code Coverage ./. Cyclomatic Complexity dashboard chart.
-* Upgraded to Highcharts 2.3.5.
-* Upgraded to jQuery 1.9.1.
-
-PHP_CodeCoverage 1.2.8
-----------------------
-
-* Reduced vertical whitespace in sourcecode view.
-* Upgraded to Bootstrap 2.2.2.
-
-PHP_CodeCoverage 1.2.7
-----------------------
-
-* The `html5shiv.js` is now bundled.
-* Fixed sebastianbergmann/phpunit#702: `@coversNothing` didn't work as documented.
-
-PHP_CodeCoverage 1.2.6
-----------------------
-
-* Fixed #126: `E_NOTICE` thrown when generating coverage report.
-
-PHP_CodeCoverage 1.2.5
-----------------------
-
-* Fixed regression introduced in PHP_CodeCoverage 1.2.4.
-
-PHP_CodeCoverage 1.2.4
-----------------------
-
-* Fixed #123: Incorrect code coverage for interfaces.
-
-PHP_CodeCoverage 1.2.3
-----------------------
-
-* Implemented #116: Do not rely on autoloader class map to populate blacklist.
-* Added support for parentheses after method names in the `@covers` annotation.
-* When `addUncoveredFilesFromWhitelist=FALSE` is set then files that are whitelisted but not covered by a single test are now excluded from the code coverage.
-* Fixed #81: Non-english locales broke the coverage bars in the HTML report.
-* Fixed #118: Percentage for tested classes and traits displayed incorrectly.
-* Fixed #121: One line `@covers` annotations did not work.
-
-PHP_CodeCoverage 1.2.2
-----------------------
-
-* Fixed #115: Backwards compatibility wrapper for `trait_exists()` does not work.
-
-PHP_CodeCoverage 1.2.1
-----------------------
-
-* Fixed invalid markup in the HTML report.
-* The version number is now displayed when using PHP_CodeCoverage from a Composer install or Git checkout.
-
-PHP_CodeCoverage 1.2.0
-----------------------
-
-* The HTML report has been redesigned.
-* The new `@coversDefaultClass` annotation enables short `@covers` annotations when working with long class names or namespaces.
-* The new `@coversNothing` annotation can be used so tests do not record any code coverage. Useful for integration testing.
-* When `processUncoveredFilesFromWhitelist=FALSE` is set then files that are whitelisted but not covered by a single test are now included in the code coverage but with all lines, including those that are not executable, counted as not executed.
-* PHP_CodeCoverage 1.2 is only supported on PHP 5.3.3 (or later) and PHP 5.4.7 (or later) is highly recommended.
diff --git a/core/vendor/phpunit/php-code-coverage/LICENSE b/core/vendor/phpunit/php-code-coverage/LICENSE
index 95d18222fe1d79759ec2435015b6e0a9c157063a..02e6511bdae0d76e1aec6c9c5acf898f32e156e4 100644
--- a/core/vendor/phpunit/php-code-coverage/LICENSE
+++ b/core/vendor/phpunit/php-code-coverage/LICENSE
@@ -1,6 +1,6 @@
 PHP_CodeCoverage
 
-Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage.php b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage.php
deleted file mode 100644
index 041d01d9365f0051225eb8e3bbee8de6db8821e3..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage.php
+++ /dev/null
@@ -1,801 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.0.0
- */
-
-// @codeCoverageIgnoreStart
-// @codingStandardsIgnoreStart
-/**
- * @SuppressWarnings(PHPMD)
- */
-if (!function_exists('trait_exists')) {
-    function trait_exists($name)
-    {
-        return FALSE;
-    }
-}
-// @codingStandardsIgnoreEnd
-// @codeCoverageIgnoreEnd
-
-/**
- * Provides collection functionality for PHP code coverage information.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.0.0
- */
-class PHP_CodeCoverage
-{
-    /**
-     * @var PHP_CodeCoverage_Driver
-     */
-    protected $driver;
-
-    /**
-     * @var PHP_CodeCoverage_Filter
-     */
-    protected $filter;
-
-    /**
-     * @var boolean
-     */
-    protected $cacheTokens = FALSE;
-
-    /**
-     * @var boolean
-     */
-    protected $forceCoversAnnotation = FALSE;
-
-    /**
-     * @var boolean
-     */
-    protected $mapTestClassNameToCoveredClassName = FALSE;
-
-    /**
-     * @var boolean
-     */
-    protected $addUncoveredFilesFromWhitelist = TRUE;
-
-    /**
-     * @var boolean
-     */
-    protected $processUncoveredFilesFromWhitelist = FALSE;
-
-    /**
-     * @var mixed
-     */
-    protected $currentId;
-
-    /**
-     * Code coverage data.
-     *
-     * @var array
-     */
-    protected $data = array();
-
-    /**
-     * Test data.
-     *
-     * @var array
-     */
-    protected $tests = array();
-
-    /**
-     * Constructor.
-     *
-     * @param PHP_CodeCoverage_Driver $driver
-     * @param PHP_CodeCoverage_Filter $filter
-     */
-    public function __construct(PHP_CodeCoverage_Driver $driver = NULL, PHP_CodeCoverage_Filter $filter = NULL)
-    {
-        if ($driver === NULL) {
-            $driver = new PHP_CodeCoverage_Driver_Xdebug;
-        }
-
-        if ($filter === NULL) {
-            $filter = new PHP_CodeCoverage_Filter;
-        }
-
-        $this->driver = $driver;
-        $this->filter = $filter;
-    }
-
-    /**
-     * Returns the PHP_CodeCoverage_Report_Node_* object graph
-     * for this PHP_CodeCoverage object.
-     *
-     * @return PHP_CodeCoverage_Report_Node_Directory
-     * @since  Method available since Release 1.1.0
-     */
-    public function getReport()
-    {
-        $factory = new PHP_CodeCoverage_Report_Factory;
-
-        return $factory->create($this);
-    }
-
-    /**
-     * Clears collected code coverage data.
-     */
-    public function clear()
-    {
-        $this->currentId = NULL;
-        $this->data      = array();
-        $this->tests     = array();
-    }
-
-    /**
-     * Returns the PHP_CodeCoverage_Filter used.
-     *
-     * @return PHP_CodeCoverage_Filter
-     */
-    public function filter()
-    {
-        return $this->filter;
-    }
-
-    /**
-     * Returns the collected code coverage data.
-     *
-     * @return array
-     * @since  Method available since Release 1.1.0
-     */
-    public function getData()
-    {
-        if ($this->addUncoveredFilesFromWhitelist) {
-            $this->addUncoveredFilesFromWhitelist();
-        }
-
-        // We need to apply the blacklist filter a second time
-        // when no whitelist is used.
-        if (!$this->filter->hasWhitelist()) {
-            $this->applyListsFilter($this->data);
-        }
-
-        return $this->data;
-    }
-
-    /**
-     * Returns the test data.
-     *
-     * @return array
-     * @since  Method available since Release 1.1.0
-     */
-    public function getTests()
-    {
-        return $this->tests;
-    }
-
-    /**
-     * Start collection of code coverage information.
-     *
-     * @param  mixed   $id
-     * @param  boolean $clear
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function start($id, $clear = FALSE)
-    {
-        if (!is_bool($clear)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'boolean'
-            );
-        }
-
-        if ($clear) {
-            $this->clear();
-        }
-
-        $this->currentId = $id;
-
-        $this->driver->start();
-    }
-
-    /**
-     * Stop collection of code coverage information.
-     *
-     * @param  boolean $append
-     * @return array
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function stop($append = TRUE)
-    {
-        if (!is_bool($append)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'boolean'
-            );
-        }
-
-        $data = $this->driver->stop();
-        $this->append($data, NULL, $append);
-
-        $this->currentId = NULL;
-
-        return $data;
-    }
-
-    /**
-     * Appends code coverage data.
-     *
-     * @param array   $data
-     * @param mixed   $id
-     * @param boolean $append
-     */
-    public function append(array $data, $id = NULL, $append = TRUE)
-    {
-        if ($id === NULL) {
-            $id = $this->currentId;
-        }
-
-        if ($id === NULL) {
-            throw new PHP_CodeCoverage_Exception;
-        }
-
-        $this->applyListsFilter($data);
-        $this->initializeFilesThatAreSeenTheFirstTime($data);
-
-        if (!$append) {
-            return;
-        }
-
-        if ($id != 'UNCOVERED_FILES_FROM_WHITELIST') {
-            $this->applyCoversAnnotationFilter($data, $id);
-        }
-
-        if (empty($data)) {
-            return;
-        }
-
-        $status = NULL;
-
-        if ($id instanceof PHPUnit_Framework_TestCase) {
-            $status = $id->getStatus();
-            $id     = get_class($id) . '::' . $id->getName();
-        }
-
-        else if ($id instanceof PHPUnit_Extensions_PhptTestCase) {
-            $id = $id->getName();
-        }
-
-        $this->tests[$id] = $status;
-
-        foreach ($data as $file => $lines) {
-            if (!$this->filter->isFile($file)) {
-                continue;
-            }
-
-            foreach ($lines as $k => $v) {
-                if ($v == 1) {
-                    $this->data[$file][$k][] = $id;
-                }
-            }
-        }
-    }
-
-    /**
-     * Merges the data from another instance of PHP_CodeCoverage.
-     *
-     * @param PHP_CodeCoverage $that
-     */
-    public function merge(PHP_CodeCoverage $that)
-    {
-        foreach ($that->data as $file => $lines) {
-            if (!isset($this->data[$file])) {
-                if (!$this->filter->isFiltered($file)) {
-                    $this->data[$file] = $lines;
-                }
-
-                continue;
-            }
-
-            foreach ($lines as $line => $data) {
-                if ($data !== NULL) {
-                    if (!isset($this->data[$file][$line])) {
-                        $this->data[$file][$line] = $data;
-                    } else {
-                        $this->data[$file][$line] = array_unique(
-                          array_merge($this->data[$file][$line], $data)
-                        );
-                    }
-                }
-            }
-        }
-
-        $this->tests = array_merge($this->tests, $that->getTests());
-    }
-
-    /**
-     * @param  boolean $flag
-     * @throws PHP_CodeCoverage_Exception
-     * @since  Method available since Release 1.1.0
-     */
-    public function setCacheTokens($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'boolean'
-            );
-        }
-
-        $this->cacheTokens = $flag;
-    }
-
-    /**
-     * @param boolean $flag
-     * @since Method available since Release 1.1.0
-     */
-    public function getCacheTokens()
-    {
-        return $this->cacheTokens;
-    }
-
-    /**
-     * @param  boolean $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setForceCoversAnnotation($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'boolean'
-            );
-        }
-
-        $this->forceCoversAnnotation = $flag;
-    }
-
-    /**
-     * @param  boolean $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setMapTestClassNameToCoveredClassName($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'boolean'
-            );
-        }
-
-        $this->mapTestClassNameToCoveredClassName = $flag;
-    }
-
-    /**
-     * @param  boolean $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setAddUncoveredFilesFromWhitelist($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'boolean'
-            );
-        }
-
-        $this->addUncoveredFilesFromWhitelist = $flag;
-    }
-
-    /**
-     * @param  boolean $flag
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function setProcessUncoveredFilesFromWhitelist($flag)
-    {
-        if (!is_bool($flag)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'boolean'
-            );
-        }
-
-        $this->processUncoveredFilesFromWhitelist = $flag;
-    }
-
-    /**
-     * Applies the @covers annotation filtering.
-     *
-     * @param array $data
-     * @param mixed $id
-     */
-    protected function applyCoversAnnotationFilter(&$data, $id)
-    {
-        if ($id instanceof PHPUnit_Framework_TestCase) {
-            $testClassName    = get_class($id);
-            $linesToBeCovered = $this->getLinesToBeCovered(
-              $testClassName, $id->getName()
-            );
-
-            if ($linesToBeCovered === FALSE) {
-                $data = array();
-                return;
-            }
-
-            if ($this->mapTestClassNameToCoveredClassName &&
-                empty($linesToBeCovered)) {
-                $testedClass = substr($testClassName, 0, -4);
-
-                if (class_exists($testedClass)) {
-                    $class = new ReflectionClass($testedClass);
-
-                    $linesToBeCovered = array(
-                      $class->getFileName() => range(
-                        $class->getStartLine(), $class->getEndLine()
-                      )
-                    );
-                }
-            }
-        } else {
-            $linesToBeCovered = array();
-        }
-
-        if (!empty($linesToBeCovered)) {
-            $data = array_intersect_key($data, $linesToBeCovered);
-
-            foreach (array_keys($data) as $filename) {
-                $data[$filename] = array_intersect_key(
-                  $data[$filename], array_flip($linesToBeCovered[$filename])
-                );
-            }
-        }
-
-        else if ($this->forceCoversAnnotation) {
-            $data = array();
-        }
-    }
-
-    /**
-     * Applies the blacklist/whitelist filtering.
-     *
-     * @param array $data
-     */
-    protected function applyListsFilter(&$data)
-    {
-        foreach (array_keys($data) as $filename) {
-            if ($this->filter->isFiltered($filename)) {
-                unset($data[$filename]);
-            }
-        }
-    }
-
-    /**
-     * @since Method available since Release 1.1.0
-     */
-    protected function initializeFilesThatAreSeenTheFirstTime($data)
-    {
-        foreach ($data as $file => $lines) {
-            if ($this->filter->isFile($file) && !isset($this->data[$file])) {
-                $this->data[$file] = array();
-
-                foreach ($lines as $k => $v) {
-                    $this->data[$file][$k] = $v == -2 ? NULL : array();
-                }
-            }
-        }
-    }
-
-    /**
-     * Processes whitelisted files that are not covered.
-     */
-    protected function addUncoveredFilesFromWhitelist()
-    {
-        $data           = array();
-        $uncoveredFiles = array_diff(
-          $this->filter->getWhitelist(), array_keys($this->data)
-        );
-
-        foreach ($uncoveredFiles as $uncoveredFile) {
-            if (!file_exists($uncoveredFile)) {
-                continue;
-            }
-
-            if ($this->processUncoveredFilesFromWhitelist) {
-                $this->processUncoveredFileFromWhitelist(
-                  $uncoveredFile, $data, $uncoveredFiles
-                );
-            } else {
-                $data[$uncoveredFile] = array();
-
-                $lines = count(file($uncoveredFile));
-
-                for ($i = 1; $i <= $lines; $i++) {
-                    $data[$uncoveredFile][$i] = -1;
-                }
-            }
-        }
-
-        $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');
-    }
-
-    /**
-     * @param string $uncoveredFile
-     * @param array  $data
-     * @param array  $uncoveredFiles
-     */
-    protected function processUncoveredFileFromWhitelist($uncoveredFile, array &$data, array $uncoveredFiles)
-    {
-        $this->driver->start();
-        include_once $uncoveredFile;
-        $coverage = $this->driver->stop();
-
-        foreach ($coverage as $file => $fileCoverage) {
-            if (!isset($data[$file]) &&
-                in_array($file, $uncoveredFiles)) {
-                foreach (array_keys($fileCoverage) as $key) {
-                    if ($fileCoverage[$key] == 1) {
-                        $fileCoverage[$key] = -1;
-                    }
-                }
-
-                $data[$file] = $fileCoverage;
-            }
-        }
-    }
-
-    /**
-     * Returns the files and lines a test method wants to cover.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return array
-     * @since  Method available since Release 1.2.0
-     */
-    protected function getLinesToBeCovered($className, $methodName)
-    {
-        $codeToCoverList = array();
-        $result          = array();
-
-        // @codeCoverageIgnoreStart
-        if (($pos = strpos($methodName, ' ')) !== FALSE) {
-            $methodName = substr($methodName, 0, $pos);
-        }
-        // @codeCoverageIgnoreEnd
-
-        $class = new ReflectionClass($className);
-
-        try {
-            $method = new ReflectionMethod($className, $methodName);
-        }
-
-        catch (ReflectionException $e) {
-            return array();
-        }
-
-        $docComment = substr($class->getDocComment(), 3, -2) . PHP_EOL . substr($method->getDocComment(), 3, -2);
-
-        $templateMethods = array(
-          'setUp', 'assertPreConditions', 'assertPostConditions', 'tearDown'
-        );
-
-        foreach ($templateMethods as $templateMethod) {
-            if ($class->hasMethod($templateMethod)) {
-                $reflector   = $class->getMethod($templateMethod);
-                $docComment .= PHP_EOL . substr($reflector->getDocComment(), 3, -2);
-                unset($reflector);
-            }
-        }
-
-        if (strpos($docComment, '@coversNothing') !== FALSE) {
-            return FALSE;
-        }
-
-        $classShortcut = preg_match_all(
-          '(@coversDefaultClass\s+(?P<coveredClass>[^\s]++)\s*$)m',
-          $class->getDocComment(),
-          $matches
-        );
-
-        if ($classShortcut) {
-            if ($classShortcut > 1) {
-                throw new PHP_CodeCoverage_Exception(
-                  sprintf(
-                    'More than one @coversClass annotation in class or interface "%s".',
-                    $className
-                  )
-                );
-            }
-
-            $classShortcut = $matches['coveredClass'][0];
-        }
-
-        $match = preg_match_all(
-          '(@covers\s+(?P<coveredElement>[^\s()]++)[\s()]*$)m',
-          $docComment,
-          $matches
-        );
-
-        if ($match) {
-            foreach ($matches['coveredElement'] as $coveredElement) {
-                if ($classShortcut && strncmp($coveredElement, '::', 2) === 0) {
-                    $coveredElement = $classShortcut . $coveredElement;
-                }
-
-                $codeToCoverList = array_merge(
-                  $codeToCoverList,
-                  $this->resolveCoversToReflectionObjects($coveredElement)
-                );
-            }
-
-            foreach ($codeToCoverList as $codeToCover) {
-                $fileName = $codeToCover->getFileName();
-
-                if (!isset($result[$fileName])) {
-                    $result[$fileName] = array();
-                }
-
-                $result[$fileName] = array_unique(
-                  array_merge(
-                    $result[$fileName],
-                    range(
-                      $codeToCover->getStartLine(), $codeToCover->getEndLine()
-                    )
-                  )
-                );
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param  string $coveredElement
-     * @return array
-     * @since  Method available since Release 1.2.0
-     */
-    protected function resolveCoversToReflectionObjects($coveredElement)
-    {
-        $codeToCoverList = array();
-
-        if (strpos($coveredElement, '::') !== FALSE) {
-            list($className, $methodName) = explode('::', $coveredElement);
-
-            if (isset($methodName[0]) && $methodName[0] == '<') {
-                $classes = array($className);
-
-                foreach ($classes as $className) {
-                    if (!class_exists($className) &&
-                        !interface_exists($className)) {
-                        throw new PHP_CodeCoverage_Exception(
-                          sprintf(
-                            'Trying to @cover not existing class or ' .
-                            'interface "%s".',
-                            $className
-                          )
-                        );
-                    }
-
-                    $class   = new ReflectionClass($className);
-                    $methods = $class->getMethods();
-                    $inverse = isset($methodName[1]) && $methodName[1] == '!';
-
-                    if (strpos($methodName, 'protected')) {
-                        $visibility = 'isProtected';
-                    }
-
-                    else if (strpos($methodName, 'private')) {
-                        $visibility = 'isPrivate';
-                    }
-
-                    else if (strpos($methodName, 'public')) {
-                        $visibility = 'isPublic';
-                    }
-
-                    foreach ($methods as $method) {
-                        if ($inverse && !$method->$visibility()) {
-                            $codeToCoverList[] = $method;
-                        }
-
-                        else if (!$inverse && $method->$visibility()) {
-                            $codeToCoverList[] = $method;
-                        }
-                    }
-                }
-            } else {
-                $classes = array($className);
-
-                foreach ($classes as $className) {
-                    if ($className == '' && function_exists($methodName)) {
-                        $codeToCoverList[] = new ReflectionFunction(
-                          $methodName
-                        );
-                    } else {
-                        if (!((class_exists($className) ||
-                               interface_exists($className) ||
-                               trait_exists($className)) &&
-                              method_exists($className, $methodName))) {
-                            throw new PHP_CodeCoverage_Exception(
-                              sprintf(
-                                'Trying to @cover not existing method "%s::%s".',
-                                $className,
-                                $methodName
-                              )
-                            );
-                        }
-
-                        $codeToCoverList[] = new ReflectionMethod(
-                          $className, $methodName
-                        );
-                    }
-                }
-            }
-        } else {
-            $extended = FALSE;
-
-            if (strpos($coveredElement, '<extended>') !== FALSE) {
-                $coveredElement = str_replace(
-                  '<extended>', '', $coveredElement
-                );
-
-                $extended = TRUE;
-            }
-
-            $classes = array($coveredElement);
-
-            if ($extended) {
-                $classes = array_merge(
-                  $classes,
-                  class_implements($coveredElement),
-                  class_parents($coveredElement)
-                );
-            }
-
-            foreach ($classes as $className) {
-                if (!class_exists($className) &&
-                    !interface_exists($className) &&
-                    !trait_exists($className)) {
-                    throw new PHP_CodeCoverage_Exception(
-                      sprintf(
-                        'Trying to @cover not existing class or ' .
-                        'interface "%s".',
-                        $className
-                      )
-                    );
-                }
-
-                $codeToCoverList[] = new ReflectionClass($className);
-            }
-        }
-
-        return $codeToCoverList;
-    }
-}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Autoload.php b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Autoload.php
deleted file mode 100644
index eeeb4ca72e279713f83b86fec02d0a7914337304..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Autoload.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2010 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-if (defined('PHPUNIT_COMPOSER_INSTALL')) {
-    return;
-}
-
-require_once 'File/Iterator/Autoload.php';
-require_once 'PHP/Token/Stream/Autoload.php';
-require_once 'Text/Template/Autoload.php';
-
-spl_autoload_register(
-  function ($class)
-  {
-      static $classes = NULL;
-      static $path = NULL;
-
-      if ($classes === NULL) {
-          $classes = array(
-            'php_codecoverage' => '/CodeCoverage.php',
-            'php_codecoverage_driver' => '/CodeCoverage/Driver.php',
-            'php_codecoverage_driver_xdebug' => '/CodeCoverage/Driver/Xdebug.php',
-            'php_codecoverage_exception' => '/CodeCoverage/Exception.php',
-            'php_codecoverage_filter' => '/CodeCoverage/Filter.php',
-            'php_codecoverage_report_clover' => '/CodeCoverage/Report/Clover.php',
-            'php_codecoverage_report_factory' => '/CodeCoverage/Report/Factory.php',
-            'php_codecoverage_report_html' => '/CodeCoverage/Report/HTML.php',
-            'php_codecoverage_report_html_renderer' => '/CodeCoverage/Report/HTML/Renderer.php',
-            'php_codecoverage_report_html_renderer_dashboard' => '/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
-            'php_codecoverage_report_html_renderer_directory' => '/CodeCoverage/Report/HTML/Renderer/Directory.php',
-            'php_codecoverage_report_html_renderer_file' => '/CodeCoverage/Report/HTML/Renderer/File.php',
-            'php_codecoverage_report_node' => '/CodeCoverage/Report/Node.php',
-            'php_codecoverage_report_node_directory' => '/CodeCoverage/Report/Node/Directory.php',
-            'php_codecoverage_report_node_file' => '/CodeCoverage/Report/Node/File.php',
-            'php_codecoverage_report_node_iterator' => '/CodeCoverage/Report/Node/Iterator.php',
-            'php_codecoverage_report_php' => '/CodeCoverage/Report/PHP.php',
-            'php_codecoverage_report_text' => '/CodeCoverage/Report/Text.php',
-            'php_codecoverage_util' => '/CodeCoverage/Util.php',
-            'php_codecoverage_util_invalidargumenthelper' => '/CodeCoverage/Util/InvalidArgumentHelper.php',
-            'php_codecoverage_version' => '/CodeCoverage/Version.php'
-          );
-
-          $path = dirname(dirname(__FILE__));
-      }
-
-      $cn = strtolower($class);
-
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
-);
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Autoload.php.in b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Autoload.php.in
deleted file mode 100644
index c7db4e39ad826fdfdf16bcbdd7eddba57e64e709..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Autoload.php.in
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2010 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-if (defined('PHPUNIT_COMPOSER_INSTALL')) {
-    return;
-}
-
-require_once 'File/Iterator/Autoload.php';
-require_once 'PHP/Token/Stream/Autoload.php';
-require_once 'Text/Template/Autoload.php';
-
-spl_autoload_register(
-  function ($class)
-  {
-      static $classes = NULL;
-      static $path = NULL;
-
-      if ($classes === NULL) {
-          $classes = array(
-            ___CLASSLIST___
-          );
-
-          $path = dirname(dirname(__FILE__));
-      }
-
-      $cn = strtolower($class);
-
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
-);
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php
deleted file mode 100644
index 8a4d4088935dd1926baad30639f86cf45a3e6931..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Renders the dashboard for a PHP_CodeCoverage_Report_Node_Directory node.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_HTML_Renderer_Dashboard extends PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @param PHP_CodeCoverage_Report_Node_Directory $node
-     * @param string                                 $file
-     */
-    public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
-    {
-        $classes  = $node->getClassesAndTraits();
-        $template = new Text_Template(
-          $this->templatePath . 'dashboard.html'
-        );
-
-        $this->setCommonTemplateVariables($template, $node);
-
-        $template->setVar(
-          array(
-            'least_tested_methods' => $this->leastTestedMethods($classes),
-            'top_project_risks'    => $this->topProjectRisks($classes),
-            'cc_values'            => $this->classComplexity($classes),
-            'ccd_values'           => $this->classCoverageDistribution($classes),
-            'backlink'             => basename(str_replace('.dashboard', '', $file))
-          )
-        );
-
-        $template->renderTo($file);
-    }
-
-    /**
-     * Returns the data for the Class Complexity chart.
-     *
-     * @param  array $classes
-     * @return string
-     */
-    protected function classComplexity(array $classes)
-    {
-        $data = array();
-
-        foreach ($classes as $name => $class) {
-            $data[] = array(
-              $class['coverage'],
-              $class['ccn'],
-              sprintf(
-                '<a href="%s">%s</a>',
-                $class['link'],
-                $name
-              )
-            );
-        }
-
-        return json_encode($data);
-    }
-
-    /**
-     * Returns the data for the Class Coverage Distribution chart.
-     *
-     * @param  array $classes
-     * @return string
-     */
-    protected function classCoverageDistribution(array $classes)
-    {
-        $data = array(
-          '0%'      => 0,
-          '0-10%'   => 0,
-          '10-20%'  => 0,
-          '20-30%'  => 0,
-          '30-40%'  => 0,
-          '40-50%'  => 0,
-          '50-60%'  => 0,
-          '60-70%'  => 0,
-          '70-80%'  => 0,
-          '80-90%'  => 0,
-          '90-100%' => 0,
-          '100%'    => 0
-        );
-
-        foreach ($classes as $class) {
-            if ($class['coverage'] == 0) {
-                $data['0%']++;
-            }
-
-            else if ($class['coverage'] == 100) {
-                $data['100%']++;
-            }
-
-            else {
-                $key = floor($class['coverage']/10)*10;
-                $key = $key . '-' . ($key + 10) . '%';
-                $data[$key]++;
-            }
-        }
-
-        return json_encode(array_values($data));
-    }
-
-    /**
-     * Returns the least tested methods.
-     *
-     * @param  array   $classes
-     * @param  integer $max
-     * @return string
-     */
-    protected function leastTestedMethods(array $classes, $max = 10)
-    {
-        $methods = array();
-
-        foreach ($classes as $className => $class) {
-            foreach ($class['methods'] as $methodName => $method) {
-                if ($method['coverage'] < 100) {
-                    if ($className != '*') {
-                        $key = $className . '::' . $methodName;
-                    } else {
-                        $key = $methodName;
-                    }
-
-                    $methods[$key] = $method['coverage'];
-                }
-            }
-        }
-
-        asort($methods);
-
-        $methods = array_slice($methods, 0, min($max, count($methods)));
-        $buffer  = '';
-
-        foreach ($methods as $name => $coverage) {
-            list($class, $method) = explode('::', $name);
-
-            $buffer .= sprintf(
-              '              <li><a href="%s">%s</a> (%d%%)</li>' . "\n",
-              $classes[$class]['methods'][$method]['link'],
-              $name,
-              $coverage
-            );
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Returns the top project risks according to the CRAP index.
-     *
-     * @param  array   $classes
-     * @param  integer $max
-     * @return string
-     */
-    protected function topProjectRisks(array $classes, $max = 10)
-    {
-        $risks = array();
-
-        foreach ($classes as $className => $class) {
-            if ($class['coverage'] < 100 &&
-                $class['ccn'] > count($class['methods'])) {
-                $risks[$className] = $class['crap'];
-            }
-        }
-
-        arsort($risks);
-
-        $buffer = '';
-        $risks  = array_slice($risks, 0, min($max, count($risks)));
-
-        foreach ($risks as $name => $crap) {
-            $buffer .= sprintf(
-              '              <li><a href="%s">%s</a> (%d)</li>' . "\n",
-              $classes[$name]['link'],
-              $name,
-              $crap
-            );
-        }
-
-        return $buffer;
-    }
-
-    protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $isDirectory)
-    {
-        return sprintf(
-          '        <li><a href="%s.html">%s</a></li>' . "\n" .
-          '        <li class="active">(Dashboard)</li>' . "\n",
-          $node->getId(),
-          $node->getName()
-        );
-    }
-}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
deleted file mode 100644
index 73a11a1a103879d002516dfac233ee69cc8e85ff..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
+++ /dev/null
@@ -1,3 +0,0 @@
-       <div class="progress progress-{level}" style="width: 100px;">
-        <div class="bar" style="width: {percent}%;"></div>
-       </div>
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap-responsive.min.css b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap-responsive.min.css
deleted file mode 100644
index 5cb833ff082fec726d82a37e7f0bdaaf136b0f3b..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap-responsive.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap Responsive v2.2.2
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */@-ms-viewport{width:device-width}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
deleted file mode 100644
index 140f731dfa801e9f245eedabc5841df62732e94f..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.2.2
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#08c;text-decoration:none}a:hover{color:#005580;text-decoration:underline}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}a.muted:hover{color:#808080}.text-warning{color:#c09853}a.text-warning:hover{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover{color:#2d6987}.text-success{color:#468847}a.text-success:hover{color:#356635}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}ul.inline,ol.inline{margin-left:0;list-style:none}ul.inline>li,ol.inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child{-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;border-bottom-left-radius:0;-moz-border-radius-bottomleft:0}.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;-moz-border-radius-bottomright:0}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success td{background-color:#dff0d8}.table tbody tr.error td{background-color:#f2dede}.table tbody tr.warning td{background-color:#fcf8e3}.table tbody tr.info td{background-color:#d9edf7}.table-hover tbody tr.success:hover td{background-color:#d0e9c6}.table-hover tbody tr.error:hover td{background-color:#ebcccc}.table-hover tbody tr.warning:hover td{background-color:#faf2cc}.table-hover tbody tr.info:hover td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999}.dropdown-menu .disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #bbb;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px}.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn{border-color:#c5c5c5;border-color:rgba(0,0,0,0.15) rgba(0,0,0,0.15) rgba(0,0,0,0.25)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px}.btn-group>.btn-mini{font-size:10.5px}.btn-group>.btn-small{font-size:11.9px}.btn-group>.btn-large{font-size:17.5px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical>.btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert,.alert h4{color:#c09853}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success h4{color:#468847}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger h4,.alert-error h4{color:#b94a48}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info h4{color:#3a87ad}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li>a>img{max-width:none}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px;color:#777}.navbar-link{color:#777}.navbar-link:hover{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown>a:hover .caret{border-top-color:#555;border-bottom-color:#555}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top,#222,#111);background-image:-webkit-gradient(linear,0 0,0 100%,from(#222),to(#111));background-image:-webkit-linear-gradient(top,#222,#111);background-image:-o-linear-gradient(top,#222,#111);background-image:linear-gradient(to bottom,#222,#111);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#fff}.navbar-inverse .brand{color:#999}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#111}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#222;border-left-color:#111}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb>li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb>li>.divider{padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:10%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{position:relative;max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{margin-top:-3px}.tooltip.right{margin-left:3px}.tooltip.bottom{margin-top:3px}.tooltip.left{margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;width:236px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media .pull-left{margin-right:10px}.media .pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}.label:empty,.badge:empty{display:none}a.label:hover,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img{display:block;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
deleted file mode 100644
index d2d911ef7bcf69aade352e4d38aee3b7173550fb..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
-  <meta charset="{charset}">
-  <title>Dashboard for {full_path}</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link href="css/bootstrap.min.css" rel="stylesheet">
-  <link href="css/bootstrap-responsive.min.css" rel="stylesheet">
-  <link href="css/style.css" rel="stylesheet">
-  <!--[if lt IE 9]>
-  <script src="js/html5shiv.js"></script>
-  <![endif]-->
- </head>
- <body>
-  <header>
-   <div class="container">
-    <div class="row">
-     <div class="span12">
-      <ul class="breadcrumb">
-{breadcrumbs}
-      </ul>
-     </div>
-    </div>
-   </div>
-  </header>
-  <div class="container">
-   <div class="row">
-    <div class="span6">
-     <h2>Class Coverage Distribution</h2>
-     <div id="classCoverageDistribution"></div>
-    </div>
-    <div class="span6">
-     <h2>Class Complexity</h2>
-     <div id="classComplexity"></div>
-    </div>
-   </div>
-   <div class="row">
-    <div class="span6">
-     <h2>Top Project Risks</h2>
-     <ul>
-{top_project_risks}
-     </ul>
-    </div>
-    <div class="span6">
-     <h2>Least Tested Methods</h2>
-     <ul>
-{least_tested_methods}
-     </ul>
-    </div>
-   </div>
-   <footer>
-    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</small>
-    </p>
-   </footer>
-  </div>
-  <script src="js/bootstrap.min.js" type="text/javascript"></script>
-  <script src="js/jquery.min.js" type="text/javascript"></script>
-  <script src="js/highcharts.js" type="text/javascript"></script>
-  <script type="text/javascript">
-$(document).ready(function() {
- var classCoverageDistribution = new Highcharts.Chart({
-  chart: {
-   renderTo: 'classCoverageDistribution',
-   type: 'column'
-  },
-  title: {text: ''},
-  legend: {enabled: false},
-  credits: {enabled: false},
-  tooltip: {enabled: false},
-  xAxis: {
-   labels: {style: {fontSize: '8px'}},
-   categories: [
-    '0%','0-10%','10-20%','20-30%','30-40%','40-50%','50-60%','60-70%','70-80%','80-90%','90-100%','100%'
-   ]
-  },
-  yAxis: {
-   title: '',
-   labels: {style: {fontSize: '8px'}},
-  },
-  series: [{
-   data: {ccd_values}
-  }],
- });
-
- var classComplexity = new Highcharts.Chart({
-  chart: {
-   renderTo: 'classComplexity',
-   type: 'scatter'
-  },
-  title: {text: ''},
-  legend: {enabled: false},
-  credits: {enabled: false},
-  xAxis: {
-   title: {text: 'Code Coverage (in percent)'},
-   labels: {enabled: true},
-  },
-  yAxis: {
-   title: {text: 'Cyclomatic Complexity'},
-   labels: {enabled: true},
-  },
-  tooltip: {
-   formatter: function() {
-    return this.point.config[2];
-   }
-  },
-  series: [{
-   data: {cc_values},
-   marker: {
-    symbol: 'diamond'
-   }
-  }],
- });
-});
-  </script>
- </body>
-</html>
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
deleted file mode 100644
index 347440ce7d78000023f8b94b97ba463c6cc7cff9..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
-  <meta charset="{charset}">
-  <title>Code Coverage for {full_path}</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link href="css/bootstrap.min.css" rel="stylesheet">
-  <link href="css/bootstrap-responsive.min.css" rel="stylesheet">
-  <link href="css/style.css" rel="stylesheet">
-  <!--[if lt IE 9]>
-  <script src="js/html5shiv.js"></script>
-  <![endif]-->
- </head>
- <body>
-  <header>
-   <div class="container">
-    <div class="row">
-     <div class="span12">
-      <ul class="breadcrumb">
-{breadcrumbs}
-      </ul>
-     </div>
-    </div>
-   </div>
-  </header>
-  <div class="container">
-   <table class="table table-bordered">
-    <thead>
-     <tr>
-      <td>&nbsp;</td>
-      <td colspan="9"><div align="center"><strong>Code Coverage</strong></div></td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-      <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
-      <td colspan="3"><div align="center"><strong>Functions and Methods</strong></div></td>
-      <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-     </tr>
-    </thead>
-    <tbody>
-{items}
-    </tbody>
-   </table>
-   <footer>
-    <h4>Legend</h4>
-    <p>
-     <span class="danger"><strong>Low</strong>: 0% to {low_upper_bound}%</span>
-     <span class="warning"><strong>Medium</strong>: {low_upper_bound}% to {high_lower_bound}%</span>
-     <span class="success"><strong>High</strong>: {high_lower_bound}% to 100%</span>
-    </p>
-    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</small>
-    </p>
-   </footer>
-  </div>
-  <script src="js/bootstrap.min.js" type="text/javascript"></script>
- </body>
-</html>
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
deleted file mode 100644
index 4a19a06f468d261f17603215310637cdec78eaa8..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
+++ /dev/null
@@ -1,13 +0,0 @@
-     <tr>
-      <td class="{lines_level}">{icon}{name}</td>
-      <td class="{lines_level} big">{lines_bar}</td>
-      <td class="{lines_level} small"><div align="right">{lines_executed_percent}</div></td>
-      <td class="{lines_level} small"><div align="right">{lines_number}</div></td>
-      <td class="{methods_level} big">{methods_bar}</td>
-      <td class="{methods_level} small"><div align="right">{methods_tested_percent}</div></td>
-      <td class="{methods_level} small"><div align="right">{methods_number}</div></td>
-      <td class="{classes_level} big">{classes_bar}</td>
-      <td class="{classes_level} small"><div align="right">{classes_tested_percent}</div></td>
-      <td class="{classes_level} small"><div align="right">{classes_number}</div></td>
-     </tr>
-
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
deleted file mode 100644
index 31a513ee259622272418b08a4035eebf7647e52c..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
-  <meta charset="{charset}">
-  <title>Code Coverage for {full_path}</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link href="css/bootstrap.min.css" rel="stylesheet">
-  <link href="css/bootstrap-responsive.min.css" rel="stylesheet">
-  <link href="css/style.css" rel="stylesheet">
-  <!--[if lt IE 9]>
-  <script src="js/html5shiv.js"></script>
-  <![endif]-->
- </head>
- <body>
-  <header>
-   <div class="container">
-    <div class="row">
-     <div class="span12">
-      <ul class="breadcrumb">
-{breadcrumbs}
-      </ul>
-     </div>
-    </div>
-   </div>
-  </header>
-  <div class="container">
-   <table class="table table-bordered">
-    <thead>
-     <tr>
-      <td>&nbsp;</td>
-      <td colspan="10"><div align="center"><strong>Code Coverage</strong></div></td>
-     </tr>
-     <tr>
-      <td>&nbsp;</td>
-      <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
-      <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
-      <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
-     </tr>
-    </thead>
-    <tbody>
-{items}
-    </tbody>
-   </table>
-   <table class="table table-borderless table-condensed">
-    <tbody>
-{lines}
-    </tbody>
-   </table>
-   <footer>
-    <h4>Legend</h4>
-    <p>
-     <span class="success"><strong>Executed</strong></span>
-     <span class="danger"><strong>Not Executed</strong></span>
-     <span class="warning"><strong>Dead Code</strong></span>
-    </p>
-    <p>
-     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</small>
-    </p>
-   </footer>
-  </div>
-  <script src="js/jquery.min.js" type="text/javascript"></script>
-  <script src="js/bootstrap.min.js" type="text/javascript"></script>
-  <script type="text/javascript">$('.popin').popover({trigger: 'hover'});</script>
- </body>
-</html>
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
deleted file mode 100644
index 7bff4e53eeb2e9586e23710dec40c5d414a35489..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-     <tr>
-      <td class="{classes_level}">{name}</td>
-      <td class="{classes_level} big">{classes_bar}</td>
-      <td class="{classes_level} small"><div align="right">{classes_tested_percent}</div></td>
-      <td class="{classes_level} small"><div align="right">{classes_number}</div></td>
-      <td class="{methods_level} big">{methods_bar}</td>
-      <td class="{methods_level} small"><div align="right">{methods_tested_percent}</div></td>
-      <td class="{methods_level} small"><div align="right">{methods_number}</div></td>
-      <td class="{methods_level} small">{crap}</td>
-      <td class="{lines_level} big">{lines_bar}</td>
-      <td class="{lines_level} small"><div align="right">{lines_executed_percent}</div></td>
-      <td class="{lines_level} small"><div align="right">{lines_number}</div></td>
-     </tr>
-
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/img/glyphicons-halflings-white.png b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/img/glyphicons-halflings-white.png
+++ /dev/null
@@ -1,23 +0,0 @@
-‰PNG
-
-���
IHDR��
Õ���Ÿ���˜Ó³{��ÙPLTEÿÿÿ������ùùùÿÿÿ���ÿÿÿýýýmmm���ÿÿÿÿÿÿÿÿÿ������ÿÿÿðððþþþööö���üüü������ÿÿÿÿÿÿÚÚÚ���ÂÂÂôôôÿÿÿÿÿÿôôô÷÷÷ÿÿÿ������³³³ýýý���âââ°°°ÿÿÿÿÿÿûûûçççþþþÿÿÿ���ííí���ÏÏÏ���ýýýöööíííûûûçççúúúááá’’’þþþþþþÁÁÁ˜˜˜tttáááÐÐÐ���óóó»»»¡¡¡€€€ýýýÔÔÔbbbÿÿÿÕÕÕøøøÜÜÜúúúûûûéééûûûýýýýýýÑÑÑòòòüüüøøøëëëüüü¶¶¶ÆÆÆåååîîîõõõýýýeeegggðð𶶶ààà÷÷÷úúúéééåååúúúøøøËËËÿÿÿ„„„ñññxxx÷÷÷ÝÝÝùùùÈÈÈÒÒÒìììúúúÞÞÞâââæææóóó›››¨¨¨¥¥¥ÜÜÜîîîÿÿÿñññÉÉÉðððÿÿÿÿÿÿÞÞÞÆÆƼ¼¼ëëëÖÖÖÐÐÐâââùùùôôôâââìììõõõ´´´ÿÿÿýýýûûûüüüúúúæææ���äääüüü÷÷÷°°°™™™ýýýìììüüüÁÁÁéééÿÿÿÚÚÚððððððõõõñññþþþøøøþþþŽŽŽâââûûûùùùÜÜÜÿÿÿòòòúúúŸŸŸííí÷÷÷öööèèèóóóúúúõõõõõõ¦¦¦ËËËúúúøøøÓÓÓëëëúúúëë몪ªóóóííí¢¢¢ÏÏÏÚÚÚÖÖÖ¢¢¢ëëëâââùùùUUUÍÍÍÿÿÿÖÖÖãããáááêêêüüüÿÿÿöööûûûóóóôôôÌÌÌÿÿÿÿÿÿùùùõõõÿÿÿòòòýýý���ÙÙÙüüüûûûüüüééé¿¿¿ûûûêêêéééþþþÿÿÿørOæ���òtRNS��ÔÏñ#ïŸ_
-/©ðÆâ¿oS·ß?†ÅCá
kD¯ÂÀOS_ ¥š²ŒÓ6Ðà>4!~a§@1Ñ_'oÄn¢Ò‹‘€M†¡“3±BQj™¶p&%!lµÃ"Xqr;€— A[‚<`‰am}4…3/0Iˆ¨PCM!6(*gK&YQ¦GDP,å`’{
VP¤-êxÁ)hÝ7‡e1]ôˆßW¿³$—‡1ƒbÄzSÜ•cOÙÍ]ÀŠ–U;Zi<N#×)	86pVàò”:h#ù0Z„QÔJN†¾EDTŒÞ~õ‡^��-IDATx^읇#Ç™¦¿b'
4A$Ah�“
)Ãp†3š<MF9Y9XÁ²,ÛrÎiÖöÚ¾ÝÛ|›s¼Ût9çœsÎùÞ¿àXÝ kº¾jvó@­l_¿’Iÿž*~hôƒ >é»'yÜ"€âÐБÝ؆‰K64ÖYœ*.vè@²¸îŽ
c.};‡ïŸtN%¨DI
ª˜ÊÐ	!Z¶Ð5LñH£2Ú6 ŒƒÉ¯ŽÖ"ŠÔ-b±E,,)Ê�À
BŒ·¦>m¹ªÃãúnøö6pmŸRöO
-wm@°ÝÌVÝ#?É'C…È‘Z#©Žqž‡ìÀbÒÓ|$½:Ü)‰Â/E¾%÷ânR¹q—CàhnµÉ%õiÓÌ“­º¶¶ß}lƒm
-?iÿdâdÃ"€,Ø­Ç�`¬Hñ"r.z¡¼‹ŽÁ~ýìü(bðQÜU&ê½—)–5õêX#•§ òé™EMªæÜR<Í*p[€[%.©OÉÌ£˜¥k7“�lIo°ý¨ý“¶ßJ°F ¥lV!̡ăuH‚`Ƽ™€—›ç‚&¢,Çz´ÉRk$¤ò¨|$ölŠ»¼Xbü¢âéÇjߪÈdU±û?Σ$Hµî¸©W±¾$Uû'…ÆÅHÜE3*Õ­º€µµU\}ê­ý†(Ò
-¤zhVk}gÇu«Rk$¤ò%¨|‰T¨|Úêck¦獳"ãžä±Dç”ý«ƒ_W+‹®”Ê.QòÒÅ)Õ@«ý“ƽ€H¢À›Íbµs¸Ôlž
ŽT´©·Dÿô­R�Ä2Xm£#a
Ýêº3lYÃÎzÌj¹ŽÔã’š#!Þ	4þJ´Ä8Ñ(�Œòcµ
v™‰¾t]­a·˜T™Ç
àø	Ò÷�D
Î…à¼áQ?^-‹Õ_^$:
\ÿìÞV	 $«•N|ì=(vˆZ'q6¹Zð׆‡×üB5VìÌî!y†´¼3äßKœÿ㱿bà�v4Œñxðëê£âR]al—í!ÔþIÛo‡P‰@Åt¥äVy”ºîàLïÿÙªmlµÚ¿I¨Ub|[*°¶lke'*¾WdîÀÝdà³ðïD·Ó}\W›ƒ_Wߝ´ù¶¤rÐNÚ?™øÛvÞ«ÁÛ²X%§Ž0u‡öoui*„üJV·€Æ¦‡b%†}ôãˆi5I¥YlNŸE-wÐÏ‚ûf_W3mþIåà…Äý“…—-ŒmƒÊ¬²Q)“SµÖk´«TC7êím¤<"ÄôÜŒ‡b‹T|ìÆ'¦Õ$µÒ˜Ÿ£óóÖR&>¥êO
pœõºš¾ù…ê6ݬÒöçú½t±¨î¥S­ŽN\©×¯LŒîmÕø\ÈÎÑÊÄr@¦3žuT
-b7úÓt.5.q©ôÈ3²r0ü=™8TÂ¿ªi­J©\ëÈ6uF
-”²R¸32^÷íñ'ŪŠóÀí±xˆâI«	ïÒF„8O{%8­žkJšÓMSÈ´dâBEdæÑè ïW‚CYÃ÷O:/OŒN/—I‹ê_=½€xFE”Ñ! Í=¥æi:oÁ~’¡· yþ?¶š'·š'·š[Í“[Í“[Í“[Í“[Í­–è».¹U>±$÷P–ƦŠc%†] Û\c©´:é|	ý,e¯SœZ,‘oš¿XríäÎËXº!ëRæ”ÇÆò@áZøv‚ ‡0Ôç>�?Á*ç®
Ô<ðþÕ�|ø«¼N6þ0ú¹;{¯ažd³ê2Ôév+Däó^tààúÑ[q�!òÛžV}Èøf«œÛ¨ÏŽÎ×Yÿêeॗ€Ë)Vyl|"f÷UDzqˆ@ëˆÇ¼˜4Y-˜³YýÍ-!¶6a“žŠB:o%ñJ¤ÛI±´—UQ|£UÆK¨O `¢®=\ý´­ò:ë0¾°Àx…±Paó‰Ìuˆ@œ»!ç»K†âPÏdÕxhw1>×$j΍³“vöZdàè™xñ«ÕSšUAÅ&[UR
ßd•ý7ðøÂz·ký«/˜œðr¢U^¬Žä £ó—w:I.àVÇ®ëôÿc>qî„œí.!·zSÛr&«³Õ2…)Wgù	¾…R	-ÎiãQ	8¿çØûPa\О×U%•iÝ¡¦þUï_=àÃpÊø	›Lu ê(îžN¹?†Ÿ 0?Ã†:]½Î¬ä†ÔÏt¬B%“U|™úù²¡NsorNÿ¹f¶ú	ø,»P	
!­v"
-Y¬6¼hLï_­�@�@…bé·s¯c¶¬£qg˜v4|Â|0lÏŸÐëÔ$SŒõ9ŽîòbʱšÑj#ŽŸ£~žƒÁÒÏ?o²÷}‘‘ƒð}7sAPm:IV¹=n•÷¯
-!ôþÕ{±›{ÍÝh¼ÎEࢪ£8
¤s�èu�€ÍoL®ëÈTð$ñ„õ;VÝú¹­sõöcqìD
¦3ðø¸ñüÛ༂3.D«Bˆ«éý«³�B4�Ì&ìV'ØÜTÅ	`õ
à½Dï�6ÿ™žšÏ·óqýyùjû8V‰Õæ*ëÖíX%ý³›@s«\ÞjrNµ$à|ö=5þΆ 'ìmU«iý«Kýi€%C™ÉIð:ssaÆ…`*`óµ=úl½÷)>ÈuÕ˜MeuSš›·¨Iò_ÎO÷ˆLü£_©}o&©íÀjzÿêÝ�pèºþ{¨¤ÖáÜlu:OñÁ®«ÆÌ)«s¤%Q@ãÍ$Þ<]f›	€ xO%…÷PCbhr2£ÕôþÕ�¼Ÿèý�PK·Êëpžf5½Në3^o«ù©ú¼]êe²JÊêÁ¤iÐB˜œ464†€^tuÙ²þUÖŒ:G4'¿ò22YêpÎëˆÌu¦G'/PyÙ4?¡þè.ÕæSB„P_>‘ÑëšI	1t3Γ÷BäÉ­æÉ­æÉ­æÉ­æVóäVóäVóäVóäVs«æÃ]î³!×67(ªÇg¯¤¥‹Šyƒ°@†”4>QÚò ßÕV«F­}^XׇìÚ¼ˆ’Õjµ¦e÷26	Lž³Ð%žòY´Gâh
û³šl‰C­}­)Óâ<
-ˆ!ÚE ôðÇE½PçZWZ™½ŒV+þ@†ÏR
5{@ou—ɐ†4²‚²&…�„˜´H…Ñ
¬6÷eµy V‹ˆÝ€˜VÅ¥ÖÁ¬¾ácqZ„Þ’©rìÓJÆçyBêæyžÓˆFzÑõFN¢$¢HbÈÈÕ³*+jՏqòэÎÀ Ú«˜kÝ¿UàX„¯lºe
·ìÄö¾Ä1“ÕÊÚdà0d^õ-‘B%‰ƒ}êœø¸{Yõ¡™%rÇ*Òj5Ak5¦u«³"Ì,·:~éÒ¸áY¾Ü~
-h™÷ûÄSA~¿­6ì¼fuÁlÕ‡fµŠ{ȵQtATHÐZˆkÀªŠÆ­/�_°¸ÕSŸî¼náû¹
-±u']bù]|m`«B…ñāÁÏÀ¡J,O$íÁdu]·Zs®
ÀFLß:©Äùúú›aõø‹À‹Ç™ÕÂÌT4Ïoà~by?wpÇj滥ÖAœ…Ø(€xù]„†¦ú…ªfÕí¶~anÖ§/ž©¸¿^ÈdÕÚ²öcØÚú�˜Õ‡,!ÄÐ1©øi&–xi_VK@ip«Íƒ9¯ÐÞVi%a;Õ¯L
?‰0J“*¹’šÅª5ܶ¸UÑ·Š“'Á¬ºx^î²6âV[¥^ à{öeU™ÈÒ|—:0ø=0‡»ÈdÛ«o‡¨ç*J“q%•[­ÆõYÃN¸˜.sQ„L‹udš[2×ð9þIýó:WÁn—ÔÈÿÐÙŽÊm™Xl¥Úƒ¾6×!lNl‡ÙVÙÕ§KU¼¤¤jVã\J%©UߊßB°ŽLcKfáb×ö>a“=Òb›~¹R]aG%[ú÷×js@«<i[Ð¥*^.d;UI©R+ëOD˜2eÊܶå ú¡QÃãN3©4"1£…ÝÒø†èg£0àúÃu”\‡äI}ÜÁãÐwFVØÿ4y/DžÜjžÜjžÜjn5On5On5On5On5·ê¶hà,Ò·Ur«®]¬º]L^¿—§ƒ%JŽ»DƒÆ÷iÉ­ºÏGÑԝ
ß´®/�Û%='qŠÃ¥)ÈÙòç:ŒQË<¿X¡.«å'ô£‡[•@ùPŸêÐ
ÄvÃ/ɼ°¡ˆò¸>/9ðMطݘU×>yɲXÇ@}³
”ëëF¢´t
Üg^‚ÛvO\°žÓ¸wv‚p•Ï¯z3›K5i¤!$P>”āÅ€¹'Ò”VÆ›¬”¢Lž2r´ú@¤UMÃÉKÃúZ¯õ‰¹å6Ö×ÀtwŒë§ŸÂ¦bä„mß1âh|ô|É]}~¹0øÀMjA�¢À´Ò(Jâ�ŠÝÁ­JP68ÌC&yrÈÌ׉e}­jŽ_cËJ½?êI0¬¯kêÛ>š«W™‹áø	Æû‹™¯é|¡B¾Þá."TEXd 
Ô8”Ä!cwµ*E(ÎJ)ÊåÉ!Î[W"­j_ÔÃáТeX_×ÐXB;¤÷¯o°†O0~?¬:P½Cã(.²í¶±[·Ž‘‘ò!Wq£%ßÔ*leÃÀY)E™<^ˆKåZ¹T•60Ö.ðõ#«µøA\ý¤Á5
;RmÆtkdÂ/8§)5~‚¿ ¬^0Ú #åCkg–¦¶eÍÌy)²—±Í¶¿‘ÔºÒ�°6Ä¥ª<€(?Æ×&ÉõõuîA„áVŸ’õm0^h.—tÌxR*ô×aô©'ö:,¥H§|èō–ªÏl5z„;8+e¦#b'#|û}2Æw(|Kc–J½
Èl6
뀶¾®wù‹^‚ՏŒo×—iúœ3HÓ
êR	–ŽÌ”9Š,Y“gP«Ö°:Nœ[5SÃöû‰R‡!¢§ä[)•ç]€úœi}`�úúºm¬’¸N±4Ð¥¹²ãvÑ`|;f¬(®´Fïlt©„¢LÔ8”Ä÷Z#½Aï–¤O%ÕÀY)N¹U®5YêÑeœ¼d–JÎE3dZØ°’þÇ<Èx·ÇñØɝñä¶e •@ùPÚ§ÏþÎFúTR
œ•2S¡Â·ßüΦ/uˆZ°~ðšCæ3ÇÔXÊz¼ÍÓU¨žâxõ\2s«ñä¶e •DùD.çÉåfBO&enÝ'iÈåR%™?Fy¸VsS~$uˆ®mœw()Á´r”ºo³0*Dí˜Õi!3½:On[Bµ!sʇBäp>Ý£HTÙ1òè;ö8M×jnʏ¤‘Ó¤ï¼äqpÞ1hò^ˆ<¹Õ<¹Õ<¹ÕÜjžÜjžÜjžÜjžÜjnÕÜßû–qÕ(qpõOkª’Ô}¸ßøI?TY8H«®mhyK¸̝u5ÍÏÂÎIœt÷eÕnQBÞ—`µRÄÂ`¯·EÀPË
­Ú¦ö˜½¹xû™«ž½>¹>€â‘¡yt¾{?|œ×'j)”ÉÆ€µ}YUÛÏäUùÛÜ{ç@Vå‡/€J1ìF+
€¬¿7䀉[OW«O[æù
ø¹‘‰y³ÇUY«ª•ˆõ!?BôÈD%D™Wj¼>-Ai6x£z)»ÕÎU�	R½ùª±’7dõÙŠ@µg‡ˆ�ëï•\†soØ)œaÏ4ßzfŒ[«W+•±>¹¸«œÿPô>ä
-|•ÛqLãÑG8vâ¸âêÈ£„˜l´j©µ2ZíÆtÜß+åŒV¥ÔA¬6g<„/ŽæQ
‚H­çSrΣ“ÑçÖd}ØùYqàÔg]€sY]ç;]FëCª@5¼YÓÕ–5ÎC©3å8oÙ)kš1'ûüd6«>T*Ëʆ’§Uz(¥m)ûâ®CD
`‡ÖHe/¾.ñ:ç—zN¥È9pgo
&NC¦×ƒŒÞ‡¼>¶WÓøÕ°_’ñHj ñ)¤Xe6F„� 7p’m¾-è`'Öc†»Ü.Õ«‹ÂAZ=³þ^Ée8÷ÂF×;<ËûÄJ1{óãŠ+8'€Éª'„Ö‡\Aµ*¿Òø[²‹ñR$UãY)V¹
óAyɃŒw)ŽEc#<ÕT‡ƒ”»\vW<U1ïIؘCDo‹ÆYoÈ
·]ßwmÎawŠæ:B¹ :'§Z+
²vé}ÈÁ|¡0Ñëq†«Ã1ŽPªÎƒá*€¤u•T«Í7 óF3Ž±9½ÒëA}$Ýåf»+îoÈüç[Åè½I±5ö÷Ê°þÞ½x(&Í”Ýñi�µ»Ê¼Yޏñ:c¿Pp*Ž»bœœÂ¸Jˆ²‘j•V7�l¬jtsNk¦œv—Ë[ºfy3ÀŒg]ê÷÷‚õ÷¾uœœÂàé²±¹ÈægçJøŒE†0)ViÅ‚µ¢Ã¹èÁƒ”»\vW<°Ugøt�§eï~Bï[ÂÕÀàAÖ†‰‡ÙHµJ—È'å.—Ýn•œ&	1Ô”½û	ý½o%gͱ_Ÿ‰Næ
-¦›”5ê.W×ìõ3y/Džïd«yr«¹Õ<¹Õ<¹Õ<¹Õ<¹Õ<¹ÕÜjžÜª{•¾­“÷wawˆ:6ºdJ§;&Õþí3‹p
tlŒŒ±asõÕŸ²äÕW_UßÞÄT€_'9{?ða«†…Ô¬ÃÄì•l�/0«÷ádHgqll±cæÿúÏ8ÄR‚yù耔ž
m=Ë¢š_ŒÍºå–[Ô·71¯x"Ü"ÛÆSÖIfV“ûrñüŒx3Ï3y•)�h
ÔðÇhÌÕ »ˆ0‹®‘?ÑrÙó©
5—xšû°Šþ_ü-ÚÆùÈjÕõÝäÆ÷õ
õ‹¬Ñ‡oO:çë$›­–�XBX�J¬êÑ£1¼ˆãÃ#Öˆu7½`ózu2àü{ï“\;äëuÜ—±9@¨0ÛÅV$2X››SßøâËæ&ú¦ÓBaÌý[ïOÚ~‘Ñj´N2ߠȪ/­Žšüjz_®�€Ûn�A±¬
ÞÙ駿èˆ~ÀÂÚuøÚh�@GLüOýeɵÏÇ?TˆÅàf<V…˜÷¬×eûˆ@µÁ*�õ-}ñe÷¤@À
í0Ztü/~¿†¼”íXm0Û*æŽÕÈ*ü¡H'\—¯
«¬²ó¬uúëSìE·Ôm¬LÖ»ñÑ6€³Ðåü;+{l›Ê5Û½¯«Áé?u*©™­š_æ«	Ni-:…I@,;†]ÿÓØÉW²Yý`	*Å«ú߀n�ÀSOñõ~nç¶ÛäWýP².Ìcüò¬°Z‹TÄu§¾ö�Po^ǃ7óãÛüwð‰B®RBãW_m djÆŠ•…Øý‡´üBÞÛÿ6Ñ:íÏ*—ÚHÒÊí
æ]ÿ³è§ÑÌdµQ>•{R­®«ÉëÉýºtÛn(–ÏzÏ!S×7o
-×ï€×Ie®Žî™w�õ3]ÔçbÜ—üäÇ8¹5|Æi·Ï æêRÛ�ÚJkʱZ‘RO+ê8£U&µ:]•Z‰ieR‰’¬¢<I™¬~°|Ñd•¯Ÿ,ƒjõ릟{‡Æ;Ã7ï…U�èÝŒÏX¸Bˆ‰§`Ñø‘[èu5~Ú=züq굵Ű‹Þ¹e�Ëç¼b–c5úÌÉoÖôÛ{;Ñîöê€ß©ø@;¦îän*Tĵ2©$ܨŽŠ0Þ'³Y-?
-•j“[åZ£ëjµÀúÓ­ºvÿæçi‡-èŽ*rD{êmL-,L¡=ìÄyÀŸm¡ãx‹¶úc:±ú§WeõÊêévÒ±ÊûoÏÅ„Œ
-Àº"dFÉØÖþ8[çT}ÓµFÏ-ùIËÞVð‰lV[PÁ—³¼³)DVC¬8ݪ}|kZÌÏÖý±Æ{±•ÉÉYž|òïxrrÙÑxaò÷ðG_ÔÖÎ>‰(üóJËMŠÞ—7—³«ÒZ@Œ²5Ýa^äº\G˜z™¯sª¾éρU‚Ò*¥rMÏe³zT¬^Ê:ɬ‚õͦX=>Ü$
-bi>³U&X¬Qoybb¹GÄøkøÍ8¯ –
-ÅÒ˜óýÿn).Ս¤òœÙð�oã
¥À^Mmád³ZƒÊóië$s«ªo–oÞê*{»4ììÑeLb¤LÙ³""mx: `:mÉkž[ØgeTˆÑ‡Þ¬)Á„'0*T˜›Bá€{!úîIÞ‘'·š'·š'·š'·š[Í“[Í“[Í“[Í“[]˜ZˆƒÜjQŠ.e'/¸®y÷vQ¤71ø(Z&†óÒX‘õ?(_œšZ”œÇº”){tÄÚ€m˜ZíÿÀWÑϏ)­«-C“
ŠÓò´¶
jqání,Ì‹Ÿ"áIv‹¦½ULØ!h¢™Ù꛿îñ©¯Ýsçk’óAcrN‚ôþ佚ф€…VE4ö0úy˜XÜÒ~å4zʸVã³°%·ñ,é¹ßû)føÃÀqtÃp˜u¦~ã
Þø©ŽÑ*ý“©^æÖ0:åýÏéܲö3ÿ3…ÃÏJÎâOô(¦·ö£›ZB?K™^ Àv]’un ŸlçúÿôWþÀ‚¶i0´p6­ˆ[ì°©àC_5Xý#ú[¿öwX3ábñÎ廫ÄR½{ùÎâ¢NKðAîÏÿŒée S«èÓeª|Ýã¹wñ¢ÇxâºÊÞsôño>ÖP\å„”Ô•6Ò;nVÛm¯fëI$àø‰ÇûVÍ“J-�ÛJ%ÖŒ¼Ž0¯óUwûYÐŽÉSõóó×n‘uÿÒmÿè—®Æù«xzµÒË—VŸÆ«ÚIµvnôWÿÚ_ÿqLZØÇòé"_—X®z‡Ã÷Æ�8Ç]Ap—‰ƒˆÍ?†¶CÍ‹�Ž‘ž5È4ˆ·3ñŽzw(Ü{7e²*Ȳ`Û°¬!AÔQ“:ñKUnõ•¿Âÿzë]ú1y†V„ø›Ga°úCÿêm0îPY
-ÙšUx6TT&·hVï9V§
-þîßÓ¬žzÑ  1[÷X®z‡ZœËÕî„Ð9ªe¢r›qóJ¸³¸NDß/ù¬¹g·þX¦ë*9o—ðíN6«DÃÃ`
Ë{à÷ªIï%ËM´z9—ãTûQŽŸà–ˆþþ7fö\"jþÃ_3ÙþÖç~xBá'€ŸùÜ·ˆˆY›]*KÐŒãî“«%"úÔç5«"ðÈqxq~ü’Æ•=·‘¨j¼
´ºSá>j¤Vç·&~]2 xzÀF¸ÕíŸ1X•§_yÞùDÀÎ<#N’ÕîïRB÷Ô}KôÏÿÅ/ói‰Šy†ù¿õË
!V^¢ñË¿e²JŸ‰‡}/FkïñAßú7Ÿû· âëS©È×+.–(ec—ˆJ:˜zðƒªóW“ZšŠ°ëª–w
ïÒÙQ™þáðÅž~aÛÒê„ØÍ„öpç6,e5í¯,¬+¢–”Á,ýûÿð­óñ÷ÿt±võ%O^OøüO}ãן -Oüú7>e²ÚkC¦6£waô_þëC
¢‹|½â›9‘‘×*•šÎ‡ØWÆñ¸Aª)×U¶Jgê8<ýZ€´šx^?„ÿ¾2²u¶­Yýí³õè*^?ûÛÚ‡KC­Z¤[‚ÿ©ÿù0.’–àCµ¯@m¾çÓçß$-ßÄ/~ž|Y¥å[eþwƒeQ�ýŸÙ׶&cëÊOž4s|‰œc’§JåûŸwsïûXÍ8/ñš¼Î6Ï/Ú¼;ç'F¯LN^8]ہeadëZ1'®Ü�°ž÷^†Úü™û¼‡L³‘sBdü%Ó+M¢·`ÝãSKö8פ²÷«ìº*ƒª)gl#Ž3"Ä’gÑŠ˜SÇã‹Ž©qtcxxƒš|H>–¬Æø=ðŒ:³ÅçýÎmÊjÕå¬ßÿìÕUßòÁóv£qìys©Ü’žLglþC6+[FÍSWg…ö“9õ˜ƒwV3¼1µA	ëN”ßD¾<Íû«ËÂ$5eÿ(s„ú¡ ÿ[Ð��� Û¨bú—³‡žaF.”¨]±K¡îÇ����IEND®B`‚
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/img/glyphicons-halflings.png b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/img/glyphicons-halflings.png
deleted file mode 100644
index a9969993201f9cee63cf9f49217646347297b643..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/img/glyphicons-halflings.png
+++ /dev/null
@@ -1,52 +0,0 @@
-‰PNG
-
-���
IHDR��
Õ���Ÿ���‹Â���tEXtSoftware�Adobe ImageReadyqÉe<��1¡IDATxÚí}ml\Eº¦W²´^ɺ¶D$|nw'þ ;vÑŽÇ8m0ù˜k<fÙ8Ù€³<Ëh3$ˆ b,mnä Ì
£ Ò“¸×¾«0ñÞL Y`6s'>¬Q
¼¿®·îŸýSû¾§ºúœnŸSõV§;1K½G‰ÛösêÔ©ó>Uo½ÇõTU•1cÆ–YuÖ¼ÅìcÞùa&÷£Â#C,pؚĸ>kÚºŸ¶ú–UƒLW
--sÆnÇ3Vq¼ë~Nšþ£ïoÖücèÇøI»~LÅ�£{ÿà-	ÆúñH8%_èïM²Â£wöB¿â²6EW²Õ,Ä¢p†¼‚¬ÅYþ2+­(Y³ë°ð@ ï±&áóA»/š¶¤Žµ3kXãhàߍØ-aïª³×AÀÔè<>Pø•Œ'\Á£›JË;(ø}†#�›Qz„–ÿ”€‡:4Ãý%m?nf¢ntK*À¯²ælË9JÉØÚ+¡DÞîI§ýYu1Y‘¨¬Z^œ (]YYE­¾f@ìÀâО®lXáîz]‡U×t¥	¨u¹
¾&á
5-Pš¤íW€}ƒþ@tð‘|Ý#Lõ˜Y’=û´sðŸÈÜ‚¬Æù,w#+¾Rñ”+?‘Æ‹aÖxÑÿ	Xé0ø"ea)týGÝ*Ô¡wV®wëV^ªÂ�rf%xB(qÖ¼¼4>šüWÕG¶#ÝñŽlWU<ЁÌøÑ»XJVѶ·“l÷‹¬Á¾RýÄî$kýDVrÓI¯®£é¤7:ðX<s>%Xà1¾N²ŽEzùºw–Š§;yÒî9ïzÀ9øOÔ%~–ã—~¥áu©ÊÉ—*ú=±ªªÄçIÑx‘cáy}®öY(þ£ëoÖ•u
-±N$«^¬jŸþî®»ÿe\õ‰iXíñœ¬]Ùã;Y-¥r‡ö�×ã¬ѲŠ&¾>º!¥zlYÉaVHVNÔ°Ï9=‡‹]Š=‡ý˜°ÇmR¯ÌMÞýŽd»¯OUC©JUiT}rñW¾¨W'ŸÚ¹uª¸)Ê¢„é÷ËF"YUþ#ðüPã×¾Ÿ„çê&Ü‘íÐ…ÏèÌRåOÀª‹ØwyzÛém$«ª»O²Ñßþs?  +^FTÛÁêÝßIEáq÷%¹ó&™›¬‚¨~ç>îMÕÁÇ}]±áÔ–â»wî»A†ï™?
-[Ëú÷Nteexnî(å措•Ÿ«BºdÏMTÙªpÊ¥šnqÿqîSé?šøØbW–û¼èXmW6ñÎx*{V_ã»øû©!VÃjΧðsã»VL^jï‘Â…
XkÏQj©Uôÿ®Ð6œ×ësk”õÌ©n~ý[üqòǸþ-ÿ¦`
ØO‘ É:G¦ôÈë”Ý7â‡ßlµƒ"k¸™ýǐãísRùeŠ2ª®vòQÕ=ÎQƼJÏU­X`¡gž
Qy~	ďîKƒ·È°Ü°E°]Ôþ#ðüPã»ç:—t¦Ùd¶\T½/uÇñ÷›Úøãç;þسù:¨JËc-%'¦ eçÿq“Õ
-?j¼"/yh†…¬4Ž¬8¢Zišñ¿ÂùÔÒ1ò|JUÿ§ïuð>¢¾_ÄÿÍNëÌÝ;hxw¿NUÓJ²QU7\é¹jó©„Ì®bT¢:£¯˜³ÊBá?6ñþ£ëo½J°Â1Ί%ˆóI
-UY-IƒïÙi4{„=ŸrǤ7ˆª@)HˆKçJ+†f˜4ÏXþ8C×dÃ?'j؃1ôÅü ’•NÑò×<›3Ú9üŸ’ÕE<Œw߬†€V‡÷z—E}àý^_e檴p¥çªt붾3úŠ9«,ãªë?ºø±g’lÍY÷OÖÀ¸<öŒÎxªxÕ|†º’aØŽùªUe—…ªðFõ²Óë‡	ó1Ú;“{EFÓ0`ÿÆãDÅR‘¦ü+’UÖYiDåÙßÑ4ë?ŠY`|B‡¾s2ÈÜyip›Iÿqã»>WÕoý
§Vœ¹áTùüGÛßzg#ø
-%–‹ÏD0#Ü 3žª˜[t¦i™Ø¢º(U×,Ä]Î125Ù|îøNÅÌ­
fwØ7w³ æšíÆø¿u+¾ÂŠÙÂ]¨Dµb]ßÂK¦ œÙxbWêÕ›7|ã•Ð’ú‡Xã•›•
®ü{UÝÖljcù™G•ÏôñX‡k¬þ|‹(ÿ�h)IUÌa)ÿlp 3ùlúîÔuPUü]D’ð—)©/7~4W‰¸t5å¼J}±ûV¿éù
-Xõ0«§†zæ ËVM©ÃÆ;>¾GÔ™Õ^è ¯|ø¸gF:Îä£jaZé»ö^)74C#jîwr,еSõlõüGuØ;1éÌvÏm><Ñ)¿}ªò«<½ëðVZueÛ DçŸ+jÕy‡–믫J6V{jý±’K­>´†Z÷ÕáQÕ–ïý·&þmZ:ž–
¾1ïU¡MBå~¢åò
-ÆaíÀƒ:ä/᜗:KÿWžWOÒ &…­ŸªºY´ª®2fìùñ7cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘±åg¥È*3fìF5ÝLb´‘¥NŽÁ2#Tf=Cé`!–üZG¯Ue꣇‡e‚Å2VéÏ<œ1mkS¤ÉåÅ4iÏ—*.š{Nü8X™aj~ŽéïÚ€ânAšx,ÿ—×%fE:Ã|éY˜DV÷j
-žë¬Â¢Úlg6Â(:«k~Œ¥÷MöMâ×5?¦4	]WO·>ºø诋W¥È£—Z”iGü|˜QËGüJe´çK[YcÕµ¹pmjE\f/¾ÇŽ8&¼OQÿ3Í ‹âœöý.3t¹êt2'½-Và8ßùá…pƒXµS°rÇY#J!«ûñQð¸ê ƒ"¤,ub×@F­³úKß:¾uÜ^íùiy©ª[]<.Cw¯‹�ƒ¯+W\)¿ïb¼ª
-k¯r-¡åƒî.M¢t¤Ú€ÔM¨‘qÆÊ„õÀ²þÓÛ°§·¦#$^X$žÑ"œ§‰½»ñV`•TŠ4™máÒ~÷w%Pµp1·š|…+&UxÔY‰Š8«Å*Âr²8:£ìæ¬�ôàk7QЃҀTªºëâ“Êú¸ð“Ö$
ˆÛÐŽõÎÆ™¿
-S>~§Sü®õµ„jÌsá­:5Þq.w°&_Z.ôX=•ª‰ü:Þˆbwë`”ÁÒ _àkd‚{'¢Ê0Û:ØdÇÜsÔþ#ð«q«¾i!224Óö•ünq‰\’9„-‘ªKUTäsSU½ìuVo•@;¼U®³zÛ>^ú¡=¼—N²Ûö•ªîúp¼¼>oõ…PÁ¿O…ÇÚ
- @Iûêú@à£×'G“j5©o¯*U®>îä^«*‘e›w‹ä>ͫʧ‡×á« Q°†”5Í„¯Êç†<$ç#ž5¶JÒÙ»ñ¨jÒö6eî)ðÛ_
ýîùûd]±Ó2‚°–B:À‡ª^ò(*²:8JÊÁÑYÕS鬆®òÒïKÝ—“è]U4_Ærj¤{Üõá5’ׇãaÇ‘/íyó—Vÿ?“ìG¿tÿäG¿¬Ôõ‰b@xPUŸä7O3§|ªéª	ÿI°òQ5ÎÝQü³GwÄ	*(;³w¢f·0*×PðUU<Y¤Æ”ˆÿñ¶v†²¼þb¡ÎtÂö5{2!ë,}©Š½ìÒ¦–”:)·Îj2Ok™Îª’'ÖŠ0I.q\(Ä%ojQ˦âÄ–Õ‡ãa<ê¶ëԍ‹”exÜAgt‹û'£[d;׸Ûù«ªú`rÈcd»ìž¦–j ŠP¹FUÝ$”UeJ½I6ÙTü³É&Z}ªªîz¿Þõ(•z÷vfu¨zÏ ¿›{}ۿߝÑåÝžlx“ÎUõZï謊Ç.×Y岟bÌÎç%»†Ž—¨nwÀ·@×Ç©¿¸S9ÞÖ|źs%Ú>Ë_õo#§üž9Ø\¤EU~ÿ/Ýځ÷t(r[½QµªZu™ûOo;°ŸËèÛ!MrU»]ÛÎ0TÓêcpDÅ‘Õ?�.¬õÚcÎêPuí±Íç¬F€²€™û²;œ¼ªŠL_¹©ª«³ŠùSÞÓb}¸R/ŒJ_Ëç+ßÔh¥2$õaµ£i­UÕÇ©¿¸S9>¿Ð„}7ª6rÊ©µzuùÞíùà~国4­ýoĨ
-1Jœ­€Ñ
-µŒ^±Ì˜ãÀ~££i�CÞ¸5Àÿ5<PïÚ¾rï/ÄG¾ÿYëk૵”—5¢mK
-€‹2姪žÎª5,ÂßÞ?ñ1'ÓjÓQ”úÀpT뾺ðöÆ
-*¼ó~ÑI?HÕםò«):´úºµ\©ùùûèøJª:3çÑ´UGo)XðÄ.Ì˼±ê*j‹\÷¾?}ß㉎ÅG~A{Y#ÆW/3ªê鬶¿!ʼãø=ßïCögÅu	*Ôþõu_õðÞ®+«Qeëƒ5Âw¯:øÊÏUé†êËK©Š?UœW‹1j\ÇÆS5/<«
z7P^Öð÷ª<,S¤¿jˆUU8üܪêè¬v,Š2‡_Æï‡_ßûiÚ뻊®î«^Ÿª¥ÖR5^v¤öNl>G×¹]úg…þõwö¼sùnzTuO=Š?/“ÓÛýzƲc>ÚþΟb¶#7Ö»cg’æk¿þÞ›TU—j÷©*-T=]Ýúèãuu}¯£>ݨÚNЭ
Ùø[
]â”:%/_›®ëS÷z]6D.Ôm®‡ƒ¬ÄìD7UÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cæú£ì´>ÞJ4hëPP…®+«§A›;'G_®XK¡ÚmL«…˜5I.},wFFu§Þm$S–-¥E-;Õ
-C3I-`ÏBëßRÕx1¾ˆÒ“T±JÝ•;hΊœ8£DêYøªJ‚o;´çÀþÞÙYš5ŒM²ÍçäK·¬É°Mµ;šª¾%Pº”Ž�d9Kîh”ø€nç´D[z¯ÅgVhè,®¥'Cº
-p!^MÖ(³WK2ªX¥>UQ‚Ä%âö°^ƒ›p8	˽Ö^#Î–Ø„+.@—ÔñgêCêz%É”-Pr
-–‚¸K¿Xÿˆ
-¼…‚¦nÓÁ·>½»×=‹Õ”ÞѨðÅeSvR—×£’L—zªò½Ö5%9UQS ¢¡\ŒW‘Õ«ÙÊKÕö'Üh™p)ô
-J·”r˜h¡ß
žîM0ÊF¢Î(f_¤R5ñ/É//§Gïä+óª‹õþ£±¶x	1"è¿þ³¨eSðú5…
-­Ö:Tõöf¾ð=+Š7ÉQɧ§\Œ—“µ²TE¢¡ §sü༬ïrÆßÞY®s8ú•&†kíìùû¶ÿ­ª#pSÕŠ5Mà³Tªb«ªDÜŠ[Ng¡5QÒ\sÇí�5PB@[ñ�8ɨ‘V1ªª¢¤¯¬&ö¦4Wsy[šÇ¾
-ŸwÒU€½ñ2²V–ª¶îì7ÁÂ7”€jïÄÔÐÔÐÞ‰d^~Yf·íC©«_‚Àh;a.ÌÇê&†M®
-i §ÂU–ªºº
ªWpzs`>÷/Ö"¤Ô'OòIöáÚÛ²ç‹y‰Š›€¬:ÏBzdõÃû“µòTôŸq£ï=йŠ­b:…‚°"ü½ºùm«/¾
Ñ-/PÜ÷WÁDQóǴ͐âÿ5Éîþ7Ÿªºúªú
må`ôHý¥%AÚóVµÒ!ÉH¼Ô›×¿¥µ÷@"Q£¶�zãÅÞ‹|ëß’TÖ¿þ-ï³*OUý^ºûÒ¦6üº©­û!Èî‹Cw„kÑ|h¢&Hd5ŽLEYày‘Ž'ÙÆ£7Ÿª%½*Ó<C'@­l�Œ„™b!w�L»WW(%øÒÛCßæ4¯ƒƒæû£¹3\»ú“„³¤ûÐxá­ôú·¼Ï*ª½³§·QF¼Ò¨…<ñém§·…ŽºƒÐ߃g?߉ÌÃû¨¤¸^±)DŠ}†{ßUŽªÖ˜|Q­›ÏÕ=C'@­|�Œuw�L»×‚Q°E¯=‘?þx+Öx¥
"¾Ûþ—gýÝäSÕïOÔÒ¨jëä׈
.ÔÁfqj[ýè›Yà£ÀGͤýCÃìáç„“m>{èü=)­°ÆZ¯%ٝ¿§P	»Œú*GÕæÜ]ëÀ•È�/—�¸8L
ÔÍ�wº$?8üñM¹)\į«ä£µ/#ª7U‡fd7'6´\h1ï
-vI’f”EIr˜˜Ç=½1øwöÜ\òWKÖžVZÄHKüœgþZ‰ƒÍ¡$m¤äx·‹ÉÒ %œË
Ý`j}ÔTuTöQJZ¯è*H>*QÝxkLFT¿ÀïÞy†“UÕÅ¡-†)‘ôb¾®iA¨Ùó|q`Á¿F­'ÁŸÔ+	˜áç4^Q¶y´x‹ÎH)’î#Ät^­•?@]^`AÕRêSŠªq¨jgžB:År<h̆ÊRn…ÕÊzÔ”ßPΦË)§ò[+•nêÒMÙX
þH!‡¦´¹0æçI÷‰”rœË
¯ïsKÏ¡Õ§UãR2ðËT	Xýg�Æ´Ú³EýcÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆnŽÁj¹À²¨Ç´yÆŒIˆÚxQüqº7fMƒîË4EÌFŸ±.Ãú—34<.çi”á’;›áeÐ’iš²²1c%9ùºæîK	éÊî†Í 2ÍJC”ìnÆÕwÙüøE¤ùcFùŠ‚´†¡`Žà5v6«%Ë¿]ø3¸ªT«üyìÄ`~š¨a¢²²[[ÛJ«>K÷Û·l<2ï-4¿YŠçKâhgQ°®öLÓÄxœV§wÞP¶ì~ÑÉM
õΦ¾‘¸0l 3šÆ…ÖaÅŠITˆÈ€hwJ¬m¼¨¬èÁ¨­™xIM¤Õ¹¥¸|«U7xˆS½³~2ß•?ŠkW1k¥ü½C3]Ùã;Y­•nSÞ
—ºÒ‘AíeºXÊYzø8,'‚x‰<
k7Kx‘ƒÞÂ]Öù$³¥x¾$Žvë´g˜T#wû“;oðÉýòÂ@Èz¡_VÐÚ÷mán|¢HÖµïËhåØZg-^TAn«¯-‡)ƒà–¯@4[*Ô9xKãÅÆ‹çÖÁ²²j>Å!,
¬VtË:eù°Ô—Âqn8%oh²ÊéS„(2è\Q‡Ë^éaigéáñí¸F—¸3€³v³TUDV¸l’QÈê…§¬W¥cÝí%’UàåªeŽq©4ŸÒÂº/í¾U¾
¥$†_æŸQ!Âä´>¼µøÉÕt×|é ×,È›G<tßC÷¥Á[ÔxTXmf|ì·<©ÄOÚ¡¯MTÙ|(w:ÌÜã_XÚ¤Óþj7w°´³tñ¼å »
-AXßͦªpÙ$‰^xZ«R±îö¤‘ÕÁëj¬x”îæÖ`ð3=â^±ñll±+Ë—e»QâÙ8g8V‡‘+þ9MËï
ë/£ªÀž�–oè14snb›¡ëtXÙ܍ÛsŠýÉü×vEÀl+@\Œ’e¸,å,·cÑ®â<§(†ÂiõHVYªr—¥QÃO7£aÝíI©‘>Q%dÕ#jUÕ†³|;H¯Ø[bÈÂÁî¹Î¬Ç#ÊÊÆá¡«ó,Wés7NT1~ÝÔém&Ç»²{' \­–㟾·’bíBKJ¾o8å%·!˜…€$•ªQ—›¨Ïj:©‡/¦RX)$SyªÞ³䍧ëR°…DUg_Dûƒè»¦ÆJÏ\Ñý굪jßN®¨Ö–SU;~·?¶÷O‰¼h˜ssýdáõÆ£}“6Î(T
<ÍÕ_ž4ÉïÜb5øõÔÖ £^NªöøNŒ%8QejF¼7toç¤îMyÛÓ©ê`)g[§‡/¦ÒÐÌÇ÷Ü|ªºïÁ?òÆÓ©JÁæåuÜG§ºýãLï坕ŽÞ/=£CTÜ hdÊifHºÔøcÇžùæÙâG4öŒ,¼îøóáõŽ²`’DÕžÃ{'xý£ÊG_p/5øâ‰@m +×$jVÔH¨¼Š3Õa"…*Å©,å,¡ûH¿JÒµ¯ȸ…T^Qyª¢o&IÉžJUVwW§ýÃLçeM¸ø~ñ×3t¢¢½“²»A©ã6ôÎÚÁrÌÝwɤÊ6œ²Õ¿í¿ Ðò\0HÀL%LªX5ê’c¨¡Æç“@ HHÃZ‹º|NVÜË+7WM«Ã{ü­¦¨cigéâ…à*¼Îê¤È¸UšªÜ7iÉž«Ð±zŠˆúdõ *Ì?¯gtäÇXõ‘í8îõ̝O©°XÍî°:ïô]2üɍ]Ùp^°¸++òÇ>Áø¸A”èÛVÚ›Eí{âæá“´DB.È&¨/ÅÒÎÒÃã56Ÿƒ©AãrxY#Ü•÷yá)ô£cKQtȪó²¦à~­�Îð¶ÿ­êõŒÇÅ! ì™;¶C}ʃîÈtf{æ6Ÿƒ$N§üVsjþ¹
wup˜Z)zŁý|ú-”wìg+nÞMVjÆ/d+U½°”³Ê~ͯÄÛêŲi—ó:_ixš£wµêhqŸƒr>©é§ƒ-Íx«ë¼¬)ºßÝ·ÚyÐÆR=! ì–ÓÈì:øŠJ/lÌÊIk‡ÔÃV@¹nåÝ7ï475ãç8«ZõØKÑJæ(þœUxšzñ1w)^ê \ŸÔ£žözȪ󲦨c‚¨©2fÌ؍èvª+‡6f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘±2›®Nï÷
oŸC–\žõ¯¸ F1Ö´Ø
¨UZ÷JVÌš\®4ÍéôÆM§÷û†gq1z{&³YúT
-£,ðHX~D­uÁ\Ágô÷}xþ>½+Y±ÀèdNÞÌ®†ïo‘l
¸Z´X+F¥Ó[ž/jÃÿ+S~2/jVîò¹8óJ»r^­Ûïè³Ô‰]J}JÅé*ۏ<£í2Ô°&£JÝ£ë¥jOµöM@âѯ#0àà¥Oß[‰úS‰Ê÷·°‡†XÓB^
uzùe…\§×Á»]…ïýd®ßüd.°¥—/„ ÔxXE
-¢f'vÑëO»_´¦“‹HŠ${è%;•kçt7ށßm¼ƒÅ‘|òúd{a¡ÞŠµ^£Ô…Ç›¢ÚŽE§†5Ê‹¦ÑBr]W·ú¬=¨_¹šÑÃSA¼»†f(ø0  …ÙoU×5Çq,ë_\×lÿuzËªuz¼ûã»²¸ö×oâš=Yiå÷Î~|§ˆ
-0+¬=VŒÕòµö”ò…�¨J—ت³Ý/²›Þ½ÔzMÖÐ\÷zCåLÃÿ±Ã[Uõ:|k*^8"¶\WÙš\
.¨ïXTjX5ÎSk½F‹u\”1çƒ ­ž—q'Žöm¿Ä£/ñQ¿”UØ•£*«AɽDNZ×®?_¨[#Œ
ˍ4þ:½^j|Â5LÊGù­||�©­ÂøÂBW{6[uQF©¿¸µ.1Š´$qFÈí9´Ç‡IHg)\÷˜ÕÍàž5°ê>CÃ#ÇÃuöX
ÜZ¡é$Ÿ#*<Èߐ«sRÉv¹1Tj>J¸ºm>*§«ãÆ#‰¢(®é
-Éé[F¦hÄsשõ5õÕ*jQʼ–&š†è&×ý&Pêˆã»çŠ›L®Ó[ÞQ”áª1*üÔ«‡ ¯š;¤Ÿ´X}ÓI•Î°À[Q„?Þq¨Q½Z
Hèóûä÷Ý™•ÕñÖžV¶ŠEsB’¼CÔZ9¾éJTK¶Ë«¢—ÛtuŠp¡«Ë·ºê/©Oïì±´,.k¡Ud‰sƒOHMg4=-)ï+Ø¿èý“h2Á¹N¯ƒw÷/r|WÖQn=·GIUù
;“˜'ª„j,¬ÔvðîfñdzþÏí™p¿e¬¨ú$õàºÇVGTYñsBZÄO‡1pçj:ü˜›¨rü±Ž"n©TUSCgœœrÇve§†¤AìÛ˜±™Â˜FèC+Õ–#‹[J–¸òTeý'v9-Ô3	Dîm¨Ó»Ôuýuz¼ûã¶˜?ÎÝ0»• ”oËÿ÷	¢ÒêãhÕxð«u‰YõÐ&“·î§‹»_”54×=fµÐÀ07‡ÿkלUÕð0‡·]D:Ôøæ‚ä‡Ïj±dwÐ/+žÚP¨¡GUVóäSŽç<ù”\2¨u¦»at´cÕ^zYÜR²Ä…mCÔ+ÔÒ7´¼þ¼#‹ã,|ú:½Åi™N¯ƒw÷º*|^sàÜmå|”X>Ъ^ýÝ1\—#ÁÓ͹”	&˜¤%§{,2À¸Uˆª>ˆÝŽ.c0
5zØ#ª
-oëg…öNà£×O+©©QÊì“­’ï ‚®•¢óÅ,ÎÌË—Å-%K\ù´Òî[S_`ýyŠ«+›úb÷­¹_9Šë4ÞÒð"£U©ò+‡çÎŽap’}²I­¸èè[óM,Bª.ÞNtñœàÇwªH—Ûj”漬…ü¬E‰ºïœú…žLÒÍ߀0DX(©kÚµ§¶¸”…NoU§÷{†gquz
-RèwkÕ§Rx'ÖuZà[šóÙÞ3'Ÿ¥zÝyy²¸×“%®<U…ŽhN[¹¦è®õtz¿x1ã c—cý«õ]FݯÕB¨"]
a[J·˜¬úDÕ½[cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3Vƒes{L+3VH
]YPºA	>ûsŸ½¦ÿ Æ•úàü3jYF\ÙÚs¸â÷=m1ª&ÔúŒVÙ•ÂAɼ?k\+]Æ6yïﾓ¾»1ŠÃêgtÝOIW7öaïl|1«ì­É è©õÎÆ>$]e7ÈÚ؝¿W¯I¼e?Þ¦Ñ
L#•àÿ>|Çÿ½ó
-íÒ­±´]ÚÒ
-p±M5M­UdIú² 61íýÔ ûeǼY½Gððþî»híO n‡Ô3çÕ­R:^×k_'Yuuq#ìáçpõ#
-âJ¿‡Ÿ‹¨2Öx¥™ñël>×ÿOjª®ÙÌõØcY²é¦ƒ¬!•Ú¡+ðsZ/üíìÞ×D‘}Ïá2ž AƒY
m™”®�ˆp®c#Æ<'x»ÏSKx–Ÿ`å¦*W[,e|‘6â·BÿH)㶤kj•ÈÙp™»D¾U(2qzx‡¨9éÕÒÉ*tqa™/,ê
-Z[¿¯	0Ï>ýìÓ¨§ÖœóŒ…xN)fïăûÃ@qÕ¨‡ÍÑþFU՝¿—w(·¸a;Ë‹ð>Ò|T†c|Ôw2 Æ÷µeiT]*æ!_\•WG{
-
§è]¬^Ð۝݅ßÉZ5ÌÔí¸t|‘6ÎoYHÈÎÈëßa齿¬ÛþþO@¿=í«„¸Ämy^ak俺¸ñEü.¾¨ÒÅuô‹îzà®]#Ù¥¹ hWvü(ëî:Ô,•ã6ÉõA“ë߉JçïFaœâÞ\â‚w©øW×ô¦ex>v¡<çë?|ý‡¶Ô&i_¾q†zëÏð”É]e²R_Ä7©|& c*kÖ€4fÔñÈ,J «U—øÜ_Äh“ø\1A¤„îîèù•¿ùµ¥÷ºu\·ý-‰L\Ïœ^çê~ÔP¹hrÃÉ*tqa0¯ƒfTêâ:ßMUùÅ;qÔ>µet‹u¹MÙÏYÃÖA>†Ž€á«þ).,ù ;ɦïCÚbwÛjE)øÔW°â¾ÅÏ
…ÆFÓ«@þs4¢e¢6^äµQ9oI}4Èx<û“Õ.ÕB?¢–BÕÂß«ë#ˆš$‘åHxì.x9,•Ìa!®RTèpgd5ºÿ‰¥÷úxB·ýeŠŽü².L7@¥*ïž
-AsduttSëâVUaà‹RU|–I	xG¶߃$T®üÃëýñ­Ÿ¬›Âë#_œùIF÷MÂŒö_Xõ@fõo÷ÙÂQ°IDÍúI²¾I?|÷%Ž¿÷¥$Ûrê	¥ž¹{œŸ‰ôÌEÔÛNĸÜwÞ•ó²qqé?ÕíéâDØ½}­}o•/`Ó£ªCT±i	¬ñ<QýR{\yYÇéÇŠïFÁšòQJkhûÊûœí¯^?Us:ÙE‡ý|]ÜÖüVò�)Z|HÝjsWöáç‘|éH'|Ôîo‘‚ûò=d|ƒß¼j ƒ#âùTçÿÚ%ŸOáÈ	Wúá! N#ÇwÌ1[i¼H(½ðSV½ùÜæs¬ú…ŸÚ[=ÔɈŠ©ã7Ÿ³ç•1ÿȳ¾…ÿT]A GÔ換ì²ý3À•¥ªCT×»ùlR½Ý•CV9Qý\V#Ü› ðNÞӏjüˇ1µ/îsŽl�¢R•ÏÉ%^s1“®ŽnUÕjƤ¨ø,½x}ÿ…f—´Wö|JuKØwþž­p”íýÐçS½³m,ð<œ‚7<֏ßÿ
-ˆ‡È»¯ÿ…Õ[ÃR<&”€¢pý÷?¸ïÉ'Ûï,°Ð™‰ïŽ\Í;ìïÌÊ5ªbH$ä3Ç#¸Q“4\ì¸âø_ï§×>È/§ywãOº
§rD
9©ï—YUD]êà˜	ΉÃú¤¢@sÊåè]ÙÁ¿+'UaL}ÛûhƒšrÌU±Ýßç'7º:ººsU|k)Hú€@§ôáˆñhßN¾qž#è›ÏµÁ8Œïy­Ë­àX²ÇÏű#ö¶wýÙ
-´1!•í‰ÆR'7âçfÈuãד»²0Šù¾¿Ýp¤!WˆºÃ–W+NmÙp¶\£ª š-‡ioD$Ï�£ãògúÙ Ë…%%ï¼ÃømÊíV€]”̱œ™ráw*²ÊZÞ}¿ùy›+L»
-N¾äoçu©jÚ}Îxt‡ô•“¢ƒ)lSŸïtuqõ¨Úx±ûÒém NyKÌUª OnDbƒhf}ëk¼>Î6ޝuÀfTï%þøÃÀ{‡ö¦ <ñ®¸’úÛmj¼¤FÍcÂmU¾ï«ì¡ùcßò;°wŠí8ž‚@dG¹FUAµü&©‚ ÉçêÑË=nðqÕ5]iP¼ˆù}§zê:¹k⼶‘Ý-¼ÄÊ“»	Κl*'U›zãax«W…µÔFÖdZº¸zTí¾NR“s+’ˆ#«ùø wÎÀzgi:·°MB„Àqø¿žtúMÐ
ül#¨^Ö'G™ß£Œ*^ÚtÛ{œØÕ=§rEý¹êR“ºnQù$adJlÄ02%Ÿ®TÚŠ^Š„ÔÝ
<Ó~g§?ÖOóf*U×^óÆ?üœ:¬½N¢Šž”®+›o¶[àP¾UÒs’|çQ“»R']çVó-L)H
K¿äž
mYËÕnµ\±¿4}Y©ëVÓD½ÎhÉÍøRð©ºê;g¢Õ-©û'…3aסæM¨D­h£}´1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒ3f̘1cÆŒýÿk¸*Èš4í`Læ$bÙ	ªòœÖUêì²ë4\dtœ×Ö'žÿ®>…HÈ„|Õ.–Ü+Y+/‡GçyšÎó2ÅOCWvþÓò¹3v,«'kiaåÏÊØÈ­ô¥W³¿‰ŒO6߯Eô=Hv
-$L°l¹xI¾躍/†˜}Š^]èÚøÑÓxŒ™\3ÔèæÉ®5¯ç °¤ÿQÑT&Gç9AÔy^Žø¶¯úÿiä•}OÜó[5Þ±Æwq¥4,sJJ×ÖI.myEÔ^ë%ˆÍ–'VñB~½d×¯‰Î}ã*þj÷­*‡	~™ÈuÁTå®k†õ¡\f†KЬÌ*¶®Y]›ÀóÙ_v'IÙÖ˨æºáëöé‘©6ÒXš—oÿç'Ÿj&uÍìɧnÿgúèT]oíò„ÚŒþÆ9”«©ó\*¾wVHÓ–¿|Ì	Å>Œþ:ò5EFø'J
¿‰Ëýɝ`î¶Ä©!ëòA¦¯˜ØÃê® É
-ÄÙçe~ÀÇ_;ªÌð5çױϊ©ûŒà¸é•‹m_&þO÷¿Æ«ViÚÅÝë<}"«éºð°hW9ÖX±6öÐKPÆ£
G…"ëÆ­£?¹ó/Á÷”åO¯^Ø÷ëhC¦HáØÐLû¬cß«¬iÂÌP¥ªjßãÿ)}ûûÐQQÕ¦‰#tM§g¾°9ÿÆÔxGw—‚ïÊÙ~d;_åJ+ßRỲ¸<üõë;¶e¢ŒÛÞÂ5/Q
s¥/5º²N[òÉ!´a+„N‰PÏb+üѺ’éIÆ}´ûÒà-ƒ·t_âq“U=–MKÜÊžÙYÇÜþ5nožá*ÊÇÚîv—Þv·bŽÊŠ{]¸â¤|”~	Z¨{-èÿˆú¾¸ë‡^ˆý›ÿFVviϵ3™YaÙÒü˜ô«=6nŒ­ødS;œ-ŸÍ´^;°uꪪ^
þ|ð¿=úó_Èw+°ú"‹ŽøÊàiÝ&4¡ól“#´w‚“iíûr|W–ô‡œ3Uø$Ûý"Jì~‘ŠçO@]~tÎâRJV³©MH¿w:̦“¼ìÕ@?ÿþ>ëO¥Ëé?èvdrº²tS§*$í&~1>‰ÚÀ¨«äÖÝZ}^ùnÍL(ôÆ]Âf*ª&ž*èQž’aßIÊÇðÐꝄ|”Œ3Ô*°—‹÷O¢ê?ª¬úç‘Áÿrÿ?¶*ñ¶³4ˆGyz[äk/täk—‚Q–ÏÏ–µÏöWC¿CÙKºk/Ýúx§¼5×|ùäSÎ*`’ÏϹγ˜Q±ÜÂâ¦E¾w”›œy’
-o‘ØK«YqTøbªúãß$ÙÎóÏ-/PtªsZNî›KÎÛQ¾¹*>§‰Ý¢ì‰ÝåU™@»Ð"JQ;¢ÄϹ&¼
-ŠLxÒ;+Tã/+¿ôÚOÝ赟ÊÃ>è»(T²›þ?Ä·D^N*©'Âpöï·öþ$I¤¶õW֐õÔW~Ó=üæJ|Ð
Ô_‰óUTeÁÄ7Ö°P`ÿ;CYjkà=ßsßU[«åmß™-¼úÆ;°};³2|÷¥w¶€o«1ƒp‘0‚Æ~>†ð0Ûßõm·õ
-@JïrÇŸócÙ·4¢ÍœØâ?qÅ÷\ÕUUéIV?2…åL©‚/Æ+Шꄾ<½Ü‡^TõÛÛ
¥?t©j\ÐJr£¸ÜҀܧ˜B*Á˜³þŽ=kÿmü¨¿þXï,n}a¿Þ
©¬Õ’¹Iaù¡dìp×·öãlñl{\ïú6v8”¤Rµªê…Ÿº·­²Ò²™ä¹f¥1¹ÝF|ՏÂ;äeó=\DÂß,D¥:ψ¢rñ˜xQTâ—Ž’*|{n¶‰S
-9~à=ü}Ó•¾ÉG~%jû:D…©j­<Óáž«:£ªjO%Œþð
-ï$T8!jÿìÓÛvmÛå|'O¤‰Ð—‡Á¹➱z\vsIv`ÿÈ”¨Ê¨jµ-¡^›$-€Î^¬ èGQ¯¡{ÛmŸ¥¾`ÒTûš#Ûc‹Öž­ã¸Ÿ|nâ.ߪNŽ$Þ÷OÇÖÄûÉ«šJUV¿áìʼ›t,ßéÝýâjÆg¶-÷…þûmסּðNV¶£ó„zÌþ:ÏŸÀ—(ÓΙ*|1UÕx=Y±Ök*üƒûùt«
ÎM³þÏ÷NÈåNÝDUÏhK™«ò ØžX(刄Rvñ!±#B_—«c¿xR§·Ź‰Œªo¶E5Dg>?úf›¤©XQ‡¨QéË”|@‹"ÓÕ¡M‘—£ìÈveC×>ôÒm×O$HãÞ#]Y”µ®I=ÜÁŽ)_Àëë`©‡ƒkø©¦*
-’:aØ>!X³çË!›ªWÖ^Ýô†wÒ’œ¶l'è<;øvwgIÀÓt¤_Û?Jh”Ÿ`ƒ#E:fdx=¢–6Wu<ƒ†ÒÒöÌ�ÛÓ‹âd2¦di¾×ŸË‚Œc#h¬c4íßû�Ô?<´çÐHº¤à»FYo´ûVp¿Nñž;„Ý·J\ûÀ ö¶‰Ïÿ>„`(Šˆét¸3{Û>⦊Áã;;q†ºF±‰‡xÝ4Yc«ã‰µS¿$w¿. ½……—dÝÐa*k£«ó|£ðQÕ,¿í+xñ’¹ýs^¨Kß«ÒæªüP^Üéîn€OÖ®L5m­IÛwl?-.ʲÓÛÒ÷J8§FÔ
Ãê…ÕýB.-:2…
ÀÈ”Ý!ÐÎêÌ/AÊ#bÕÛ_m%ÌIÄ(œ”â$|¼PZ[¯÷¥ 1½G¬{^ç#µ®òòÄo>×3×õmèw?'Çcx¬£·[ü^•:W•k/—`'=ÿ°Ð~Ö¥ÆêúWÒ(õgQ¶ªbfv7UŽzÉèMþ3µ‘©Æ+؍‘Kç:ÏÑ4|GñCtªùAË+Kôÿʨú{@©ÊÐÆ–±[0ø5íðý±ÿE›|
yn4M����IEND®B`‚
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
deleted file mode 100644
index 6eeb15ce3b73e5254054e36a17afc8c6a5a6334f..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
-* Bootstrap.js by @fat & @mdo
-* Copyright 2012 Twitter, Inc.
-* http://www.apache.org/licenses/LICENSE-2.0.txt
-*/
-!function($){"use strict";$(function(){$.support.transition=function(){var transitionEnd=function(){var name,el=document.createElement("bootstrap"),transEndEventNames={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(name in transEndEventNames)if(void 0!==el.style[name])return transEndEventNames[name]}();return transitionEnd&&{end:transitionEnd}}()})}(window.jQuery),!function($){"use strict";var dismiss='[data-dismiss="alert"]',Alert=function(el){$(el).on("click",dismiss,this.close)};Alert.prototype.close=function(e){function removeElement(){$parent.trigger("closed").remove()}var $parent,$this=$(this),selector=$this.attr("data-target");selector||(selector=$this.attr("href"),selector=selector&&selector.replace(/.*(?=#[^\s]*$)/,"")),$parent=$(selector),e&&e.preventDefault(),$parent.length||($parent=$this.hasClass("alert")?$this:$this.parent()),$parent.trigger(e=$.Event("close")),e.isDefaultPrevented()||($parent.removeClass("in"),$.support.transition&&$parent.hasClass("fade")?$parent.on($.support.transition.end,removeElement):removeElement())};var old=$.fn.alert;$.fn.alert=function(option){return this.each(function(){var $this=$(this),data=$this.data("alert");data||$this.data("alert",data=new Alert(this)),"string"==typeof option&&data[option].call($this)})},$.fn.alert.Constructor=Alert,$.fn.alert.noConflict=function(){return $.fn.alert=old,this},$(document).on("click.alert.data-api",dismiss,Alert.prototype.close)}(window.jQuery),!function($){"use strict";var Button=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.button.defaults,options)};Button.prototype.setState=function(state){var d="disabled",$el=this.$element,data=$el.data(),val=$el.is("input")?"val":"html";state+="Text",data.resetText||$el.data("resetText",$el[val]()),$el[val](data[state]||this.options[state]),setTimeout(function(){"loadingText"==state?$el.addClass(d).attr(d,d):$el.removeClass(d).removeAttr(d)},0)},Button.prototype.toggle=function(){var $parent=this.$element.closest('[data-toggle="buttons-radio"]');$parent&&$parent.find(".active").removeClass("active"),this.$element.toggleClass("active")};var old=$.fn.button;$.fn.button=function(option){return this.each(function(){var $this=$(this),data=$this.data("button"),options="object"==typeof option&&option;data||$this.data("button",data=new Button(this,options)),"toggle"==option?data.toggle():option&&data.setState(option)})},$.fn.button.defaults={loadingText:"loading..."},$.fn.button.Constructor=Button,$.fn.button.noConflict=function(){return $.fn.button=old,this},$(document).on("click.button.data-api","[data-toggle^=button]",function(e){var $btn=$(e.target);$btn.hasClass("btn")||($btn=$btn.closest(".btn")),$btn.button("toggle")})}(window.jQuery),!function($){"use strict";var Carousel=function(element,options){this.$element=$(element),this.options=options,"hover"==this.options.pause&&this.$element.on("mouseenter",$.proxy(this.pause,this)).on("mouseleave",$.proxy(this.cycle,this))};Carousel.prototype={cycle:function(e){return e||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval($.proxy(this.next,this),this.options.interval)),this},to:function(pos){var $active=this.$element.find(".item.active"),children=$active.parent().children(),activePos=children.index($active),that=this;if(!(pos>children.length-1||0>pos))return this.sliding?this.$element.one("slid",function(){that.to(pos)}):activePos==pos?this.pause().cycle():this.slide(pos>activePos?"next":"prev",$(children[pos]))},pause:function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&$.support.transition.end&&(this.$element.trigger($.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){return this.sliding?void 0:this.slide("next")},prev:function(){return this.sliding?void 0:this.slide("prev")},slide:function(type,next){var e,$active=this.$element.find(".item.active"),$next=next||$active[type](),isCycling=this.interval,direction="next"==type?"left":"right",fallback="next"==type?"first":"last",that=this;if(this.sliding=!0,isCycling&&this.pause(),$next=$next.length?$next:this.$element.find(".item")[fallback](),e=$.Event("slide",{relatedTarget:$next[0]}),!$next.hasClass("active")){if($.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(e),e.isDefaultPrevented())return;$next.addClass(type),$next[0].offsetWidth,$active.addClass(direction),$next.addClass(direction),this.$element.one($.support.transition.end,function(){$next.removeClass([type,direction].join(" ")).addClass("active"),$active.removeClass(["active",direction].join(" ")),that.sliding=!1,setTimeout(function(){that.$element.trigger("slid")},0)})}else{if(this.$element.trigger(e),e.isDefaultPrevented())return;$active.removeClass("active"),$next.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return isCycling&&this.cycle(),this}}};var old=$.fn.carousel;$.fn.carousel=function(option){return this.each(function(){var $this=$(this),data=$this.data("carousel"),options=$.extend({},$.fn.carousel.defaults,"object"==typeof option&&option),action="string"==typeof option?option:options.slide;data||$this.data("carousel",data=new Carousel(this,options)),"number"==typeof option?data.to(option):action?data[action]():options.interval&&data.cycle()})},$.fn.carousel.defaults={interval:5e3,pause:"hover"},$.fn.carousel.Constructor=Carousel,$.fn.carousel.noConflict=function(){return $.fn.carousel=old,this},$(document).on("click.carousel.data-api","[data-slide]",function(e){var href,$this=$(this),$target=$($this.attr("data-target")||(href=$this.attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,"")),options=$.extend({},$target.data(),$this.data());$target.carousel(options),e.preventDefault()})}(window.jQuery),!function($){"use strict";var Collapse=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.collapse.defaults,options),this.options.parent&&(this.$parent=$(this.options.parent)),this.options.toggle&&this.toggle()};Collapse.prototype={constructor:Collapse,dimension:function(){var hasWidth=this.$element.hasClass("width");return hasWidth?"width":"height"},show:function(){var dimension,scroll,actives,hasData;if(!this.transitioning){if(dimension=this.dimension(),scroll=$.camelCase(["scroll",dimension].join("-")),actives=this.$parent&&this.$parent.find("> .accordion-group > .in"),actives&&actives.length){if(hasData=actives.data("collapse"),hasData&&hasData.transitioning)return;actives.collapse("hide"),hasData||actives.data("collapse",null)}this.$element[dimension](0),this.transition("addClass",$.Event("show"),"shown"),$.support.transition&&this.$element[dimension](this.$element[0][scroll])}},hide:function(){var dimension;this.transitioning||(dimension=this.dimension(),this.reset(this.$element[dimension]()),this.transition("removeClass",$.Event("hide"),"hidden"),this.$element[dimension](0))},reset:function(size){var dimension=this.dimension();return this.$element.removeClass("collapse")[dimension](size||"auto")[0].offsetWidth,this.$element[null!==size?"addClass":"removeClass"]("collapse"),this},transition:function(method,startEvent,completeEvent){var that=this,complete=function(){"show"==startEvent.type&&that.reset(),that.transitioning=0,that.$element.trigger(completeEvent)};this.$element.trigger(startEvent),startEvent.isDefaultPrevented()||(this.transitioning=1,this.$element[method]("in"),$.support.transition&&this.$element.hasClass("collapse")?this.$element.one($.support.transition.end,complete):complete())},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var old=$.fn.collapse;$.fn.collapse=function(option){return this.each(function(){var $this=$(this),data=$this.data("collapse"),options="object"==typeof option&&option;data||$this.data("collapse",data=new Collapse(this,options)),"string"==typeof option&&data[option]()})},$.fn.collapse.defaults={toggle:!0},$.fn.collapse.Constructor=Collapse,$.fn.collapse.noConflict=function(){return $.fn.collapse=old,this},$(document).on("click.collapse.data-api","[data-toggle=collapse]",function(e){var href,$this=$(this),target=$this.attr("data-target")||e.preventDefault()||(href=$this.attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,""),option=$(target).data("collapse")?"toggle":$this.data();$this[$(target).hasClass("in")?"addClass":"removeClass"]("collapsed"),$(target).collapse(option)})}(window.jQuery),!function($){"use strict";function clearMenus(){$(toggle).each(function(){getParent($(this)).removeClass("open")})}function getParent($this){var $parent,selector=$this.attr("data-target");return selector||(selector=$this.attr("href"),selector=selector&&/#/.test(selector)&&selector.replace(/.*(?=#[^\s]*$)/,"")),$parent=$(selector),$parent.length||($parent=$this.parent()),$parent}var toggle="[data-toggle=dropdown]",Dropdown=function(element){var $el=$(element).on("click.dropdown.data-api",this.toggle);$("html").on("click.dropdown.data-api",function(){$el.parent().removeClass("open")})};Dropdown.prototype={constructor:Dropdown,toggle:function(){var $parent,isActive,$this=$(this);if(!$this.is(".disabled, :disabled"))return $parent=getParent($this),isActive=$parent.hasClass("open"),clearMenus(),isActive||$parent.toggleClass("open"),$this.focus(),!1},keydown:function(e){var $this,$items,$parent,isActive,index;if(/(38|40|27)/.test(e.keyCode)&&($this=$(this),e.preventDefault(),e.stopPropagation(),!$this.is(".disabled, :disabled"))){if($parent=getParent($this),isActive=$parent.hasClass("open"),!isActive||isActive&&27==e.keyCode)return $this.click();$items=$("[role=menu] li:not(.divider):visible a",$parent),$items.length&&(index=$items.index($items.filter(":focus")),38==e.keyCode&&index>0&&index--,40==e.keyCode&&$items.length-1>index&&index++,~index||(index=0),$items.eq(index).focus())}}};var old=$.fn.dropdown;$.fn.dropdown=function(option){return this.each(function(){var $this=$(this),data=$this.data("dropdown");data||$this.data("dropdown",data=new Dropdown(this)),"string"==typeof option&&data[option].call($this)})},$.fn.dropdown.Constructor=Dropdown,$.fn.dropdown.noConflict=function(){return $.fn.dropdown=old,this},$(document).on("click.dropdown.data-api touchstart.dropdown.data-api",clearMenus).on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("touchstart.dropdown.data-api",".dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",toggle,Dropdown.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",toggle+", [role=menu]",Dropdown.prototype.keydown)}(window.jQuery),!function($){"use strict";var Modal=function(element,options){this.options=options,this.$element=$(element).delegate('[data-dismiss="modal"]',"click.dismiss.modal",$.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};Modal.prototype={constructor:Modal,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var that=this,e=$.Event("show");this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.backdrop(function(){var transition=$.support.transition&&that.$element.hasClass("fade");that.$element.parent().length||that.$element.appendTo(document.body),that.$element.show(),transition&&that.$element[0].offsetWidth,that.$element.addClass("in").attr("aria-hidden",!1),that.enforceFocus(),transition?that.$element.one($.support.transition.end,function(){that.$element.focus().trigger("shown")}):that.$element.focus().trigger("shown")}))},hide:function(e){e&&e.preventDefault(),e=$.Event("hide"),this.$element.trigger(e),this.isShown&&!e.isDefaultPrevented()&&(this.isShown=!1,this.escape(),$(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),$.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal())},enforceFocus:function(){var that=this;$(document).on("focusin.modal",function(e){that.$element[0]===e.target||that.$element.has(e.target).length||that.$element.focus()})},escape:function(){var that=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(e){27==e.which&&that.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var that=this,timeout=setTimeout(function(){that.$element.off($.support.transition.end),that.hideModal()},500);this.$element.one($.support.transition.end,function(){clearTimeout(timeout),that.hideModal()})},hideModal:function(){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(callback){var animate=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var doAnimate=$.support.transition&&animate;this.$backdrop=$('<div class="modal-backdrop '+animate+'" />').appendTo(document.body),this.$backdrop.click("static"==this.options.backdrop?$.proxy(this.$element[0].focus,this.$element[0]):$.proxy(this.hide,this)),doAnimate&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),doAnimate?this.$backdrop.one($.support.transition.end,callback):callback()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),$.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one($.support.transition.end,$.proxy(this.removeBackdrop,this)):this.removeBackdrop()):callback&&callback()}};var old=$.fn.modal;$.fn.modal=function(option){return this.each(function(){var $this=$(this),data=$this.data("modal"),options=$.extend({},$.fn.modal.defaults,$this.data(),"object"==typeof option&&option);data||$this.data("modal",data=new Modal(this,options)),"string"==typeof option?data[option]():options.show&&data.show()})},$.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},$.fn.modal.Constructor=Modal,$.fn.modal.noConflict=function(){return $.fn.modal=old,this},$(document).on("click.modal.data-api",'[data-toggle="modal"]',function(e){var $this=$(this),href=$this.attr("href"),$target=$($this.attr("data-target")||href&&href.replace(/.*(?=#[^\s]+$)/,"")),option=$target.data("modal")?"toggle":$.extend({remote:!/#/.test(href)&&href},$target.data(),$this.data());e.preventDefault(),$target.modal(option).one("hide",function(){$this.focus()})})}(window.jQuery),!function($){"use strict";var Tooltip=function(element,options){this.init("tooltip",element,options)};Tooltip.prototype={constructor:Tooltip,init:function(type,element,options){var eventIn,eventOut;this.type=type,this.$element=$(element),this.options=this.getOptions(options),this.enabled=!0,"click"==this.options.trigger?this.$element.on("click."+this.type,this.options.selector,$.proxy(this.toggle,this)):"manual"!=this.options.trigger&&(eventIn="hover"==this.options.trigger?"mouseenter":"focus",eventOut="hover"==this.options.trigger?"mouseleave":"blur",this.$element.on(eventIn+"."+this.type,this.options.selector,$.proxy(this.enter,this)),this.$element.on(eventOut+"."+this.type,this.options.selector,$.proxy(this.leave,this))),this.options.selector?this._options=$.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(options){return options=$.extend({},$.fn[this.type].defaults,options,this.$element.data()),options.delay&&"number"==typeof options.delay&&(options.delay={show:options.delay,hide:options.delay}),options},enter:function(e){var self=$(e.currentTarget)[this.type](this._options).data(this.type);return self.options.delay&&self.options.delay.show?(clearTimeout(this.timeout),self.hoverState="in",this.timeout=setTimeout(function(){"in"==self.hoverState&&self.show()},self.options.delay.show),void 0):self.show()},leave:function(e){var self=$(e.currentTarget)[this.type](this._options).data(this.type);return this.timeout&&clearTimeout(this.timeout),self.options.delay&&self.options.delay.hide?(self.hoverState="out",this.timeout=setTimeout(function(){"out"==self.hoverState&&self.hide()},self.options.delay.hide),void 0):self.hide()},show:function(){var $tip,inside,pos,actualWidth,actualHeight,placement,tp;if(this.hasContent()&&this.enabled){switch($tip=this.tip(),this.setContent(),this.options.animation&&$tip.addClass("fade"),placement="function"==typeof this.options.placement?this.options.placement.call(this,$tip[0],this.$element[0]):this.options.placement,inside=/in/.test(placement),$tip.detach().css({top:0,left:0,display:"block"}).insertAfter(this.$element),pos=this.getPosition(inside),actualWidth=$tip[0].offsetWidth,actualHeight=$tip[0].offsetHeight,inside?placement.split(" ")[1]:placement){case"bottom":tp={top:pos.top+pos.height,left:pos.left+pos.width/2-actualWidth/2};break;case"top":tp={top:pos.top-actualHeight,left:pos.left+pos.width/2-actualWidth/2};break;case"left":tp={top:pos.top+pos.height/2-actualHeight/2,left:pos.left-actualWidth};break;case"right":tp={top:pos.top+pos.height/2-actualHeight/2,left:pos.left+pos.width}}$tip.offset(tp).addClass(placement).addClass("in")}},setContent:function(){var $tip=this.tip(),title=this.getTitle();$tip.find(".tooltip-inner")[this.options.html?"html":"text"](title),$tip.removeClass("fade in top bottom left right")},hide:function(){function removeWithAnimation(){var timeout=setTimeout(function(){$tip.off($.support.transition.end).detach()},500);$tip.one($.support.transition.end,function(){clearTimeout(timeout),$tip.detach()})}var $tip=this.tip();return $tip.removeClass("in"),$.support.transition&&this.$tip.hasClass("fade")?removeWithAnimation():$tip.detach(),this},fixTitle:function(){var $e=this.$element;($e.attr("title")||"string"!=typeof $e.attr("data-original-title"))&&$e.attr("data-original-title",$e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(inside){return $.extend({},inside?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var title,$e=this.$element,o=this.options;return title=$e.attr("data-original-title")||("function"==typeof o.title?o.title.call($e[0]):o.title)},tip:function(){return this.$tip=this.$tip||$(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(e){var self=$(e.currentTarget)[this.type](this._options).data(this.type);self[self.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var old=$.fn.tooltip;$.fn.tooltip=function(option){return this.each(function(){var $this=$(this),data=$this.data("tooltip"),options="object"==typeof option&&option;data||$this.data("tooltip",data=new Tooltip(this,options)),"string"==typeof option&&data[option]()})},$.fn.tooltip.Constructor=Tooltip,$.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!1},$.fn.tooltip.noConflict=function(){return $.fn.tooltip=old,this}}(window.jQuery),!function($){"use strict";var Popover=function(element,options){this.init("popover",element,options)};Popover.prototype=$.extend({},$.fn.tooltip.Constructor.prototype,{constructor:Popover,setContent:function(){var $tip=this.tip(),title=this.getTitle(),content=this.getContent();$tip.find(".popover-title")[this.options.html?"html":"text"](title),$tip.find(".popover-content")[this.options.html?"html":"text"](content),$tip.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var content,$e=this.$element,o=this.options;return content=$e.attr("data-content")||("function"==typeof o.content?o.content.call($e[0]):o.content)},tip:function(){return this.$tip||(this.$tip=$(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var old=$.fn.popover;$.fn.popover=function(option){return this.each(function(){var $this=$(this),data=$this.data("popover"),options="object"==typeof option&&option;data||$this.data("popover",data=new Popover(this,options)),"string"==typeof option&&data[option]()})},$.fn.popover.Constructor=Popover,$.fn.popover.defaults=$.extend({},$.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>'}),$.fn.popover.noConflict=function(){return $.fn.popover=old,this}}(window.jQuery),!function($){"use strict";function ScrollSpy(element,options){var href,process=$.proxy(this.process,this),$element=$(element).is("body")?$(window):$(element);this.options=$.extend({},$.fn.scrollspy.defaults,options),this.$scrollElement=$element.on("scroll.scroll-spy.data-api",process),this.selector=(this.options.target||(href=$(element).attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=$("body"),this.refresh(),this.process()}ScrollSpy.prototype={constructor:ScrollSpy,refresh:function(){var $targets,self=this;this.offsets=$([]),this.targets=$([]),$targets=this.$body.find(this.selector).map(function(){var $el=$(this),href=$el.data("target")||$el.attr("href"),$href=/^#\w/.test(href)&&$(href);return $href&&$href.length&&[[$href.position().top+self.$scrollElement.scrollTop(),href]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){self.offsets.push(this[0]),self.targets.push(this[1])})},process:function(){var i,scrollTop=this.$scrollElement.scrollTop()+this.options.offset,scrollHeight=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,maxScroll=scrollHeight-this.$scrollElement.height(),offsets=this.offsets,targets=this.targets,activeTarget=this.activeTarget;if(scrollTop>=maxScroll)return activeTarget!=(i=targets.last()[0])&&this.activate(i);for(i=offsets.length;i--;)activeTarget!=targets[i]&&scrollTop>=offsets[i]&&(!offsets[i+1]||offsets[i+1]>=scrollTop)&&this.activate(targets[i])},activate:function(target){var active,selector;this.activeTarget=target,$(this.selector).parent(".active").removeClass("active"),selector=this.selector+'[data-target="'+target+'"],'+this.selector+'[href="'+target+'"]',active=$(selector).parent("li").addClass("active"),active.parent(".dropdown-menu").length&&(active=active.closest("li.dropdown").addClass("active")),active.trigger("activate")}};var old=$.fn.scrollspy;$.fn.scrollspy=function(option){return this.each(function(){var $this=$(this),data=$this.data("scrollspy"),options="object"==typeof option&&option;data||$this.data("scrollspy",data=new ScrollSpy(this,options)),"string"==typeof option&&data[option]()})},$.fn.scrollspy.Constructor=ScrollSpy,$.fn.scrollspy.defaults={offset:10},$.fn.scrollspy.noConflict=function(){return $.fn.scrollspy=old,this},$(window).on("load",function(){$('[data-spy="scroll"]').each(function(){var $spy=$(this);$spy.scrollspy($spy.data())})})}(window.jQuery),!function($){"use strict";var Tab=function(element){this.element=$(element)};Tab.prototype={constructor:Tab,show:function(){var previous,$target,e,$this=this.element,$ul=$this.closest("ul:not(.dropdown-menu)"),selector=$this.attr("data-target");selector||(selector=$this.attr("href"),selector=selector&&selector.replace(/.*(?=#[^\s]*$)/,"")),$this.parent("li").hasClass("active")||(previous=$ul.find(".active:last a")[0],e=$.Event("show",{relatedTarget:previous}),$this.trigger(e),e.isDefaultPrevented()||($target=$(selector),this.activate($this.parent("li"),$ul),this.activate($target,$target.parent(),function(){$this.trigger({type:"shown",relatedTarget:previous})})))},activate:function(element,container,callback){function next(){$active.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),element.addClass("active"),transition?(element[0].offsetWidth,element.addClass("in")):element.removeClass("fade"),element.parent(".dropdown-menu")&&element.closest("li.dropdown").addClass("active"),callback&&callback()}var $active=container.find("> .active"),transition=callback&&$.support.transition&&$active.hasClass("fade");transition?$active.one($.support.transition.end,next):next(),$active.removeClass("in")}};var old=$.fn.tab;$.fn.tab=function(option){return this.each(function(){var $this=$(this),data=$this.data("tab");data||$this.data("tab",data=new Tab(this)),"string"==typeof option&&data[option]()})},$.fn.tab.Constructor=Tab,$.fn.tab.noConflict=function(){return $.fn.tab=old,this},$(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(e){e.preventDefault(),$(this).tab("show")})}(window.jQuery),!function($){"use strict";var Typeahead=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.typeahead.defaults,options),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=$(this.options.menu),this.shown=!1,this.listen()};Typeahead.prototype={constructor:Typeahead,select:function(){var val=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(val)).change(),this.hide()},updater:function(item){return item},show:function(){var pos=$.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:pos.top+pos.height,left:pos.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(){var items;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(items=$.isFunction(this.source)?this.source(this.query,$.proxy(this.process,this)):this.source,items?this.process(items):this)},process:function(items){var that=this;return items=$.grep(items,function(item){return that.matcher(item)}),items=this.sorter(items),items.length?this.render(items.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(item){return~item.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(items){for(var item,beginswith=[],caseSensitive=[],caseInsensitive=[];item=items.shift();)item.toLowerCase().indexOf(this.query.toLowerCase())?~item.indexOf(this.query)?caseSensitive.push(item):caseInsensitive.push(item):beginswith.push(item);return beginswith.concat(caseSensitive,caseInsensitive)},highlighter:function(item){var query=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return item.replace(RegExp("("+query+")","ig"),function($1,match){return"<strong>"+match+"</strong>"})},render:function(items){var that=this;return items=$(items).map(function(i,item){return i=$(that.options.item).attr("data-value",item),i.find("a").html(that.highlighter(item)),i[0]}),items.first().addClass("active"),this.$menu.html(items),this},next:function(){var active=this.$menu.find(".active").removeClass("active"),next=active.next();next.length||(next=$(this.$menu.find("li")[0])),next.addClass("active")},prev:function(){var active=this.$menu.find(".active").removeClass("active"),prev=active.prev();prev.length||(prev=this.$menu.find("li").last()),prev.addClass("active")},listen:function(){this.$element.on("blur",$.proxy(this.blur,this)).on("keypress",$.proxy(this.keypress,this)).on("keyup",$.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",$.proxy(this.keydown,this)),this.$menu.on("click",$.proxy(this.click,this)).on("mouseenter","li",$.proxy(this.mouseenter,this))},eventSupported:function(eventName){var isSupported=eventName in this.$element;return isSupported||(this.$element.setAttribute(eventName,"return;"),isSupported="function"==typeof this.$element[eventName]),isSupported},move:function(e){if(this.shown){switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()}},keydown:function(e){this.suppressKeyPressRepeat=~$.inArray(e.keyCode,[40,38,9,13,27]),this.move(e)},keypress:function(e){this.suppressKeyPressRepeat||this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(){var that=this;setTimeout(function(){that.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(e){this.$menu.find(".active").removeClass("active"),$(e.currentTarget).addClass("active")}};var old=$.fn.typeahead;$.fn.typeahead=function(option){return this.each(function(){var $this=$(this),data=$this.data("typeahead"),options="object"==typeof option&&option;data||$this.data("typeahead",data=new Typeahead(this,options)),"string"==typeof option&&data[option]()})},$.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},$.fn.typeahead.Constructor=Typeahead,$.fn.typeahead.noConflict=function(){return $.fn.typeahead=old,this},$(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(e){var $this=$(this);$this.data("typeahead")||(e.preventDefault(),$this.typeahead($this.data()))})}(window.jQuery),!function($){"use strict";var Affix=function(element,options){this.options=$.extend({},$.fn.affix.defaults,options),this.$window=$(window).on("scroll.affix.data-api",$.proxy(this.checkPosition,this)).on("click.affix.data-api",$.proxy(function(){setTimeout($.proxy(this.checkPosition,this),1)},this)),this.$element=$(element),this.checkPosition()};Affix.prototype.checkPosition=function(){if(this.$element.is(":visible")){var affix,scrollHeight=$(document).height(),scrollTop=this.$window.scrollTop(),position=this.$element.offset(),offset=this.options.offset,offsetBottom=offset.bottom,offsetTop=offset.top,reset="affix affix-top affix-bottom";"object"!=typeof offset&&(offsetBottom=offsetTop=offset),"function"==typeof offsetTop&&(offsetTop=offset.top()),"function"==typeof offsetBottom&&(offsetBottom=offset.bottom()),affix=null!=this.unpin&&scrollTop+this.unpin<=position.top?!1:null!=offsetBottom&&position.top+this.$element.height()>=scrollHeight-offsetBottom?"bottom":null!=offsetTop&&offsetTop>=scrollTop?"top":!1,this.affixed!==affix&&(this.affixed=affix,this.unpin="bottom"==affix?position.top-scrollTop:null,this.$element.removeClass(reset).addClass("affix"+(affix?"-"+affix:"")))}};var old=$.fn.affix;$.fn.affix=function(option){return this.each(function(){var $this=$(this),data=$this.data("affix"),options="object"==typeof option&&option;data||$this.data("affix",data=new Affix(this,options)),"string"==typeof option&&data[option]()})},$.fn.affix.Constructor=Affix,$.fn.affix.defaults={offset:0},$.fn.affix.noConflict=function(){return $.fn.affix=old,this},$(window).on("load",function(){$('[data-spy="affix"]').each(function(){var $spy=$(this),data=$spy.data();data.offset=data.offset||{},data.offsetBottom&&(data.offset.bottom=data.offsetBottom),data.offsetTop&&(data.offset.top=data.offsetTop),$spy.affix(data)})})}(window.jQuery);
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/highcharts.js b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/highcharts.js
deleted file mode 100644
index 7d9a0b1202ad90255af10ccab4d7fad120a23d41..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/highcharts.js
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- Highcharts JS v2.3.5 (2012-12-19)
-
- (c) 2009-2012 Torstein Hønsi
-
- License: www.highcharts.com/license
-*/
-(function(){function x(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return a}function ia(){for(var a=0,b=arguments,c=b.length,d={};a<c;a++)d[b[a++]]=b[a];return d}function z(a,b){return parseInt(a,b||10)}function ja(a){return typeof a==="string"}function Y(a){return typeof a==="object"}function Ia(a){return Object.prototype.toString.call(a)==="[object Array]"}function Da(a){return typeof a==="number"}function ka(a){return K.log(a)/K.LN10}function aa(a){return K.pow(10,a)}function ta(a,b){for(var c=a.length;c--;)if(a[c]===
-b){a.splice(c,1);break}}function r(a){return a!==A&&a!==null}function w(a,b,c){var d,e;if(ja(b))r(c)?a.setAttribute(b,c):a&&a.getAttribute&&(e=a.getAttribute(b));else if(r(b)&&Y(b))for(d in b)a.setAttribute(d,b[d]);return e}function la(a){return Ia(a)?a:[a]}function n(){var a=arguments,b,c,d=a.length;for(b=0;b<d;b++)if(c=a[b],typeof c!=="undefined"&&c!==null)return c}function I(a,b){if(Ea&&b&&b.opacity!==A)b.filter="alpha(opacity="+b.opacity*100+")";x(a.style,b)}function T(a,b,c,d,e){a=C.createElement(a);
-b&&x(a,b);e&&I(a,{padding:0,border:Q,margin:0});c&&I(a,c);d&&d.appendChild(a);return a}function ba(a,b){var c=function(){};c.prototype=new a;x(c.prototype,b);return c}function Ja(a,b,c,d){var e=N.lang,f=a;b===-1?(b=(a||0).toString(),a=b.indexOf(".")>-1?b.split(".")[1].length:0):a=isNaN(b=M(b))?2:b;var b=a,c=c===void 0?e.decimalPoint:c,d=d===void 0?e.thousandsSep:d,e=f<0?"-":"",a=String(z(f=M(+f||0).toFixed(b))),g=a.length>3?a.length%3:0;return e+(g?a.substr(0,g)+d:"")+a.substr(g).replace(/(\d{3})(?=\d)/g,
-"$1"+d)+(b?c+M(f-a).toFixed(b).slice(2):"")}function ua(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function hb(a,b,c,d){var e,c=n(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&&d.allowDecimals===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d<b.length;d++)if(a=b[d],e<=(b[d]+(b[d+1]||b[d]))/2)break;a*=c;return a}function Ab(a,b){var c=b||[[Bb,[1,2,5,10,20,25,50,100,200,500]],[ib,[1,2,5,10,15,30]],[Va,[1,2,5,10,15,30]],[Ka,[1,2,3,4,6,8,12]],[ma,[1,2]],[Wa,[1,2]],[La,[1,2,3,4,6]],[va,null]],d=
-c[c.length-1],e=D[d[0]],f=d[1],g;for(g=0;g<c.length;g++)if(d=c[g],e=D[d[0]],f=d[1],c[g+1]&&a<=(e*f[f.length-1]+D[c[g+1][0]])/2)break;e===D[va]&&a<5*e&&(f=[1,2,5]);e===D[va]&&a<5*e&&(f=[1,2,5]);c=hb(a/e,f);return{unitRange:e,count:c,unitName:d[0]}}function Cb(a,b,c,d){var e=[],f={},g=N.global.useUTC,h,i=new Date(b),j=a.unitRange,k=a.count;if(r(b)){j>=D[ib]&&(i.setMilliseconds(0),i.setSeconds(j>=D[Va]?0:k*U(i.getSeconds()/k)));if(j>=D[Va])i[Db](j>=D[Ka]?0:k*U(i[jb]()/k));if(j>=D[Ka])i[Eb](j>=D[ma]?
-0:k*U(i[kb]()/k));if(j>=D[ma])i[lb](j>=D[La]?1:k*U(i[Ma]()/k));j>=D[La]&&(i[Fb](j>=D[va]?0:k*U(i[Xa]()/k)),h=i[Ya]());j>=D[va]&&(h-=h%k,i[Gb](h));if(j===D[Wa])i[lb](i[Ma]()-i[mb]()+n(d,1));b=1;h=i[Ya]();for(var d=i.getTime(),l=i[Xa](),m=i[Ma](),i=g?0:(864E5+i.getTimezoneOffset()*6E4)%864E5;d<c;)e.push(d),j===D[va]?d=Za(h+b*k,0):j===D[La]?d=Za(h,l+b*k):!g&&(j===D[ma]||j===D[Wa])?d=Za(h,l,m+b*k*(j===D[ma]?1:7)):(d+=j*k,j<=D[Ka]&&d%D[ma]===i&&(f[d]=ma)),b++;e.push(d)}e.info=x(a,{higherRanks:f,totalRange:j*
-k});return e}function Hb(){this.symbol=this.color=0}function Ib(a,b){var c=a.length,d,e;for(e=0;e<c;e++)a[e].ss_i=e;a.sort(function(a,c){d=b(a,c);return d===0?a.ss_i-c.ss_i:d});for(e=0;e<c;e++)delete a[e].ss_i}function Fa(a){for(var b=a.length,c=a[0];b--;)a[b]<c&&(c=a[b]);return c}function wa(a){for(var b=a.length,c=a[0];b--;)a[b]>c&&(c=a[b]);return c}function Ga(a,b){for(var c in a)a[c]&&a[c]!==b&&a[c].destroy&&a[c].destroy(),delete a[c]}function Na(a){$a||($a=T(ga));a&&$a.appendChild(a);$a.innerHTML=
-""}function Oa(a,b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;else L.console&&console.log(c)}function da(a){return parseFloat(a.toPrecision(14))}function xa(a,b){Pa=n(a,b.animation)}function Jb(){var a=N.global.useUTC,b=a?"getUTC":"get",c=a?"setUTC":"set";Za=a?Date.UTC:function(a,b,c,g,h,i){return(new Date(a,b,n(c,1),n(g,0),n(h,0),n(i,0))).getTime()};jb=b+"Minutes";kb=b+"Hours";mb=b+"Day";Ma=b+"Date";Xa=b+"Month";Ya=b+"FullYear";Db=c+"Minutes";Eb=c+"Hours";lb=c+"Date";
-Fb=c+"Month";Gb=c+"FullYear"}function ya(){}function Qa(a,b,c){this.axis=a;this.pos=b;this.type=c||"";this.isNew=!0;c||this.addLabel()}function nb(a,b){this.axis=a;if(b)this.options=b,this.id=b.id;return this}function Kb(a,b,c,d,e,f){var g=a.chart.inverted;this.axis=a;this.isNegative=c;this.options=b;this.x=d;this.stack=e;this.percent=f==="percent";this.alignOptions={align:b.align||(g?c?"left":"right":"center"),verticalAlign:b.verticalAlign||(g?"middle":c?"bottom":"top"),y:n(b.y,g?4:c?14:-6),x:n(b.x,
-g?c?-6:6:0)};this.textAlign=b.textAlign||(g?c?"right":"left":"center")}function ob(){this.init.apply(this,arguments)}function pb(a,b){var c=b.borderWidth,d=b.style,e=z(d.padding);this.chart=a;this.options=b;this.crosshairs=[];this.now={x:0,y:0};this.isHidden=!0;this.label=a.renderer.label("",0,0,b.shape,null,null,b.useHTML,null,"tooltip").attr({padding:e,fill:b.backgroundColor,"stroke-width":c,r:b.borderRadius,zIndex:8}).css(d).css({padding:0}).hide().add();V||this.label.shadow(b.shadow);this.shared=
-b.shared}function qb(a,b){var c=V?"":b.chart.zoomType;this.zoomX=/x/.test(c);this.zoomY=/y/.test(c);this.options=b;this.chart=a;this.init(a,b.tooltip)}function rb(a){this.init(a)}function sb(){this.init.apply(this,arguments)}var A,C=document,L=window,K=Math,u=K.round,U=K.floor,za=K.ceil,s=K.max,O=K.min,M=K.abs,W=K.cos,Z=K.sin,Aa=K.PI,ab=Aa*2/360,na=navigator.userAgent,Lb=L.opera,Ea=/msie/i.test(na)&&!Lb,Ra=C.documentMode===8,bb=/AppleWebKit/.test(na),cb=/Firefox/.test(na),Mb=/(Mobile|Android|Windows Phone)/.test(na),
-oa="http://www.w3.org/2000/svg",ca=!!C.createElementNS&&!!C.createElementNS(oa,"svg").createSVGRect,Sb=cb&&parseInt(na.split("Firefox/")[1],10)<4,V=!ca&&!Ea&&!!C.createElement("canvas").getContext,Sa,Ba=C.documentElement.ontouchstart!==A,Nb={},tb=0,$a,N,db,Pa,ub,D,pa=function(){},Ha=[],ga="div",Q="none",vb="rgba(192,192,192,"+(ca?1.0E-4:0.002)+")",Bb="millisecond",ib="second",Va="minute",Ka="hour",ma="day",Wa="week",La="month",va="year",wb="stroke-width",Za,jb,kb,mb,Ma,Xa,Ya,Db,Eb,lb,Fb,Gb,$={};L.Highcharts=
-{};db=function(a,b,c){if(!r(b)||isNaN(b))return"Invalid date";var a=n(a,"%Y-%m-%d %H:%M:%S"),d=new Date(b),e,f=d[kb](),g=d[mb](),h=d[Ma](),i=d[Xa](),j=d[Ya](),k=N.lang,l=k.weekdays,b={a:l[g].substr(0,3),A:l[g],d:ua(h),e:h,b:k.shortMonths[i],B:k.months[i],m:ua(i+1),y:j.toString().substr(2,2),Y:j,H:ua(f),I:ua(f%12||12),l:f%12||12,M:ua(d[jb]()),p:f<12?"AM":"PM",P:f<12?"am":"pm",S:ua(d.getSeconds()),L:ua(u(b%1E3),3)};for(e in b)for(;a.indexOf("%"+e)!==-1;)a=a.replace("%"+e,b[e]);return c?a.substr(0,1).toUpperCase()+
-a.substr(1):a};Hb.prototype={wrapColor:function(a){if(this.color>=a)this.color=0},wrapSymbol:function(a){if(this.symbol>=a)this.symbol=0}};D=ia(Bb,1,ib,1E3,Va,6E4,Ka,36E5,ma,864E5,Wa,6048E5,La,26784E5,va,31556952E3);ub={init:function(a,b,c){var b=b||"",d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g,b=b.split(" "),c=[].concat(c),h,i,j=function(a){for(g=a.length;g--;)a[g]==="M"&&a.splice(g+1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(j(b),j(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-6,6));if(d<=
-c.length/f)for(;d--;)c=[].concat(c).splice(0,f).concat(c);a.shift=0;if(b.length)for(a=c.length;b.length<a;)d=[].concat(b).splice(b.length-f,f),e&&(d[f-6]=d[f-2],d[f-5]=d[f-1]),b=b.concat(d);h&&(b=b.concat(h),c=c.concat(i));return[b,c]},step:function(a,b,c,d){var e=[],f=a.length;if(c===1)e=d;else if(f===b.length&&c<1)for(;f--;)d=parseFloat(a[f]),e[f]=isNaN(d)?a[f]:c*parseFloat(b[f]-d)+d;else e=b;return e}};(function(a){L.HighchartsAdapter=L.HighchartsAdapter||a&&{init:function(b){var c=a.fx,d=c.step,
-e,f=a.Tween,g=f&&f.propHooks;a.extend(a.easing,{easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c}});a.each(["cur","_default","width","height"],function(a,b){var e=d,k,l;b==="cur"?e=c.prototype:b==="_default"&&f&&(e=g[b],b="set");(k=e[b])&&(e[b]=function(c){c=a?c:this;l=c.elem;return l.attr?l.attr(c.prop,b==="cur"?A:c.now):k.apply(this,arguments)})});e=function(a){var c=a.elem,d;if(!a.started)d=b.init(c,c.d,c.toD),a.start=d[0],a.end=d[1],a.started=!0;c.attr("d",b.step(a.start,a.end,a.pos,c.toD))};
-f?g.d={set:e}:d.d=e;this.each=Array.prototype.forEach?function(a,b){return Array.prototype.forEach.call(a,b)}:function(a,b){for(var c=0,d=a.length;c<d;c++)if(b.call(a[c],a[c],c,a)===!1)return c}},getScript:a.getScript,inArray:a.inArray,adapterRun:function(b,c){return a(b)[c]()},grep:a.grep,map:function(a,c){for(var d=[],e=0,f=a.length;e<f;e++)d[e]=c.call(a[e],a[e],e,a);return d},merge:function(){var b=arguments;return a.extend(!0,null,b[0],b[1],b[2],b[3])},offset:function(b){return a(b).offset()},
-addEvent:function(b,c,d){a(b).bind(c,d)},removeEvent:function(b,c,d){var e=C.removeEventListener?"removeEventListener":"detachEvent";C[e]&&!b[e]&&(b[e]=function(){});a(b).unbind(c,d)},fireEvent:function(b,c,d,e){var f=a.Event(c),g="detached"+c,h;!Ea&&d&&(delete d.layerX,delete d.layerY);x(f,d);b[c]&&(b[g]=b[c],b[c]=null);a.each(["preventDefault","stopPropagation"],function(a,b){var c=f[b];f[b]=function(){try{c.call(f)}catch(a){b==="preventDefault"&&(h=!0)}}});a(b).trigger(f);b[g]&&(b[c]=b[g],b[g]=
-null);e&&!f.isDefaultPrevented()&&!h&&e(f)},washMouseEvent:function(a){var c=a.originalEvent||a;if(c.pageX===A)c.pageX=a.pageX,c.pageY=a.pageY;return c},animate:function(b,c,d){var e=a(b);if(c.d)b.toD=c.d,c.d=1;e.stop();e.animate(c,d)},stop:function(b){a(b).stop()}}})(L.jQuery);var ea=L.HighchartsAdapter,G=ea||{};ea&&ea.init.call(ea,ub);var eb=G.adapterRun,Tb=G.getScript,Ub=G.inArray,o=G.each,Ob=G.grep,Vb=G.offset,Ta=G.map,B=G.merge,J=G.addEvent,R=G.removeEvent,F=G.fireEvent,Pb=G.washMouseEvent,xb=
-G.animate,fb=G.stop,G={enabled:!0,align:"center",x:0,y:15,style:{color:"#666",fontSize:"11px",lineHeight:"14px"}};N={colors:"#4572A7,#AA4643,#89A54E,#80699B,#3D96AE,#DB843D,#92A8CD,#A47D7C,#B5CA92".split(","),symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:"January,February,March,April,May,June,July,August,September,October,November,December".split(","),shortMonths:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),weekdays:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),
-decimalPoint:".",numericSymbols:"k,M,G,T,P,E".split(","),resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:","},global:{useUTC:!0,canvasToolsURL:"http://code.highcharts.com/2.3.5/modules/canvas-tools.js",VMLRadialGradientURL:"http://code.highcharts.com/2.3.5/gfx/vml-radial-gradient.png"},chart:{borderColor:"#4572A7",borderRadius:5,defaultSeriesType:"line",ignoreHiddenSeries:!0,spacingTop:10,spacingRight:10,spacingBottom:15,spacingLeft:10,style:{fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif',
-fontSize:"12px"},backgroundColor:"#FFFFFF",plotBorderColor:"#C0C0C0",resetZoomButton:{theme:{zIndex:20},position:{align:"right",x:-10,y:10}}},title:{text:"Chart title",align:"center",y:15,style:{color:"#3E576F",fontSize:"16px"}},subtitle:{text:"",align:"center",y:30,style:{color:"#6D869F"}},plotOptions:{line:{allowPointSelect:!1,showCheckbox:!1,animation:{duration:1E3},events:{},lineWidth:2,shadow:!0,marker:{enabled:!0,lineWidth:0,radius:4,lineColor:"#FFFFFF",states:{hover:{enabled:!0},select:{fillColor:"#FFFFFF",
-lineColor:"#000000",lineWidth:2}}},point:{events:{}},dataLabels:B(G,{enabled:!1,formatter:function(){return this.y},verticalAlign:"bottom",y:0}),cropThreshold:300,pointRange:0,showInLegend:!0,states:{hover:{marker:{}},select:{marker:{}}},stickyTracking:!0}},labels:{style:{position:"absolute",color:"#3E576F"}},legend:{enabled:!0,align:"center",layout:"horizontal",labelFormatter:function(){return this.name},borderWidth:1,borderColor:"#909090",borderRadius:5,navigation:{activeColor:"#3E576F",inactiveColor:"#CCC"},
-shadow:!1,itemStyle:{cursor:"pointer",color:"#3E576F",fontSize:"12px"},itemHoverStyle:{color:"#000"},itemHiddenStyle:{color:"#CCC"},itemCheckboxStyle:{position:"absolute",width:"13px",height:"13px"},symbolWidth:16,symbolPadding:5,verticalAlign:"bottom",x:0,y:0},loading:{labelStyle:{fontWeight:"bold",position:"relative",top:"1em"},style:{position:"absolute",backgroundColor:"white",opacity:0.5,textAlign:"center"}},tooltip:{enabled:!0,backgroundColor:"rgba(255, 255, 255, .85)",borderWidth:2,borderRadius:5,
-dateTimeLabelFormats:{millisecond:"%A, %b %e, %H:%M:%S.%L",second:"%A, %b %e, %H:%M:%S",minute:"%A, %b %e, %H:%M",hour:"%A, %b %e, %H:%M",day:"%A, %b %e, %Y",week:"Week from %A, %b %e, %Y",month:"%B %Y",year:"%Y"},headerFormat:'<span style="font-size: 10px">{point.key}</span><br/>',pointFormat:'<span style="color:{series.color}">{series.name}</span>: <b>{point.y}</b><br/>',shadow:!0,shared:V,snap:Mb?25:10,style:{color:"#333333",fontSize:"12px",padding:"5px",whiteSpace:"nowrap"}},credits:{enabled:!0,
-text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",color:"#909090",fontSize:"10px"}}};var X=N.plotOptions,ea=X.line;Jb();var qa=function(a){var b=[],c;(function(a){(c=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(a))?b=[z(c[1]),z(c[2]),z(c[3]),parseFloat(c[4],10)]:(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(a))&&(b=[z(c[1],16),z(c[2],16),z(c[3],
-16),1])})(a);return{get:function(c){return b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+b[1]+","+b[2]+")":c==="a"?b[3]:"rgba("+b.join(",")+")":a},brighten:function(a){if(Da(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=z(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},setOpacity:function(a){b[3]=a;return this}}};ya.prototype={init:function(a,b){this.element=b==="span"?T(b):C.createElementNS(oa,b);this.renderer=a;this.attrSetters={}},animate:function(a,b,c){b=n(b,Pa,!0);fb(this);if(b){b=B(b);if(c)b.complete=
-c;xb(this,a,b)}else this.attr(a),c&&c()},attr:function(a,b){var c,d,e,f,g=this.element,h=g.nodeName.toLowerCase(),i=this.renderer,j,k=this.attrSetters,l=this.shadows,m,q,p=this;ja(a)&&r(b)&&(c=a,a={},a[c]=b);if(ja(a))c=a,h==="circle"?c={x:"cx",y:"cy"}[c]||c:c==="strokeWidth"&&(c="stroke-width"),p=w(g,c)||this[c]||0,c!=="d"&&c!=="visibility"&&(p=parseFloat(p));else for(c in a)if(j=!1,d=a[c],e=k[c]&&k[c].call(this,d,c),e!==!1){e!==A&&(d=e);if(c==="d")d&&d.join&&(d=d.join(" ")),/(NaN| {2}|^$)/.test(d)&&
-(d="M 0 0");else if(c==="x"&&h==="text"){for(e=0;e<g.childNodes.length;e++)f=g.childNodes[e],w(f,"x")===w(g,"x")&&w(f,"x",d);this.rotation&&w(g,"transform","rotate("+this.rotation+" "+d+" "+z(a.y||w(g,"y"))+")")}else if(c==="fill")d=i.color(d,g,c);else if(h==="circle"&&(c==="x"||c==="y"))c={x:"cx",y:"cy"}[c]||c;else if(h==="rect"&&c==="r")w(g,{rx:d,ry:d}),j=!0;else if(c==="translateX"||c==="translateY"||c==="rotation"||c==="verticalAlign")j=q=!0;else if(c==="stroke")d=i.color(d,g,c);else if(c==="dashstyle")if(c=
-"stroke-dasharray",d=d&&d.toLowerCase(),d==="solid")d=Q;else{if(d){d=d.replace("shortdashdotdot","3,1,1,1,1,1,").replace("shortdashdot","3,1,1,1").replace("shortdot","1,1,").replace("shortdash","3,1,").replace("longdash","8,3,").replace(/dot/g,"1,3,").replace("dash","4,3,").replace(/,$/,"").split(",");for(e=d.length;e--;)d[e]=z(d[e])*a["stroke-width"];d=d.join(",")}}else if(c==="isTracker")this[c]=d;else if(c==="width")d=z(d);else if(c==="align")c="text-anchor",d={left:"start",center:"middle",right:"end"}[d];
-else if(c==="title")e=g.getElementsByTagName("title")[0],e||(e=C.createElementNS(oa,"title"),g.appendChild(e)),e.textContent=d;c==="strokeWidth"&&(c="stroke-width");if(c==="stroke-width"&&d===0&&(bb||i.forExport))d=1.0E-6;this.symbolName&&/^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(c)&&(m||(this.symbolAttr(a),m=!0),j=!0);if(l&&/^(width|height|visibility|x|y|d|transform)$/.test(c))for(e=l.length;e--;)w(l[e],c,c==="height"?s(d-(l[e].cutHeight||0),0):d);if((c==="width"||c==="height")&&
-h==="rect"&&d<0)d=0;this[c]=d;q&&this.updateTransform();c==="text"?(d!==this.textStr&&delete this.bBox,this.textStr=d,this.added&&i.buildText(this)):j||w(g,c,d)}return p},symbolAttr:function(a){var b=this;o("x,y,r,start,end,width,height,innerR,anchorX,anchorY".split(","),function(c){b[c]=n(a[c],b[c])});b.attr({d:b.renderer.symbols[b.symbolName](b.x,b.y,b.width,b.height,b)})},clip:function(a){return this.attr("clip-path",a?"url("+this.renderer.url+"#"+a.id+")":Q)},crisp:function(a,b,c,d,e){var f,g=
-{},h={},i,a=a||this.strokeWidth||this.attr&&this.attr("stroke-width")||0;i=u(a)%2/2;h.x=U(b||this.x||0)+i;h.y=U(c||this.y||0)+i;h.width=U((d||this.width||0)-2*i);h.height=U((e||this.height||0)-2*i);h.strokeWidth=a;for(f in h)this[f]!==h[f]&&(this[f]=g[f]=h[f]);return g},css:function(a){var b=this.element,b=a&&a.width&&b.nodeName.toLowerCase()==="text",c,d="",e=function(a,b){return"-"+b.toLowerCase()};if(a&&a.color)a.fill=a.color;this.styles=a=x(this.styles,a);V&&b&&delete a.width;if(Ea&&!ca)b&&delete a.width,
-I(this.element,a);else{for(c in a)d+=c.replace(/([A-Z])/g,e)+":"+a[c]+";";this.attr({style:d})}b&&this.added&&this.renderer.buildText(this);return this},on:function(a,b){if(Ba&&a==="click")this.element.ontouchstart=function(a){a.preventDefault();b()};this.element["on"+a]=b;return this},setRadialReference:function(a){this.element.radialReference=a;return this},translate:function(a,b){return this.attr({translateX:a,translateY:b})},invert:function(){this.inverted=!0;this.updateTransform();return this},
-htmlCss:function(a){var b=this.element;if(b=a&&b.tagName==="SPAN"&&a.width)delete a.width,this.textWidth=b,this.updateTransform();this.styles=x(this.styles,a);I(this.element,a);return this},htmlGetBBox:function(){var a=this.element,b=this.bBox;if(!b){if(a.nodeName==="text")a.style.position="absolute";b=this.bBox={x:a.offsetLeft,y:a.offsetTop,width:a.offsetWidth,height:a.offsetHeight}}return b},htmlUpdateTransform:function(){if(this.added){var a=this.renderer,b=this.element,c=this.translateX||0,d=
-this.translateY||0,e=this.x||0,f=this.y||0,g=this.textAlign||"left",h={left:0,center:0.5,right:1}[g],i=g&&g!=="left",j=this.shadows;if(c||d)I(b,{marginLeft:c,marginTop:d}),j&&o(j,function(a){I(a,{marginLeft:c+1,marginTop:d+1})});this.inverted&&o(b.childNodes,function(c){a.invertChild(c,b)});if(b.tagName==="SPAN"){var k,l,j=this.rotation,m,q=0,p=1,q=0,y;m=z(this.textWidth);var t=this.xCorr||0,H=this.yCorr||0,ra=[j,g,b.innerHTML,this.textWidth].join(",");k={};if(ra!==this.cTT){if(r(j))a.isSVG?(t=Ea?
-"-ms-transform":bb?"-webkit-transform":cb?"MozTransform":Lb?"-o-transform":"",k[t]=k.transform="rotate("+j+"deg)"):(q=j*ab,p=W(q),q=Z(q),k.filter=j?["progid:DXImageTransform.Microsoft.Matrix(M11=",p,", M12=",-q,", M21=",q,", M22=",p,", sizingMethod='auto expand')"].join(""):Q),I(b,k);k=n(this.elemWidth,b.offsetWidth);l=n(this.elemHeight,b.offsetHeight);if(k>m&&/[ \-]/.test(b.textContent||b.innerText))I(b,{width:m+"px",display:"block",whiteSpace:"normal"}),k=m;m=a.fontMetrics(b.style.fontSize).b;t=
-p<0&&-k;H=q<0&&-l;y=p*q<0;t+=q*m*(y?1-h:h);H-=p*m*(j?y?h:1-h:1);i&&(t-=k*h*(p<0?-1:1),j&&(H-=l*h*(q<0?-1:1)),I(b,{textAlign:g}));this.xCorr=t;this.yCorr=H}I(b,{left:e+t+"px",top:f+H+"px"});if(bb)l=b.offsetHeight;this.cTT=ra}}else this.alignOnAdd=!0},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.inverted,d=this.rotation,e=[];c&&(a+=this.attr("width"),b+=this.attr("height"));(a||b)&&e.push("translate("+a+","+b+")");c?e.push("rotate(90) scale(-1,1)"):d&&e.push("rotate("+
-d+" "+(this.x||0)+" "+(this.y||0)+")");e.length&&w(this.element,"transform",e.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){a?(this.alignOptions=a,this.alignByTranslate=b,c||this.renderer.alignedObjects.push(this)):(a=this.alignOptions,b=this.alignByTranslate);var c=n(c,this.renderer),d=a.align,e=a.verticalAlign,f=(c.x||0)+(a.x||0),g=(c.y||0)+(a.y||0),h={};if(d==="right"||d==="center")f+=(c.width-(a.width||0))/{right:1,center:2}[d];
-h[b?"translateX":"x"]=u(f);if(e==="bottom"||e==="middle")g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1);h[b?"translateY":"y"]=u(g);this[this.placed?"animate":"attr"](h);this.placed=!0;this.alignAttr=h;return this},getBBox:function(){var a=this.bBox,b=this.renderer,c,d=this.rotation;c=this.element;var e=this.styles,f=d*ab;if(!a){if(c.namespaceURI===oa||b.forExport){try{a=c.getBBox?x({},c.getBBox()):{width:c.offsetWidth,height:c.offsetHeight}}catch(g){}if(!a||a.width<0)a={width:0,height:0}}else a=
-this.htmlGetBBox();if(b.isSVG){b=a.width;c=a.height;if(Ea&&e&&e.fontSize==="11px"&&c===22.700000762939453)a.height=c=14;if(d)a.width=M(c*Z(f))+M(b*W(f)),a.height=M(c*W(f))+M(b*Z(f))}this.bBox=a}return a},show:function(){return this.attr({visibility:"visible"})},hide:function(){return this.attr({visibility:"hidden"})},add:function(a){var b=this.renderer,c=a||b,d=c.element||b.box,e=d.childNodes,f=this.element,g=w(f,"zIndex"),h;if(a)this.parentGroup=a;this.parentInverted=a&&a.inverted;this.textStr!==
-void 0&&b.buildText(this);if(g)c.handleZ=!0,g=z(g);if(c.handleZ)for(c=0;c<e.length;c++)if(a=e[c],b=w(a,"zIndex"),a!==f&&(z(b)>g||!r(g)&&r(b))){d.insertBefore(f,a);h=!0;break}h||d.appendChild(f);this.added=!0;F(this,"add");return this},safeRemoveChild:function(a){var b=a.parentNode;b&&b.removeChild(a)},destroy:function(){var a=this,b=a.element||{},c=a.shadows,d,e;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=null;fb(a);if(a.clipPath)a.clipPath=a.clipPath.destroy();if(a.stops){for(e=0;e<a.stops.length;e++)a.stops[e]=
-a.stops[e].destroy();a.stops=null}a.safeRemoveChild(b);c&&o(c,function(b){a.safeRemoveChild(b)});ta(a.renderer.alignedObjects,a);for(d in a)delete a[d];return null},empty:function(){for(var a=this.element,b=a.childNodes,c=b.length;c--;)a.removeChild(b[c])},shadow:function(a,b,c){var d=[],e,f,g=this.element,h,i,j,k;if(a){i=n(a.width,3);j=(a.opacity||0.15)/i;k=this.parentInverted?"(-1,-1)":"("+n(a.offsetX,1)+", "+n(a.offsetY,1)+")";for(e=1;e<=i;e++){f=g.cloneNode(0);h=i*2+1-2*e;w(f,{isShadow:"true",
-stroke:a.color||"black","stroke-opacity":j*e,"stroke-width":h,transform:"translate"+k,fill:Q});if(c)w(f,"height",s(w(f,"height")-h,0)),f.cutHeight=h;b?b.element.appendChild(f):g.parentNode.insertBefore(f,g);d.push(f)}this.shadows=d}return this}};var sa=function(){this.init.apply(this,arguments)};sa.prototype={Element:ya,init:function(a,b,c,d){var e=location,f;f=this.createElement("svg").attr({xmlns:oa,version:"1.1"});a.appendChild(f.element);this.isSVG=!0;this.box=f.element;this.boxWrapper=f;this.alignedObjects=
-[];this.url=(cb||bb)&&C.getElementsByTagName("base").length?e.href.replace(/#.*?$/,"").replace(/([\('\)])/g,"\\$1").replace(/ /g,"%20"):"";this.defs=this.createElement("defs").add();this.forExport=d;this.gradients={};this.setSize(b,c,!1);var g;if(cb&&a.getBoundingClientRect)this.subPixelFix=b=function(){I(a,{left:0,top:0});g=a.getBoundingClientRect();I(a,{left:za(g.left)-g.left+"px",top:za(g.top)-g.top+"px"})},b(),J(L,"resize",b)},isHidden:function(){return!this.boxWrapper.getBBox().width},destroy:function(){var a=
-this.defs;this.box=null;this.boxWrapper=this.boxWrapper.destroy();Ga(this.gradients||{});this.gradients=null;if(a)this.defs=a.destroy();this.subPixelFix&&R(L,"resize",this.subPixelFix);return this.alignedObjects=null},createElement:function(a){var b=new this.Element;b.init(this,a);return b},draw:function(){},buildText:function(a){for(var b=a.element,c=n(a.textStr,"").toString().replace(/<(b|strong)>/g,'<span style="font-weight:bold">').replace(/<(i|em)>/g,'<span style="font-style:italic">').replace(/<a/g,
-"<span").replace(/<\/(b|strong|i|em|a)>/g,"</span>").split(/<br.*?>/g),d=b.childNodes,e=/style="([^"]+)"/,f=/href="([^"]+)"/,g=w(b,"x"),h=a.styles,i=h&&h.width&&z(h.width),j=h&&h.lineHeight,k,h=d.length,l=[];h--;)b.removeChild(d[h]);i&&!a.added&&this.box.appendChild(b);c[c.length-1]===""&&c.pop();o(c,function(c,d){var h,y=0,t,c=c.replace(/<span/g,"|||<span").replace(/<\/span>/g,"</span>|||");h=c.split("|||");o(h,function(c){if(c!==""||h.length===1){var m={},n=C.createElementNS(oa,"tspan"),o;e.test(c)&&
-(o=c.match(e)[1].replace(/(;| |^)color([ :])/,"$1fill$2"),w(n,"style",o));f.test(c)&&(w(n,"onclick",'location.href="'+c.match(f)[1]+'"'),I(n,{cursor:"pointer"}));c=(c.replace(/<(.|\n)*?>/g,"")||" ").replace(/&lt;/g,"<").replace(/&gt;/g,">");n.appendChild(C.createTextNode(c));y?m.dx=3:m.x=g;if(!y){if(d){!ca&&a.renderer.forExport&&I(n,{display:"block"});t=L.getComputedStyle&&z(L.getComputedStyle(k,null).getPropertyValue("line-height"));if(!t||isNaN(t)){var r;if(!(r=j))if(!(r=k.offsetHeight))l[d]=b.getBBox?
-b.getBBox().height:a.renderer.fontMetrics(b.style.fontSize).h,r=u(l[d]-(l[d-1]||0))||18;t=r}w(n,"dy",t)}k=n}w(n,m);b.appendChild(n);y++;if(i)for(var c=c.replace(/([^\^])-/g,"$1- ").split(" "),E=[];c.length||E.length;)delete a.bBox,r=a.getBBox().width,m=r>i,!m||c.length===1?(c=E,E=[],c.length&&(n=C.createElementNS(oa,"tspan"),w(n,{dy:j||16,x:g}),o&&w(n,"style",o),b.appendChild(n),r>i&&(i=r))):(n.removeChild(n.firstChild),E.unshift(c.pop())),c.length&&n.appendChild(C.createTextNode(c.join(" ").replace(/- /g,
-"-")))}})})},button:function(a,b,c,d,e,f,g){var h=this.label(a,b,c),i=0,j,k,l,m,q,a={x1:0,y1:0,x2:0,y2:1},e=B(ia(wb,1,"stroke","#999","fill",ia("linearGradient",a,"stops",[[0,"#FFF"],[1,"#DDD"]]),"r",3,"padding",3,"style",ia("color","black")),e);l=e.style;delete e.style;f=B(e,ia("stroke","#68A","fill",ia("linearGradient",a,"stops",[[0,"#FFF"],[1,"#ACF"]])),f);m=f.style;delete f.style;g=B(e,ia("stroke","#68A","fill",ia("linearGradient",a,"stops",[[0,"#9BD"],[1,"#CDF"]])),g);q=g.style;delete g.style;
-J(h.element,"mouseenter",function(){h.attr(f).css(m)});J(h.element,"mouseleave",function(){j=[e,f,g][i];k=[l,m,q][i];h.attr(j).css(k)});h.setState=function(a){(i=a)?a===2&&h.attr(g).css(q):h.attr(e).css(l)};return h.on("click",function(){d.call(h)}).attr(e).css(x({cursor:"default"},l))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]=u(a[1])-b%2/2);a[2]===a[5]&&(a[2]=a[5]=u(a[2])+b%2/2);return a},path:function(a){var b={fill:Q};Ia(a)?b.d=a:Y(a)&&x(b,a);return this.createElement("path").attr(b)},circle:function(a,
-b,c){a=Y(a)?a:{x:a,y:b,r:c};return this.createElement("circle").attr(a)},arc:function(a,b,c,d,e,f){if(Y(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;return this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d||0,start:e||0,end:f||0})},rect:function(a,b,c,d,e,f){e=Y(a)?a.r:e;e=this.createElement("rect").attr({rx:e,ry:e,fill:Q});return e.attr(Y(a)?a:e.crisp(f,a,b,s(c,0),s(d,0)))},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[n(c,!0)?"animate":
-"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g");return r(a)?b.attr({"class":"highcharts-"+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:Q};arguments.length>1&&x(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(u(b),u(c),d,e,
-f),i=/^url\((.*?)\)$/,j,k;h?(g=this.path(h),x(g,{symbolName:a,x:b,y:c,width:d,height:e}),f&&x(g,f)):i.test(a)&&(k=function(a,b){a.element&&(a.attr({width:b[0],height:b[1]}),a.alignByTranslate||a.translate(u((d-b[0])/2),u((e-b[1])/2)))},j=a.match(i)[1],a=Nb[j],g=this.image(j).attr({x:b,y:c}),a?k(g,a):(g.attr({width:0,height:0}),T("img",{onload:function(){k(g,Nb[j]=[this.width,this.height])},src:j})));return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return["M",a+c/2,b,"C",a+c+e,b,a+c+e,b+d,
-a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/2,b,"Z"]},square:function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c,b+d,a,b+d,"Z"]},triangle:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d/2,a+c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,e){var f=e.start,c=e.r||c||d,g=e.end-1.0E-6,d=e.innerR,h=e.open,i=W(f),j=Z(f),k=W(g),g=Z(g),e=e.end-f<Aa?0:1;return["M",a+c*i,b+c*j,"A",c,c,
-0,e,1,a+c*k,b+c*g,h?"M":"L",a+d*k,b+d*g,"A",d,d,0,e,0,a+d*i,b+d*j,h?"":"Z"]}},clipRect:function(a,b,c,d){var e="highcharts-"+tb++,f=this.createElement("clipPath").attr({id:e}).add(this.defs),a=this.rect(a,b,c,d,0).add(f);a.id=e;a.clipPath=f;return a},color:function(a,b,c){var d=this,e,f=/^rgba/,g,h,i,j,k,l,m,q=[];a&&a.linearGradient?g="linearGradient":a&&a.radialGradient&&(g="radialGradient");if(g){c=a[g];h=d.gradients;j=a.stops;b=b.radialReference;Ia(c)&&(a[g]=c={x1:c[0],y1:c[1],x2:c[2],y2:c[3],
-gradientUnits:"userSpaceOnUse"});g==="radialGradient"&&b&&!r(c.gradientUnits)&&x(c,{cx:b[0]-b[2]/2+c.cx*b[2],cy:b[1]-b[2]/2+c.cy*b[2],r:c.r*b[2],gradientUnits:"userSpaceOnUse"});for(m in c)m!=="id"&&q.push(m,c[m]);for(m in j)q.push(j[m]);q=q.join(",");h[q]?a=h[q].id:(c.id=a="highcharts-"+tb++,h[q]=i=d.createElement(g).attr(c).add(d.defs),i.stops=[],o(j,function(a){f.test(a[1])?(e=qa(a[1]),k=e.get("rgb"),l=e.get("a")):(k=a[1],l=1);a=d.createElement("stop").attr({offset:a[0],"stop-color":k,"stop-opacity":l}).add(i);
-i.stops.push(a)}));return"url("+d.url+"#"+a+")"}else return f.test(a)?(e=qa(a),w(b,c+"-opacity",e.get("a")),e.get("rgb")):(b.removeAttribute(c+"-opacity"),a)},text:function(a,b,c,d){var e=N.chart.style,f=V||!ca&&this.forExport;if(d&&!this.forExport)return this.html(a,b,c);b=u(n(b,0));c=u(n(c,0));a=this.createElement("text").attr({x:b,y:c,text:a}).css({fontFamily:e.fontFamily,fontSize:e.fontSize});f&&a.css({position:"absolute"});a.x=b;a.y=c;return a},html:function(a,b,c){var d=N.chart.style,e=this.createElement("span"),
-f=e.attrSetters,g=e.element,h=e.renderer;f.text=function(a){a!==g.innerHTML&&delete this.bBox;g.innerHTML=a;return!1};f.x=f.y=f.align=function(a,b){b==="align"&&(b="textAlign");e[b]=a;e.htmlUpdateTransform();return!1};e.attr({text:a,x:u(b),y:u(c)}).css({position:"absolute",whiteSpace:"nowrap",fontFamily:d.fontFamily,fontSize:d.fontSize});e.css=e.htmlCss;if(h.isSVG)e.add=function(a){var b,c=h.box.parentNode,d=[];if(a){if(b=a.div,!b){for(;a;)d.push(a),a=a.parentGroup;o(d.reverse(),function(a){var d;
-b=a.div=a.div||T(ga,{className:w(a.element,"class")},{position:"absolute",left:(a.translateX||0)+"px",top:(a.translateY||0)+"px"},b||c);d=b.style;x(a.attrSetters,{translateX:function(a){d.left=a+"px"},translateY:function(a){d.top=a+"px"},visibility:function(a,b){d[b]=a}})})}}else b=c;b.appendChild(g);e.added=!0;e.alignOnAdd&&e.htmlUpdateTransform();return e};return e},fontMetrics:function(a){var a=z(a||11),a=a<24?a+4:u(a*1.2),b=u(a*0.8);return{h:a,b:b}},label:function(a,b,c,d,e,f,g,h,i){function j(){var a;
-a=y.element.style;H=(s===void 0||yb===void 0||p.styles.textAlign)&&y.getBBox();p.width=(s||H.width||0)+2*v;p.height=(yb||H.height||0)+2*v;zb=v+q.fontMetrics(a&&a.fontSize).b;if(z){if(!n)a=h?-zb:0,p.box=n=d?q.symbol(d,-ra*v,a,p.width,p.height):q.rect(-ra*v,a,p.width,p.height,0,w[wb]),n.add(p);n.attr(B({width:p.width,height:p.height},w));w=null}}function k(){var a=p.styles,a=a&&a.textAlign,b=v*(1-ra),c;c=h?0:zb;if(r(s)&&(a==="center"||a==="right"))b+={center:0.5,right:1}[a]*(s-H.width);(b!==y.x||c!==
-y.y)&&y.attr({x:b,y:c});y.x=b;y.y=c}function l(a,b){n?n.attr(a,b):w[a]=b}function m(){y.add(p);p.attr({text:a,x:b,y:c});n&&r(e)&&p.attr({anchorX:e,anchorY:f})}var q=this,p=q.g(i),y=q.text("",0,0,g).attr({zIndex:1}),n,H,ra=0,v=3,s,yb,E,S,Qb=0,w={},zb,g=p.attrSetters,z;J(p,"add",m);g.width=function(a){s=a;return!1};g.height=function(a){yb=a;return!1};g.padding=function(a){r(a)&&a!==v&&(v=a,k());return!1};g.align=function(a){ra={left:0,center:0.5,right:1}[a];return!1};g.text=function(a,b){y.attr(b,a);
-j();k();return!1};g[wb]=function(a,b){z=!0;Qb=a%2/2;l(b,a);return!1};g.stroke=g.fill=g.r=function(a,b){b==="fill"&&(z=!0);l(b,a);return!1};g.anchorX=function(a,b){e=a;l(b,a+Qb-E);return!1};g.anchorY=function(a,b){f=a;l(b,a-S);return!1};g.x=function(a){p.x=a;a-=ra*((s||H.width)+v);E=u(a);p.attr("translateX",E);return!1};g.y=function(a){S=p.y=u(a);p.attr("translateY",a);return!1};var C=p.css;return x(p,{css:function(a){if(a){var b={},a=B({},a);o("fontSize,fontWeight,fontFamily,color,lineHeight,width".split(","),
-function(c){a[c]!==A&&(b[c]=a[c],delete a[c])});y.css(b)}return C.call(p,a)},getBBox:function(){return{width:H.width+2*v,height:H.height+2*v,x:H.x-v,y:H.y-v}},shadow:function(a){n&&n.shadow(a);return p},destroy:function(){R(p,"add",m);R(p.element,"mouseenter");R(p.element,"mouseleave");y&&(y=y.destroy());n&&(n=n.destroy());ya.prototype.destroy.call(p);p=q=j=k=l=m=null}})}};Sa=sa;var ha;if(!ca&&!V){ha={init:function(a,b){var c=["<",b,' filled="f" stroked="f"'],d=["position: ","absolute",";"];(b===
-"shape"||b===ga)&&d.push("left:0;top:0;width:1px;height:1px;");Ra&&d.push("visibility: ",b===ga?"hidden":"visible");c.push(' style="',d.join(""),'"/>');if(b)c=b===ga||b==="span"||b==="img"?c.join(""):a.prepVML(c),this.element=T(c);this.renderer=a;this.attrSetters={}},add:function(a){var b=this.renderer,c=this.element,d=b.box,d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);d.appendChild(c);this.added=!0;this.alignOnAdd&&!this.deferUpdateTransform&&this.updateTransform();F(this,"add");return this},
-updateTransform:ya.prototype.htmlUpdateTransform,attr:function(a,b){var c,d,e,f=this.element||{},g=f.style,h=f.nodeName,i=this.renderer,j=this.symbolName,k,l=this.shadows,m,q=this.attrSetters,p=this;ja(a)&&r(b)&&(c=a,a={},a[c]=b);if(ja(a))c=a,p=c==="strokeWidth"||c==="stroke-width"?this.strokeweight:this[c];else for(c in a)if(d=a[c],m=!1,e=q[c]&&q[c].call(this,d,c),e!==!1&&d!==null){e!==A&&(d=e);if(j&&/^(x|y|r|start|end|width|height|innerR|anchorX|anchorY)/.test(c))k||(this.symbolAttr(a),k=!0),m=
-!0;else if(c==="d"){d=d||[];this.d=d.join(" ");e=d.length;for(m=[];e--;)m[e]=Da(d[e])?u(d[e]*10)-5:d[e]==="Z"?"x":d[e];d=m.join(" ")||"x";f.path=d;if(l)for(e=l.length;e--;)l[e].path=l[e].cutOff?this.cutOffPath(d,l[e].cutOff):d;m=!0}else if(c==="visibility"){if(l)for(e=l.length;e--;)l[e].style[c]=d;h==="DIV"&&(d=d==="hidden"?"-999em":0,c="top");g[c]=d;m=!0}else if(c==="zIndex")d&&(g[c]=d),m=!0;else if(c==="width"||c==="height")d=s(0,d),this[c]=d,this.updateClipping?(this[c]=d,this.updateClipping()):
-g[c]=d,m=!0;else if(c==="x"||c==="y")this[c]=d,g[{x:"left",y:"top"}[c]]=d;else if(c==="class")f.className=d;else if(c==="stroke")d=i.color(d,f,c),c="strokecolor";else if(c==="stroke-width"||c==="strokeWidth")f.stroked=d?!0:!1,c="strokeweight",this[c]=d,Da(d)&&(d+="px");else if(c==="dashstyle")(f.getElementsByTagName("stroke")[0]||T(i.prepVML(["<stroke/>"]),null,null,f))[c]=d||"solid",this.dashstyle=d,m=!0;else if(c==="fill")if(h==="SPAN")g.color=d;else{if(h!=="IMG")f.filled=d!==Q?!0:!1,d=i.color(d,
-f,c,this),c="fillcolor"}else if(h==="shape"&&c==="rotation")this[c]=d,f.style.left=-u(Z(d*ab)+1)+"px",f.style.top=u(W(d*ab))+"px";else if(c==="translateX"||c==="translateY"||c==="rotation")this[c]=d,this.updateTransform(),m=!0;else if(c==="text")this.bBox=null,f.innerHTML=d,m=!0;m||(Ra?f[c]=d:w(f,c,d))}return p},clip:function(a){var b=this,c,d=b.element,e=d.parentNode;a?(c=a.members,ta(c,b),c.push(b),b.destroyClip=function(){ta(c,b)},e&&e.className==="highcharts-tracker"&&!Ra&&I(d,{visibility:"hidden"}),
-a=a.getCSS(b)):(b.destroyClip&&b.destroyClip(),a={clip:Ra?"inherit":"rect(auto)"});return b.css(a)},css:ya.prototype.htmlCss,safeRemoveChild:function(a){a.parentNode&&Na(a)},destroy:function(){this.destroyClip&&this.destroyClip();return ya.prototype.destroy.apply(this)},empty:function(){for(var a=this.element.childNodes,b=a.length,c;b--;)c=a[b],c.parentNode.removeChild(c)},on:function(a,b){this.element["on"+a]=function(){var a=L.event;a.target=a.srcElement;b(a)};return this},cutOffPath:function(a,
-b){var c,a=a.split(/[ ,]/);c=a.length;if(c===9||c===11)a[c-4]=a[c-2]=z(a[c-2])-10*b;return a.join(" ")},shadow:function(a,b,c){var d=[],e,f=this.element,g=this.renderer,h,i=f.style,j,k=f.path,l,m,q,p;k&&typeof k.value!=="string"&&(k="x");m=k;if(a){q=n(a.width,3);p=(a.opacity||0.15)/q;for(e=1;e<=3;e++){l=q*2+1-2*e;c&&(m=this.cutOffPath(k.value,l+0.5));j=['<shape isShadow="true" strokeweight="',l,'" filled="false" path="',m,'" coordsize="10 10" style="',f.style.cssText,'" />'];h=T(g.prepVML(j),null,
-{left:z(i.left)+n(a.offsetX,1),top:z(i.top)+n(a.offsetY,1)});if(c)h.cutOff=l+1;j=['<stroke color="',a.color||"black",'" opacity="',p*e,'"/>'];T(g.prepVML(j),null,null,h);b?b.element.appendChild(h):f.parentNode.insertBefore(h,f);d.push(h)}this.shadows=d}return this}};ha=ba(ya,ha);var fa={Element:ha,isIE8:na.indexOf("MSIE 8.0")>-1,init:function(a,b,c){var d,e;this.alignedObjects=[];d=this.createElement(ga);e=d.element;e.style.position="relative";a.appendChild(d.element);this.box=e;this.boxWrapper=d;
-this.setSize(b,c,!1);if(!C.namespaces.hcv)C.namespaces.add("hcv","urn:schemas-microsoft-com:vml"),C.createStyleSheet().cssText="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "},isHidden:function(){return!this.box.offsetWidth},clipRect:function(a,b,c,d){var e=this.createElement(),f=Y(a);return x(e,{members:[],left:f?a.x:a,top:f?a.y:b,width:f?a.width:c,height:f?a.height:d,getCSS:function(a){var b=a.inverted,c=this.top,d=this.left,e=d+this.width,
-f=c+this.height,c={clip:"rect("+u(b?d:c)+"px,"+u(b?f:e)+"px,"+u(b?e:f)+"px,"+u(b?c:d)+"px)"};!b&&Ra&&a.element.nodeName!=="IMG"&&x(c,{width:e+"px",height:f+"px"});return c},updateClipping:function(){o(e.members,function(a){a.css(e.getCSS(a))})}})},color:function(a,b,c,d){var e=this,f,g=/^rgba/,h,i,j=Q;a&&a.linearGradient?i="gradient":a&&a.radialGradient&&(i="pattern");if(i){var k,l,m=a.linearGradient||a.radialGradient,q,p,n,t,H,r="",a=a.stops,v,s=[],u=function(){h=['<fill colors="'+s.join(",")+'" opacity="',
-n,'" o:opacity2="',p,'" type="',i,'" ',r,'focus="100%" method="any" />'];T(e.prepVML(h),null,null,b)};q=a[0];v=a[a.length-1];q[0]>0&&a.unshift([0,q[1]]);v[0]<1&&a.push([1,v[1]]);o(a,function(a,b){g.test(a[1])?(f=qa(a[1]),k=f.get("rgb"),l=f.get("a")):(k=a[1],l=1);s.push(a[0]*100+"% "+k);b?(n=l,t=k):(p=l,H=k)});if(c==="fill")if(i==="gradient")c=m.x1||m[0]||0,a=m.y1||m[1]||0,q=m.x2||m[2]||0,m=m.y2||m[3]||0,r='angle="'+(90-K.atan((m-a)/(q-c))*180/Aa)+'"',u();else{var j=m.r,E=j*2,S=j*2,x=m.cx,A=m.cy,w=
-b.radialReference,z,j=function(){w&&(z=d.getBBox(),x+=(w[0]-z.x)/z.width-0.5,A+=(w[1]-z.y)/z.height-0.5,E*=w[2]/z.width,S*=w[2]/z.height);r='src="'+N.global.VMLRadialGradientURL+'" size="'+E+","+S+'" origin="0.5,0.5" position="'+x+","+A+'" color2="'+H+'" ';u()};d.added?j():J(d,"add",j);j=t}else j=k}else if(g.test(a)&&b.tagName!=="IMG")f=qa(a),h=["<",c,' opacity="',f.get("a"),'"/>'],T(this.prepVML(h),null,null,b),j=f.get("rgb");else{j=b.getElementsByTagName(c);if(j.length)j[0].opacity=1;j=a}return j},
-prepVML:function(a){var b=this.isIE8,a=a.join("");b?(a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'),a=a.indexOf('style="')===-1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'):a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')):a=a.replace("<","<hcv:");return a},text:sa.prototype.html,path:function(a){var b={coordsize:"10 10"};Ia(a)?b.d=a:Y(a)&&x(b,a);return this.createElement("shape").attr(b)},circle:function(a,b,c){return this.symbol("circle").attr({x:a-
-c,y:b-c,width:2*c,height:2*c})},g:function(a){var b;a&&(b={className:"highcharts-"+a,"class":"highcharts-"+a});return this.createElement(ga).attr(b)},image:function(a,b,c,d,e){var f=this.createElement("img").attr({src:a});arguments.length>1&&f.attr({x:b,y:c,width:d,height:e});return f},rect:function(a,b,c,d,e,f){if(Y(a))b=a.y,c=a.width,d=a.height,f=a.strokeWidth,a=a.x;var g=this.symbol("rect");g.r=e;return g.attr(g.crisp(f,a,b,s(c,0),s(d,0)))},invertChild:function(a,b){var c=b.style;I(a,{flip:"x",
-left:z(c.width)-1,top:z(c.height)-1,rotation:-90})},symbols:{arc:function(a,b,c,d,e){var f=e.start,g=e.end,h=e.r||c||d,c=W(f),d=Z(f),i=W(g),j=Z(g),k=e.innerR,l=0.08/h,m=k&&0.1/k||0;if(g-f===0)return["x"];else 2*Aa-g+f<l?i=-l:g-f<m&&(i=W(f+m));f=["wa",a-h,b-h,a+h,b+h,a+h*c,b+h*d,a+h*i,b+h*j];e.open&&!k&&f.push("e","M",a,b);f.push("at",a-k,b-k,a+k,b+k,a+k*i,b+k*j,a+k*c,b+k*d,"x","e");return f},circle:function(a,b,c,d){return["wa",a,b,a+c,b+d,a+c,b+d/2,a+c,b+d/2,"e"]},rect:function(a,b,c,d,e){var f=
-a+c,g=b+d,h;!r(e)||!e.r?f=sa.prototype.symbols.square.apply(0,arguments):(h=O(e.r,c,d),f=["M",a+h,b,"L",f-h,b,"wa",f-2*h,b,f,b+2*h,f-h,b,f,b+h,"L",f,g-h,"wa",f-2*h,g-2*h,f,g,f,g-h,f-h,g,"L",a+h,g,"wa",a,g-2*h,a+2*h,g,a+h,g,a,g-h,"L",a,b+h,"wa",a,b,a+2*h,b+2*h,a,b+h,a+h,b,"x","e"]);return f}}};ha=function(){this.init.apply(this,arguments)};ha.prototype=B(sa.prototype,fa);Sa=ha}var gb,Rb;if(V)gb=function(){oa="http://www.w3.org/1999/xhtml"},gb.prototype.symbols={},Rb=function(){function a(){var a=b.length,
-d;for(d=0;d<a;d++)b[d]();b=[]}var b=[];return{push:function(c,d){b.length===0&&Tb(d,a);b.push(c)}}}();Sa=ha||gb||sa;Qa.prototype={addLabel:function(){var a=this.axis,b=a.options,c=a.chart,d=a.horiz,e=a.categories,f=this.pos,g=b.labels,h=a.tickPositions,d=e&&d&&e.length&&!g.step&&!g.staggerLines&&!g.rotation&&c.plotWidth/h.length||!d&&c.plotWidth/2,i=f===h[0],j=f===h[h.length-1],k=e&&r(e[f])?e[f]:f,e=this.label,h=h.info,l;a.isDatetimeAxis&&h&&(l=b.dateTimeLabelFormats[h.higherRanks[f]||h.unitName]);
-this.isFirst=i;this.isLast=j;b=a.labelFormatter.call({axis:a,chart:c,isFirst:i,isLast:j,dateTimeLabelFormat:l,value:a.isLog?da(aa(k)):k});f=d&&{width:s(1,u(d-2*(g.padding||10)))+"px"};f=x(f,g.style);if(r(e))e&&e.attr({text:b}).css(f);else{d={align:g.align};if(Da(g.rotation))d.rotation=g.rotation;this.label=r(b)&&g.enabled?c.renderer.text(b,0,0,g.useHTML).attr(d).css(f).add(a.labelGroup):null}},getLabelSize:function(){var a=this.label,b=this.axis;return a?(this.labelBBox=a.getBBox())[b.horiz?"height":
-"width"]:0},getLabelSides:function(){var a=this.axis.options.labels,b=this.labelBBox.width,a=b*{left:0,center:0.5,right:1}[a.align]-a.x;return[-a,b-a]},handleOverflow:function(a,b){var c=!0,d=this.axis,e=d.chart,f=this.isFirst,g=this.isLast,h=b.x,i=d.reversed,j=d.tickPositions;if(f||g){var k=this.getLabelSides(),l=k[0],k=k[1],e=e.plotLeft,m=e+d.len,j=(d=d.ticks[j[a+(f?1:-1)]])&&d.label.xy&&d.label.xy.x+d.getLabelSides()[f?0:1];f&&!i||g&&i?h+l<e&&(h=e-l,d&&h+k>j&&(c=!1)):h+k>m&&(h=m-k,d&&h+l<j&&(c=
-!1));b.x=h}return c},getPosition:function(a,b,c,d){var e=this.axis,f=e.chart,g=d&&f.oldChartHeight||f.chartHeight;return{x:a?e.translate(b+c,null,null,d)+e.transB:e.left+e.offset+(e.opposite?(d&&f.oldChartWidth||f.chartWidth)-e.right-e.left:0),y:a?g-e.bottom+e.offset-(e.opposite?e.height:0):g-e.translate(b+c,null,null,d)-e.transB}},getLabelPosition:function(a,b,c,d,e,f,g,h){var i=this.axis,j=i.transA,k=i.reversed,i=i.staggerLines,a=a+e.x-(f&&d?f*j*(k?-1:1):0),b=b+e.y-(f&&!d?f*j*(k?1:-1):0);r(e.y)||
-(b+=z(c.styles.lineHeight)*0.9-c.getBBox().height/2);i&&(b+=g/(h||1)%i*16);return{x:a,y:b}},getMarkPath:function(a,b,c,d,e,f){return f.crispLine(["M",a,b,"L",a+(e?0:-c),b+(e?c:0)],d)},render:function(a,b){var c=this.axis,d=c.options,e=c.chart.renderer,f=c.horiz,g=this.type,h=this.label,i=this.pos,j=d.labels,k=this.gridLine,l=g?g+"Grid":"grid",m=g?g+"Tick":"tick",q=d[l+"LineWidth"],p=d[l+"LineColor"],y=d[l+"LineDashStyle"],t=d[m+"Length"],l=d[m+"Width"]||0,o=d[m+"Color"],r=d[m+"Position"],m=this.mark,
-v=j.step,s=!0,u=c.tickmarkOffset,E=this.getPosition(f,i,u,b),S=E.x,E=E.y,x=c.staggerLines;if(q){i=c.getPlotLinePath(i+u,q,b);if(k===A){k={stroke:p,"stroke-width":q};if(y)k.dashstyle=y;if(!g)k.zIndex=1;this.gridLine=k=q?e.path(i).attr(k).add(c.gridGroup):null}if(!b&&k&&i)k[this.isNew?"attr":"animate"]({d:i})}if(l&&t)r==="inside"&&(t=-t),c.opposite&&(t=-t),g=this.getMarkPath(S,E,t,l,f,e),m?m.animate({d:g}):this.mark=e.path(g).attr({stroke:o,"stroke-width":l}).add(c.axisGroup);if(h&&!isNaN(S))h.xy=E=
-this.getLabelPosition(S,E,h,f,j,u,a,v),this.isFirst&&!n(d.showFirstLabel,1)||this.isLast&&!n(d.showLastLabel,1)?s=!1:!x&&f&&j.overflow==="justify"&&!this.handleOverflow(a,E)&&(s=!1),v&&a%v&&(s=!1),s?(h[this.isNew?"attr":"animate"](E),this.isNew=!1):h.attr("y",-9999)},destroy:function(){Ga(this,this.axis)}};nb.prototype={render:function(){var a=this,b=a.axis,c=b.horiz,d=(b.pointRange||0)/2,e=a.options,f=e.label,g=a.label,h=e.width,i=e.to,j=e.from,k=r(j)&&r(i),l=e.value,m=e.dashStyle,q=a.svgElem,p=
-[],y,t=e.color,o=e.zIndex,u=e.events,v=b.chart.renderer;b.isLog&&(j=ka(j),i=ka(i),l=ka(l));if(h){if(p=b.getPlotLinePath(l,h),d={stroke:t,"stroke-width":h},m)d.dashstyle=m}else if(k){if(j=s(j,b.min-d),i=O(i,b.max+d),p=b.getPlotBandPath(j,i,e),d={fill:t},e.borderWidth)d.stroke=e.borderColor,d["stroke-width"]=e.borderWidth}else return;if(r(o))d.zIndex=o;if(q)p?q.animate({d:p},null,q.onGetPath):(q.hide(),q.onGetPath=function(){q.show()});else if(p&&p.length&&(a.svgElem=q=v.path(p).attr(d).add(),u))for(y in e=
-function(b){q.on(b,function(c){u[b].apply(a,[c])})},u)e(y);if(f&&r(f.text)&&p&&p.length&&b.width>0&&b.height>0){f=B({align:c&&k&&"center",x:c?!k&&4:10,verticalAlign:!c&&k&&"middle",y:c?k?16:10:k?6:-4,rotation:c&&!k&&90},f);if(!g)a.label=g=v.text(f.text,0,0).attr({align:f.textAlign||f.align,rotation:f.rotation,zIndex:o}).css(f.style).add();b=[p[1],p[4],n(p[6],p[1])];p=[p[2],p[5],n(p[7],p[2])];c=Fa(b);k=Fa(p);g.align(f,!1,{x:c,y:k,width:wa(b)-c,height:wa(p)-k});g.show()}else g&&g.hide();return a},destroy:function(){ta(this.axis.plotLinesAndBands,
-this);Ga(this,this.axis)}};Kb.prototype={destroy:function(){Ga(this,this.axis)},setTotal:function(a){this.cum=this.total=a},render:function(a){var b=this.options.formatter.call(this);this.label?this.label.attr({text:b,visibility:"hidden"}):this.label=this.axis.chart.renderer.text(b,0,0).css(this.options.style).attr({align:this.textAlign,rotation:this.options.rotation,visibility:"hidden"}).add(a)},setOffset:function(a,b){var c=this.axis,d=c.chart,e=d.inverted,f=this.isNegative,g=c.translate(this.percent?
-100:this.total,0,0,0,1),c=c.translate(0),c=M(g-c),h=d.xAxis[0].translate(this.x)+a,i=d.plotHeight,f={x:e?f?g:g-c:h,y:e?i-h-b:f?i-g-c:i-g,width:e?c:b,height:e?b:c};if(e=this.label)e.align(this.alignOptions,null,f),f=e.alignAttr,e.attr({visibility:this.options.crop===!1||d.isInsidePlot(f.x,f.y)?ca?"inherit":"visible":"hidden"})}};ob.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},
-endOnTick:!1,gridLineColor:"#C0C0C0",labels:G,lineColor:"#C0D0E0",lineWidth:1,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:5,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#6D869F",fontWeight:"bold"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1,
-tickPixelInterval:72,showLastLabel:!0,labels:{align:"right",x:-8,y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:!0,tickWidth:0,title:{rotation:270,text:"Y-values"},stackLabels:{enabled:!1,formatter:function(){return this.total},style:G.style}},defaultLeftAxisOptions:{labels:{align:"right",x:-8,y:null},title:{rotation:270}},defaultRightAxisOptions:{labels:{align:"left",x:8,y:null},title:{rotation:90}},defaultBottomAxisOptions:{labels:{align:"center",x:0,y:14},title:{rotation:0}},defaultTopAxisOptions:{labels:{align:"center",
-x:0,y:-5},title:{rotation:0}},init:function(a,b){var c=b.isX;this.horiz=a.inverted?!c:c;this.xOrY=(this.isXAxis=c)?"x":"y";this.opposite=b.opposite;this.side=this.horiz?this.opposite?0:2:this.opposite?1:3;this.setOptions(b);var d=this.options,e=d.type,f=e==="datetime";this.labelFormatter=d.labels.formatter||this.defaultLabelFormatter;this.staggerLines=this.horiz&&d.labels.staggerLines;this.userOptions=b;this.minPixelPadding=0;this.chart=a;this.reversed=d.reversed;this.categories=d.categories;this.isLog=
-e==="logarithmic";this.isLinked=r(d.linkedTo);this.isDatetimeAxis=f;this.tickmarkOffset=d.categories&&d.tickmarkPlacement==="between"?0.5:0;this.ticks={};this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=d.minRange||d.maxZoom;this.range=d.range;this.offset=d.offset||0;this.stacks={};this.min=this.max=null;var g,d=this.options.events;a.axes.push(this);a[c?"xAxis":"yAxis"].push(this);this.series=[];if(a.inverted&&c&&this.reversed===A)this.reversed=
-!0;this.removePlotLine=this.removePlotBand=this.removePlotBandOrLine;this.addPlotLine=this.addPlotBand=this.addPlotBandOrLine;for(g in d)J(this,g,d[g]);if(this.isLog)this.val2lin=ka,this.lin2val=aa},setOptions:function(a){this.options=B(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],B(N[this.isXAxis?"xAxis":"yAxis"],a))},defaultLabelFormatter:function(){var a=
-this.axis,b=this.value,c=this.dateTimeLabelFormat,d=N.lang.numericSymbols,e=d&&d.length,f,g=a.isLog?b:a.tickInterval;if(a.categories)f=b;else if(c)f=db(c,b);else if(e&&g>=1E3)for(;e--&&f===A;)a=Math.pow(1E3,e+1),g>=a&&d[e]!==null&&(f=Ja(b/a,-1)+d[e]);f===A&&(f=b>=1E3?Ja(b,0):Ja(b,-1));return f},getSeriesExtremes:function(){var a=this,b=a.chart,c=a.stacks,d=[],e=[],f;a.hasVisibleSeries=!1;a.dataMin=a.dataMax=null;o(a.series,function(g){if(g.visible||!b.options.chart.ignoreHiddenSeries){var h=g.options,
-i,j,k,l,m,q,p,y,t,o=h.threshold,u,v=[],x=0;a.hasVisibleSeries=!0;if(a.isLog&&o<=0)o=h.threshold=null;if(a.isXAxis){if(h=g.xData,h.length)a.dataMin=O(n(a.dataMin,h[0]),Fa(h)),a.dataMax=s(n(a.dataMax,h[0]),wa(h))}else{var z,E,S,w=g.cropped,B=g.xAxis.getExtremes(),C=!!g.modifyValue;i=h.stacking;a.usePercentage=i==="percent";if(i)m=h.stack,l=g.type+n(m,""),q="-"+l,g.stackKey=l,j=d[l]||[],d[l]=j,k=e[q]||[],e[q]=k;if(a.usePercentage)a.dataMin=0,a.dataMax=99;h=g.processedXData;p=g.processedYData;u=p.length;
-for(f=0;f<u;f++)if(y=h[f],t=p[f],i&&(E=(z=t<o)?k:j,S=z?q:l,r(E[y])?(E[y]=da(E[y]+t),t=[t,E[y]]):E[y]=t,c[S]||(c[S]={}),c[S][y]||(c[S][y]=new Kb(a,a.options.stackLabels,z,y,m,i)),c[S][y].setTotal(E[y])),t!==null&&t!==A&&(C&&(t=g.modifyValue(t)),w||(h[f+1]||y)>=B.min&&(h[f-1]||y)<=B.max))if(y=t.length)for(;y--;)t[y]!==null&&(v[x++]=t[y]);else v[x++]=t;if(!a.usePercentage&&v.length)a.dataMin=O(n(a.dataMin,v[0]),Fa(v)),a.dataMax=s(n(a.dataMax,v[0]),wa(v));if(r(o))if(a.dataMin>=o)a.dataMin=o,a.ignoreMinPadding=
-!0;else if(a.dataMax<o)a.dataMax=o,a.ignoreMaxPadding=!0}}})},translate:function(a,b,c,d,e,f){var g=this.len,h=1,i=0,j=d?this.oldTransA:this.transA,d=d?this.oldMin:this.min,e=this.options.ordinal||this.isLog&&e;if(!j)j=this.transA;c&&(h*=-1,i=g);this.reversed&&(h*=-1,i-=h*g);b?(this.reversed&&(a=g-a),a=a/j+d,e&&(a=this.lin2val(a))):(e&&(a=this.val2lin(a)),a=h*(a-d)*j+i+h*this.minPixelPadding+(f?j*this.pointRange/2:0));return a},getPlotLinePath:function(a,b,c){var d=this.chart,e=this.left,f=this.top,
-g,h,i,a=this.translate(a,null,null,c),j=c&&d.oldChartHeight||d.chartHeight,k=c&&d.oldChartWidth||d.chartWidth,l;g=this.transB;c=h=u(a+g);g=i=u(j-a-g);if(isNaN(a))l=!0;else if(this.horiz){if(g=f,i=j-this.bottom,c<e||c>e+this.width)l=!0}else if(c=e,h=k-this.right,g<f||g>f+this.height)l=!0;return l?null:d.renderer.crispLine(["M",c,g,"L",h,i],b||0)},getPlotBandPath:function(a,b){var c=this.getPlotLinePath(b),d=this.getPlotLinePath(a);d&&c?d.push(c[4],c[5],c[1],c[2]):d=null;return d},getLinearTickPositions:function(a,
-b,c){for(var d,b=da(U(b/a)*a),c=da(za(c/a)*a),e=[];b<=c;){e.push(b);b=da(b+a);if(b===d)break;d=b}return e},getLogTickPositions:function(a,b,c,d){var e=this.options,f=this.len,g=[];if(!d)this._minorAutoInterval=null;if(a>=0.5)a=u(a),g=this.getLinearTickPositions(a,b,c);else if(a>=0.08)for(var f=U(b),h,i,j,k,l,e=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];f<c+1&&!l;f++){i=e.length;for(h=0;h<i&&!l;h++)j=ka(aa(f)*e[h]),j>b&&g.push(k),k>c&&(l=!0),k=j}else if(b=aa(b),c=aa(c),a=e[d?"minorTickInterval":
-"tickInterval"],a=n(a==="auto"?null:a,this._minorAutoInterval,(c-b)*(e.tickPixelInterval/(d?5:1))/((d?f/this.tickPositions.length:f)||1)),a=hb(a,null,K.pow(10,U(K.log(a)/K.LN10))),g=Ta(this.getLinearTickPositions(a,b,c),ka),!d)this._minorAutoInterval=a/5;if(!d)this.tickInterval=a;return g},getMinorTickPositions:function(){var a=this.options,b=this.tickPositions,c=this.minorTickInterval,d=[],e;if(this.isLog){e=b.length;for(a=1;a<e;a++)d=d.concat(this.getLogTickPositions(c,b[a-1],b[a],!0))}else if(this.isDatetimeAxis&&
-a.minorTickInterval==="auto")d=d.concat(Cb(Ab(c),this.min,this.max,a.startOfWeek));else for(b=this.min+(b[0]-this.min)%c;b<=this.max;b+=c)d.push(b);return d},adjustForMinRange:function(){var a=this.options,b=this.min,c=this.max,d,e=this.dataMax-this.dataMin>=this.minRange,f,g,h,i,j;if(this.isXAxis&&this.minRange===A&&!this.isLog)r(a.min)||r(a.max)?this.minRange=null:(o(this.series,function(a){i=a.xData;for(g=j=a.xIncrement?1:i.length-1;g>0;g--)if(h=i[g]-i[g-1],f===A||h<f)f=h}),this.minRange=O(f*5,
-this.dataMax-this.dataMin));if(c-b<this.minRange){var k=this.minRange;d=(k-c+b)/2;d=[b-d,n(a.min,b-d)];if(e)d[2]=this.dataMin;b=wa(d);c=[b+k,n(a.max,b+k)];if(e)c[2]=this.dataMax;c=Fa(c);c-b<k&&(d[0]=c-k,d[1]=n(a.min,c-k),b=wa(d))}this.min=b;this.max=c},setAxisTranslation:function(){var a=this.max-this.min,b=0,c,d=0,e=0,f=this.linkedParent,g=this.transA;if(this.isXAxis)f?(d=f.minPointOffset,e=f.pointRangePadding):o(this.series,function(a){var f=a.pointRange,g=a.options.pointPlacement,k=a.closestPointRange;
-b=s(b,f);d=s(d,g?0:f/2);e=s(e,g==="on"?0:f);!a.noSharedTooltip&&r(k)&&(c=r(c)?O(c,k):k)}),this.minPointOffset=d,this.pointRangePadding=e,this.pointRange=b,this.closestPointRange=c;this.oldTransA=g;this.translationSlope=this.transA=g=this.len/(a+e||1);this.transB=this.horiz?this.left:this.bottom;this.minPixelPadding=g*d},setTickPositions:function(a){var b=this,c=b.chart,d=b.options,e=b.isLog,f=b.isDatetimeAxis,g=b.isXAxis,h=b.isLinked,i=b.options.tickPositioner,j=d.maxPadding,k=d.minPadding,l=d.tickInterval,
-m=d.minTickInterval,q=d.tickPixelInterval,p=b.categories;h?(b.linkedParent=c[g?"xAxis":"yAxis"][d.linkedTo],c=b.linkedParent.getExtremes(),b.min=n(c.min,c.dataMin),b.max=n(c.max,c.dataMax),d.type!==b.linkedParent.options.type&&Oa(11,1)):(b.min=n(b.userMin,d.min,b.dataMin),b.max=n(b.userMax,d.max,b.dataMax));if(e)!a&&O(b.min,n(b.dataMin,b.min))<=0&&Oa(10,1),b.min=da(ka(b.min)),b.max=da(ka(b.max));if(b.range&&(b.userMin=b.min=s(b.min,b.max-b.range),b.userMax=b.max,a))b.range=null;b.adjustForMinRange();
-if(!p&&!b.usePercentage&&!h&&r(b.min)&&r(b.max)&&(c=b.max-b.min)){if(!r(d.min)&&!r(b.userMin)&&k&&(b.dataMin<0||!b.ignoreMinPadding))b.min-=c*k;if(!r(d.max)&&!r(b.userMax)&&j&&(b.dataMax>0||!b.ignoreMaxPadding))b.max+=c*j}b.tickInterval=b.min===b.max||b.min===void 0||b.max===void 0?1:h&&!l&&q===b.linkedParent.options.tickPixelInterval?b.linkedParent.tickInterval:n(l,p?1:(b.max-b.min)*q/(b.len||1));g&&!a&&o(b.series,function(a){a.processData(b.min!==b.oldMin||b.max!==b.oldMax)});b.setAxisTranslation(a);
-b.beforeSetTickPositions&&b.beforeSetTickPositions();if(b.postProcessTickInterval)b.tickInterval=b.postProcessTickInterval(b.tickInterval);if(!l&&b.tickInterval<m)b.tickInterval=m;if(!f&&!e&&(a=K.pow(10,U(K.log(b.tickInterval)/K.LN10)),!l))b.tickInterval=hb(b.tickInterval,null,a,d);b.minorTickInterval=d.minorTickInterval==="auto"&&b.tickInterval?b.tickInterval/5:d.minorTickInterval;b.tickPositions=i=d.tickPositions||i&&i.apply(b,[b.min,b.max]);if(!i)i=f?(b.getNonLinearTimeTicks||Cb)(Ab(b.tickInterval,
-d.units),b.min,b.max,d.startOfWeek,b.ordinalPositions,b.closestPointRange,!0):e?b.getLogTickPositions(b.tickInterval,b.min,b.max):b.getLinearTickPositions(b.tickInterval,b.min,b.max),b.tickPositions=i;if(!h)e=i[0],f=i[i.length-1],h=b.minPointOffset||0,d.startOnTick?b.min=e:b.min-h>e&&i.shift(),d.endOnTick?b.max=f:b.max+h<f&&i.pop(),i.length===1&&(b.min-=1.0E-9,b.max+=1.0E-9)},setMaxTicks:function(){var a=this.chart,b=a.maxTicks,c=this.tickPositions,d=this.xOrY;b||(b={x:0,y:0});if(!this.isLinked&&
-!this.isDatetimeAxis&&c.length>b[d]&&this.options.alignTicks!==!1)b[d]=c.length;a.maxTicks=b},adjustTickAmount:function(){var a=this.xOrY,b=this.tickPositions,c=this.chart.maxTicks;if(c&&c[a]&&!this.isDatetimeAxis&&!this.categories&&!this.isLinked&&this.options.alignTicks!==!1){var d=this.tickAmount,e=b.length;this.tickAmount=a=c[a];if(e<a){for(;b.length<a;)b.push(da(b[b.length-1]+this.tickInterval));this.transA*=(e-1)/(a-1);this.max=b[b.length-1]}if(r(d)&&a!==d)this.isDirty=!0}},setScale:function(){var a=
-this.stacks,b,c,d,e;this.oldMin=this.min;this.oldMax=this.max;this.oldAxisLength=this.len;this.setAxisSize();e=this.len!==this.oldAxisLength;o(this.series,function(a){if(a.isDirtyData||a.isDirty||a.xAxis.isDirty)d=!0});if(e||d||this.isLinked||this.userMin!==this.oldUserMin||this.userMax!==this.oldUserMax)if(this.getSeriesExtremes(),this.setTickPositions(),this.oldUserMin=this.userMin,this.oldUserMax=this.userMax,!this.isDirty)this.isDirty=e||this.min!==this.oldMin||this.max!==this.oldMax;if(!this.isXAxis)for(b in a)for(c in a[b])a[b][c].cum=
-a[b][c].total;this.setMaxTicks()},setExtremes:function(a,b,c,d,e){var f=this,g=f.chart,c=n(c,!0),e=x(e,{min:a,max:b});F(f,"setExtremes",e,function(){f.userMin=a;f.userMax=b;f.isDirtyExtremes=!0;c&&g.redraw(d)})},zoom:function(a,b){this.setExtremes(a,b,!1,A,{trigger:"zoom"});return!0},setAxisSize:function(){var a=this.chart,b=this.options,c=b.offsetLeft||0,d=b.offsetRight||0;this.left=n(b.left,a.plotLeft+c);this.top=n(b.top,a.plotTop);this.width=n(b.width,a.plotWidth-c+d);this.height=n(b.height,a.plotHeight);
-this.bottom=a.chartHeight-this.height-this.top;this.right=a.chartWidth-this.width-this.left;this.len=s(this.horiz?this.width:this.height,0)},getExtremes:function(){var a=this.isLog;return{min:a?da(aa(this.min)):this.min,max:a?da(aa(this.max)):this.max,dataMin:this.dataMin,dataMax:this.dataMax,userMin:this.userMin,userMax:this.userMax}},getThreshold:function(a){var b=this.isLog,c=b?aa(this.min):this.min,b=b?aa(this.max):this.max;c>a||a===null?a=c:b<a&&(a=b);return this.translate(a,0,1,0,1)},addPlotBandOrLine:function(a){a=
-(new nb(this,a)).render();this.plotLinesAndBands.push(a);return a},getOffset:function(){var a=this,b=a.chart,c=b.renderer,d=a.options,e=a.tickPositions,f=a.ticks,g=a.horiz,h=a.side,i,j=0,k,l=0,m=d.title,q=d.labels,p=0,y=b.axisOffset,t=[-1,1,1,-1][h],H;a.hasData=b=a.hasVisibleSeries||r(a.min)&&r(a.max)&&!!e;a.showAxis=i=b||n(d.showEmpty,!0);if(!a.axisGroup)a.gridGroup=c.g("grid").attr({zIndex:d.gridZIndex||1}).add(),a.axisGroup=c.g("axis").attr({zIndex:d.zIndex||2}).add(),a.labelGroup=c.g("axis-labels").attr({zIndex:q.zIndex||
-7}).add();if(b||a.isLinked)o(e,function(b){f[b]?f[b].addLabel():f[b]=new Qa(a,b)}),o(e,function(a){if(h===0||h===2||{1:"left",3:"right"}[h]===q.align)p=s(f[a].getLabelSize(),p)}),a.staggerLines&&(p+=(a.staggerLines-1)*16);else for(H in f)f[H].destroy(),delete f[H];if(m&&m.text){if(!a.axisTitle)a.axisTitle=c.text(m.text,0,0,m.useHTML).attr({zIndex:7,rotation:m.rotation||0,align:m.textAlign||{low:"left",middle:"center",high:"right"}[m.align]}).css(m.style).add(a.axisGroup),a.axisTitle.isNew=!0;if(i)j=
-a.axisTitle.getBBox()[g?"height":"width"],l=n(m.margin,g?5:10),k=m.offset;a.axisTitle[i?"show":"hide"]()}a.offset=t*n(d.offset,y[h]);a.axisTitleMargin=n(k,p+l+(h!==2&&p&&t*d.labels[g?"y":"x"]));y[h]=s(y[h],a.axisTitleMargin+j+t*a.offset)},getLinePath:function(a){var b=this.chart,c=this.opposite,d=this.offset,e=this.horiz,f=this.left+(c?this.width:0)+d;this.lineTop=c=b.chartHeight-this.bottom-(c?this.height:0)+d;return b.renderer.crispLine(["M",e?this.left:f,e?c:this.top,"L",e?b.chartWidth-this.right:
-f,e?c:b.chartHeight-this.bottom],a)},getTitlePosition:function(){var a=this.horiz,b=this.left,c=this.top,d=this.len,e=this.options.title,f=a?b:c,g=this.opposite,h=this.offset,i=z(e.style.fontSize||12),d={low:f+(a?0:d),middle:f+d/2,high:f+(a?d:0)}[e.align],b=(a?c+this.height:b)+(a?1:-1)*(g?-1:1)*this.axisTitleMargin+(this.side===2?i:0);return{x:a?d:b+(g?this.width:0)+h+(e.x||0),y:a?b-(g?this.height:0)+h:d+(e.y||0)}},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.options,e=a.isLog,f=a.isLinked,
-g=a.tickPositions,h=a.axisTitle,i=a.stacks,j=a.ticks,k=a.minorTicks,l=a.alternateBands,m=d.stackLabels,q=d.alternateGridColor,p=a.tickmarkOffset,n=d.lineWidth,t,H=b.hasRendered&&r(a.oldMin)&&!isNaN(a.oldMin),u=a.showAxis,v,s;if(a.hasData||f)if(a.minorTickInterval&&!a.categories&&o(a.getMinorTickPositions(),function(b){k[b]||(k[b]=new Qa(a,b,"minor"));H&&k[b].isNew&&k[b].render(null,!0);k[b].isActive=!0;k[b].render()}),g.length&&o(g.slice(1).concat([g[0]]),function(b,c){c=c===g.length-1?0:c+1;if(!f||
-b>=a.min&&b<=a.max)j[b]||(j[b]=new Qa(a,b)),H&&j[b].isNew&&j[b].render(c,!0),j[b].isActive=!0,j[b].render(c)}),q&&o(g,function(b,c){if(c%2===0&&b<a.max)l[b]||(l[b]=new nb(a)),v=b+p,s=g[c+1]!==A?g[c+1]+p:a.max,l[b].options={from:e?aa(v):v,to:e?aa(s):s,color:q},l[b].render(),l[b].isActive=!0}),!a._addedPlotLB)o((d.plotLines||[]).concat(d.plotBands||[]),function(b){a.addPlotBandOrLine(b)}),a._addedPlotLB=!0;o([j,k,l],function(a){for(var b in a)a[b].isActive?a[b].isActive=!1:(a[b].destroy(),delete a[b])});
-if(n)t=a.getLinePath(n),a.axisLine?a.axisLine.animate({d:t}):a.axisLine=c.path(t).attr({stroke:d.lineColor,"stroke-width":n,zIndex:7}).add(a.axisGroup),a.axisLine[u?"show":"hide"]();if(h&&u)h[h.isNew?"attr":"animate"](a.getTitlePosition()),h.isNew=!1;if(m&&m.enabled){var x,E,d=a.stackTotalGroup;if(!d)a.stackTotalGroup=d=c.g("stack-labels").attr({visibility:"visible",zIndex:6}).add();d.translate(b.plotLeft,b.plotTop);for(x in i)for(E in b=i[x],b)b[E].render(d)}a.isDirty=!1},removePlotBandOrLine:function(a){for(var b=
-this.plotLinesAndBands,c=b.length;c--;)b[c].id===a&&b[c].destroy()},setTitle:function(a,b){var c=this.chart,d=this.options,e=this.axisTitle;d.title=B(d.title,a);this.axisTitle=e&&e.destroy();this.isDirty=!0;n(b,!0)&&c.redraw()},redraw:function(){var a=this.chart;a.tracker.resetTracker&&a.tracker.resetTracker(!0);this.render();o(this.plotLinesAndBands,function(a){a.render()});o(this.series,function(a){a.isDirty=!0})},setCategories:function(a,b){var c=this.chart;this.categories=this.userOptions.categories=
-a;o(this.series,function(a){a.translate();a.setTooltipPoints(!0)});this.isDirty=!0;n(b,!0)&&c.redraw()},destroy:function(){var a=this,b=a.stacks,c;R(a);for(c in b)Ga(b[c]),b[c]=null;o([a.ticks,a.minorTicks,a.alternateBands,a.plotLinesAndBands],function(a){Ga(a)});o("stackTotalGroup,axisLine,axisGroup,gridGroup,labelGroup,axisTitle".split(","),function(b){a[b]&&(a[b]=a[b].destroy())})}};pb.prototype={destroy:function(){o(this.crosshairs,function(a){a&&a.destroy()});if(this.label)this.label=this.label.destroy()},
-move:function(a,b,c,d){var e=this,f=e.now,g=e.options.animation!==!1&&!e.isHidden;x(f,{x:g?(2*f.x+a)/3:a,y:g?(f.y+b)/2:b,anchorX:g?(2*f.anchorX+c)/3:c,anchorY:g?(f.anchorY+d)/2:d});e.label.attr(f);if(g&&(M(a-f.x)>1||M(b-f.y)>1))clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){e&&e.move(a,b,c,d)},32)},hide:function(){if(!this.isHidden){var a=this.chart.hoverPoints;this.label.hide();a&&o(a,function(a){a.setState()});this.chart.hoverPoints=null;this.isHidden=!0}},hideCrosshairs:function(){o(this.crosshairs,
-function(a){a&&a.hide()})},getAnchor:function(a,b){var c,d=this.chart,e=d.inverted,f=0,g=0,h,a=la(a);c=a[0].tooltipPos;c||(o(a,function(a){h=a.series.yAxis;f+=a.plotX;g+=(a.plotLow?(a.plotLow+a.plotHigh)/2:a.plotY)+(!e&&h?h.top-d.plotTop:0)}),f/=a.length,g/=a.length,c=[e?d.plotWidth-g:f,this.shared&&!e&&a.length>1&&b?b.chartY-d.plotTop:e?d.plotHeight-f:g]);return Ta(c,u)},getPosition:function(a,b,c){var d=this.chart,e=d.plotLeft,f=d.plotTop,g=d.plotWidth,h=d.plotHeight,i=n(this.options.distance,12),
-j=c.plotX,c=c.plotY,d=j+e+(d.inverted?i:-a-i),k=c-b+f+15,l;d<7&&(d=e+s(j,0)+i);d+a>e+g&&(d-=d+a-(e+g),k=c-b+f-i,l=!0);k<f+5&&(k=f+5,l&&c>=k&&c<=k+b&&(k=c+f+i));k+b>f+h&&(k=s(f,f+h-b-i));return{x:d,y:k}},refresh:function(a,b){function c(){var a=this.points||la(this),b=a[0].series,c;c=[b.tooltipHeaderFormatter(a[0].key)];o(a,function(a){b=a.series;c.push(b.tooltipFormatter&&b.tooltipFormatter(a)||a.point.tooltipFormatter(b.tooltipOptions.pointFormat))});c.push(f.footerFormat||"");return c.join("")}
-var d=this.chart,e=this.label,f=this.options,g,h,i,j={},k,l=[];k=f.formatter||c;var j=d.hoverPoints,m,q=f.crosshairs;i=this.shared;h=this.getAnchor(a,b);g=h[0];h=h[1];i&&(!a.series||!a.series.noSharedTooltip)?(d.hoverPoints=a,j&&o(j,function(a){a.setState()}),o(a,function(a){a.setState("hover");l.push(a.getLabelConfig())}),j={x:a[0].category,y:a[0].y},j.points=l,a=a[0]):j=a.getLabelConfig();k=k.call(j);j=a.series;i=i||!j.isCartesian||j.tooltipOutsidePlot||d.isInsidePlot(g,h);k===!1||!i?this.hide():
-(this.isHidden&&e.show(),e.attr({text:k}),m=f.borderColor||a.color||j.color||"#606060",e.attr({stroke:m}),e=(f.positioner||this.getPosition).call(this,e.width,e.height,{plotX:g,plotY:h}),this.move(u(e.x),u(e.y),g+d.plotLeft,h+d.plotTop),this.isHidden=!1);if(q){q=la(q);for(e=q.length;e--;)if(i=a.series[e?"yAxis":"xAxis"],q[e]&&i)if(i=i.getPlotLinePath(e?n(a.stackY,a.y):a.x,1),this.crosshairs[e])this.crosshairs[e].attr({d:i,visibility:"visible"});else{j={"stroke-width":q[e].width||1,stroke:q[e].color||
-"#C0C0C0",zIndex:q[e].zIndex||2};if(q[e].dashStyle)j.dashstyle=q[e].dashStyle;this.crosshairs[e]=d.renderer.path(i).attr(j).add()}}F(d,"tooltipRefresh",{text:k,x:g+d.plotLeft,y:h+d.plotTop,borderColor:m})}};qb.prototype={normalizeMouseEvent:function(a){var b,c,d,a=a||L.event;if(!a.target)a.target=a.srcElement;a=Pb(a);d=a.touches?a.touches.item(0):a;this.chartPosition=b=Vb(this.chart.container);d.pageX===A?(c=a.x,b=a.y):(c=d.pageX-b.left,b=d.pageY-b.top);return x(a,{chartX:u(c),chartY:u(b)})},getMouseCoordinates:function(a){var b=
-{xAxis:[],yAxis:[]},c=this.chart;o(c.axes,function(d){var e=d.isXAxis;b[e?"xAxis":"yAxis"].push({axis:d,value:d.translate(((c.inverted?!e:e)?a.chartX-c.plotLeft:d.top+d.len-a.chartY)-d.minPixelPadding,!0)})});return b},getIndex:function(a){var b=this.chart;return b.inverted?b.plotHeight+b.plotTop-a.chartY:a.chartX-b.plotLeft},onmousemove:function(a){var b=this.chart,c=b.series,d=b.tooltip,e,f=b.hoverPoint,g=b.hoverSeries,h,i,j=b.chartWidth,k=this.getIndex(a);if(d&&this.options.tooltip.shared&&(!g||
-!g.noSharedTooltip)){e=[];h=c.length;for(i=0;i<h;i++)if(c[i].visible&&c[i].options.enableMouseTracking!==!1&&!c[i].noSharedTooltip&&c[i].tooltipPoints&&c[i].tooltipPoints.length)b=c[i].tooltipPoints[k],b._dist=M(k-b[c[i].xAxis.tooltipPosName||"plotX"]),j=O(j,b._dist),e.push(b);for(h=e.length;h--;)e[h]._dist>j&&e.splice(h,1);if(e.length&&e[0].plotX!==this.hoverX)d.refresh(e,a),this.hoverX=e[0].plotX}if(g&&g.tracker&&(b=g.tooltipPoints[k])&&b!==f)b.onMouseOver()},resetTracker:function(a){var b=this.chart,
-c=b.hoverSeries,d=b.hoverPoint,e=b.tooltip,b=e&&e.shared?b.hoverPoints:d;(a=a&&e&&b)&&la(b)[0].plotX===A&&(a=!1);if(a)e.refresh(b);else{if(d)d.onMouseOut();if(c)c.onMouseOut();e&&(e.hide(),e.hideCrosshairs());this.hoverX=null}},setDOMEvents:function(){function a(){if(b.selectionMarker){var f={xAxis:[],yAxis:[]},g=b.selectionMarker.getBBox(),h=g.x-c.plotLeft,l=g.y-c.plotTop,m;e&&(o(c.axes,function(a){if(a.options.zoomEnabled!==!1){var b=a.isXAxis,d=c.inverted?!b:b,e=a.translate(d?h:c.plotHeight-l-
-g.height,!0,0,0,1),d=a.translate((d?h+g.width:c.plotHeight-l)-2*a.minPixelPadding,!0,0,0,1);!isNaN(e)&&!isNaN(d)&&(f[b?"xAxis":"yAxis"].push({axis:a,min:O(e,d),max:s(e,d)}),m=!0)}}),m&&F(c,"selection",f,function(a){c.zoom(a)}));b.selectionMarker=b.selectionMarker.destroy()}if(c)I(d,{cursor:"auto"}),c.cancelClick=e,c.mouseIsDown=e=!1;R(C,"mouseup",a);Ba&&R(C,"touchend",a)}var b=this,c=b.chart,d=c.container,e,f=b.zoomX&&!c.inverted||b.zoomY&&c.inverted,g=b.zoomY&&!c.inverted||b.zoomX&&c.inverted;b.hideTooltipOnMouseMove=
-function(a){a=Pb(a);b.chartPosition&&c.hoverSeries&&c.hoverSeries.isCartesian&&!c.isInsidePlot(a.pageX-b.chartPosition.left-c.plotLeft,a.pageY-b.chartPosition.top-c.plotTop)&&b.resetTracker()};b.hideTooltipOnMouseLeave=function(){b.resetTracker();b.chartPosition=null};d.onmousedown=function(d){d=b.normalizeMouseEvent(d);d.type.indexOf("touch")===-1&&d.preventDefault&&d.preventDefault();c.mouseIsDown=!0;c.cancelClick=!1;c.mouseDownX=b.mouseDownX=d.chartX;b.mouseDownY=d.chartY;J(C,"mouseup",a);Ba&&
-J(C,"touchend",a)};var h=function(a){if(!a||!(a.touches&&a.touches.length>1)){var a=b.normalizeMouseEvent(a),d=a.type,h=a.chartX,l=a.chartY,m=!c.isInsidePlot(h-c.plotLeft,l-c.plotTop);if(d.indexOf("touch")===-1)a.returnValue=!1;d==="touchstart"&&(w(a.target,"isTracker")?c.runTrackerClick||a.preventDefault():!c.runChartClick&&!m&&a.preventDefault());if(m)h<c.plotLeft?h=c.plotLeft:h>c.plotLeft+c.plotWidth&&(h=c.plotLeft+c.plotWidth),l<c.plotTop?l=c.plotTop:l>c.plotTop+c.plotHeight&&(l=c.plotTop+c.plotHeight);
-if(c.mouseIsDown&&d!=="touchstart"&&(e=Math.sqrt(Math.pow(b.mouseDownX-h,2)+Math.pow(b.mouseDownY-l,2)),e>10)){d=c.isInsidePlot(b.mouseDownX-c.plotLeft,b.mouseDownY-c.plotTop);if(c.hasCartesianSeries&&(b.zoomX||b.zoomY)&&d&&!b.selectionMarker)b.selectionMarker=c.renderer.rect(c.plotLeft,c.plotTop,f?1:c.plotWidth,g?1:c.plotHeight,0).attr({fill:b.options.chart.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add();if(b.selectionMarker&&f){var q=h-b.mouseDownX;b.selectionMarker.attr({width:M(q),
-x:(q>0?0:q)+b.mouseDownX})}b.selectionMarker&&g&&(l-=b.mouseDownY,b.selectionMarker.attr({height:M(l),y:(l>0?0:l)+b.mouseDownY}));d&&!b.selectionMarker&&b.options.chart.panning&&c.pan(h)}if(!m)b.onmousemove(a);return m||!c.hasCartesianSeries}};if(!/Android 4\.0/.test(na))d.onmousemove=h;J(d,"mouseleave",b.hideTooltipOnMouseLeave);Ba||J(C,"mousemove",b.hideTooltipOnMouseMove);d.ontouchstart=function(a){if(b.zoomX||b.zoomY)d.onmousedown(a);h(a)};d.ontouchmove=h;d.ontouchend=function(){e&&b.resetTracker()};
-d.onclick=function(a){var d=c.hoverPoint,e,f,a=b.normalizeMouseEvent(a);a.cancelBubble=!0;if(!c.cancelClick)d&&(w(a.target,"isTracker")||w(a.target.parentNode,"isTracker"))?(e=d.plotX,f=d.plotY,x(d,{pageX:b.chartPosition.left+c.plotLeft+(c.inverted?c.plotWidth-f:e),pageY:b.chartPosition.top+c.plotTop+(c.inverted?c.plotHeight-e:f)}),F(d.series,"click",x(a,{point:d})),d.firePointEvent("click",a)):(x(a,b.getMouseCoordinates(a)),c.isInsidePlot(a.chartX-c.plotLeft,a.chartY-c.plotTop)&&F(c,"click",a))}},
-destroy:function(){var a=this.chart,b=a.container;if(a.trackerGroup)a.trackerGroup=a.trackerGroup.destroy();R(b,"mouseleave",this.hideTooltipOnMouseLeave);R(C,"mousemove",this.hideTooltipOnMouseMove);b.onclick=b.onmousedown=b.onmousemove=b.ontouchstart=b.ontouchend=b.ontouchmove=null;clearInterval(this.tooltipTimeout)},init:function(a,b){if(!a.trackerGroup)a.trackerGroup=a.renderer.g("tracker").attr({zIndex:9}).add();if(b.enabled)a.tooltip=new pb(a,b);this.setDOMEvents()}};rb.prototype={init:function(a){var b=
-this,c=b.options=a.options.legend;if(c.enabled){var d=c.itemStyle,e=n(c.padding,8),f=c.itemMarginTop||0;b.baseline=z(d.fontSize)+3+f;b.itemStyle=d;b.itemHiddenStyle=B(d,c.itemHiddenStyle);b.itemMarginTop=f;b.padding=e;b.initialItemX=e;b.initialItemY=e-5;b.maxItemWidth=0;b.chart=a;b.itemHeight=0;b.lastLineHeight=0;b.render();J(b.chart,"endResize",function(){b.positionCheckboxes()})}},colorizeItem:function(a,b){var c=this.options,d=a.legendItem,e=a.legendLine,f=a.legendSymbol,g=this.itemHiddenStyle.color,
-c=b?c.itemStyle.color:g,h=b?a.color:g,g=a.options&&a.options.marker,i={stroke:h,fill:h},j;d&&d.css({fill:c});e&&e.attr({stroke:h});if(f){if(g)for(j in g=a.convertAttribs(g),g)d=g[j],d!==A&&(i[j]=d);f.attr(i)}},positionItem:function(a){var b=this.options,c=b.symbolPadding,b=!b.rtl,d=a._legendItemPos,e=d[0],d=d[1],f=a.checkbox;a.legendGroup&&a.legendGroup.translate(b?e:this.legendWidth-e-2*c-4,d);if(f)f.x=e,f.y=d},destroyItem:function(a){var b=a.checkbox;o(["legendItem","legendLine","legendSymbol",
-"legendGroup"],function(b){a[b]&&a[b].destroy()});b&&Na(a.checkbox)},destroy:function(){var a=this.group,b=this.box;if(b)this.box=b.destroy();if(a)this.group=a.destroy()},positionCheckboxes:function(a){var b=this.group.alignAttr,c,d=this.clipHeight||this.legendHeight;if(b)c=b.translateY,o(this.allItems,function(e){var f=e.checkbox,g;f&&(g=c+f.y+(a||0)+3,I(f,{left:b.translateX+e.legendItemWidth+f.x-20+"px",top:g+"px",display:g>c-6&&g<c+d-6?"":Q}))})},renderItem:function(a){var p;var b=this,c=b.chart,
-d=c.renderer,e=b.options,f=e.layout==="horizontal",g=e.symbolWidth,h=e.symbolPadding,i=b.itemStyle,j=b.itemHiddenStyle,k=b.padding,l=!e.rtl,m=e.width,q=e.itemMarginBottom||0,n=b.itemMarginTop,o=b.initialItemX,t=a.legendItem,r=a.series||a,u=r.options,v=u.showCheckbox,x=e.useHTML;if(!t&&(a.legendGroup=d.g("legend-item").attr({zIndex:1}).add(b.scrollGroup),r.drawLegendSymbol(b,a),a.legendItem=t=d.text(e.labelFormatter.call(a),l?g+h:-h,b.baseline,x).css(B(a.visible?i:j)).attr({align:l?"left":"right",
-zIndex:2}).add(a.legendGroup),(x?t:a.legendGroup).on("mouseover",function(){a.setState("hover");t.css(b.options.itemHoverStyle)}).on("mouseout",function(){t.css(a.visible?i:j);a.setState()}).on("click",function(b){var c=function(){a.setVisible()},b={browserEvent:b};a.firePointEvent?a.firePointEvent("legendItemClick",b,c):F(a,"legendItemClick",b,c)}),b.colorizeItem(a,a.visible),u&&v))a.checkbox=T("input",{type:"checkbox",checked:a.selected,defaultChecked:a.selected},e.itemCheckboxStyle,c.container),
-J(a.checkbox,"click",function(b){F(a,"checkboxClick",{checked:b.target.checked},function(){a.select()})});d=t.getBBox();p=a.legendItemWidth=e.itemWidth||g+h+d.width+k+(v?20:0),e=p;b.itemHeight=g=d.height;if(f&&b.itemX-o+e>(m||c.chartWidth-2*k-o))b.itemX=o,b.itemY+=n+b.lastLineHeight+q,b.lastLineHeight=0;b.maxItemWidth=s(b.maxItemWidth,e);b.lastItemY=n+b.itemY+q;b.lastLineHeight=s(g,b.lastLineHeight);a._legendItemPos=[b.itemX,b.itemY];f?b.itemX+=e:(b.itemY+=n+g+q,b.lastLineHeight=g);b.offsetWidth=
-m||s(f?b.itemX-o:e,b.offsetWidth)},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.group,e,f,g,h,i=a.box,j=a.options,k=a.padding,l=j.borderWidth,m=j.backgroundColor;a.itemX=a.initialItemX;a.itemY=a.initialItemY;a.offsetWidth=0;a.lastItemY=0;if(!d)a.group=d=c.g("legend").attr({zIndex:7}).add(),a.contentGroup=c.g().attr({zIndex:1}).add(d),a.scrollGroup=c.g().add(a.contentGroup),a.clipRect=c.clipRect(0,0,9999,b.chartHeight),a.contentGroup.clip(a.clipRect);e=[];o(b.series,function(a){var b=a.options;
-b.showInLegend&&(e=e.concat(a.legendItems||(b.legendType==="point"?a.data:a)))});Ib(e,function(a,b){return(a.options&&a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});j.reversed&&e.reverse();a.allItems=e;a.display=f=!!e.length;o(e,function(b){a.renderItem(b)});g=j.width||a.offsetWidth;h=a.lastItemY+a.lastLineHeight;h=a.handleOverflow(h);if(l||m){g+=k;h+=k;if(i){if(g>0&&h>0)i[i.isNew?"attr":"animate"](i.crisp(null,null,null,g,h)),i.isNew=!1}else a.box=i=c.rect(0,0,g,h,j.borderRadius,
-l||0).attr({stroke:j.borderColor,"stroke-width":l||0,fill:m||Q}).add(d).shadow(j.shadow),i.isNew=!0;i[f?"show":"hide"]()}a.legendWidth=g;a.legendHeight=h;o(e,function(b){a.positionItem(b)});f&&d.align(x({width:g,height:h},j),!0,b.spacingBox);b.isResizing||this.positionCheckboxes()},handleOverflow:function(a){var b=this,c=this.chart,d=c.renderer,e=this.options,f=e.y,f=c.spacingBox.height+(e.verticalAlign==="top"?-f:f)-this.padding,g=e.maxHeight,h=this.clipRect,i=e.navigation,j=n(i.animation,!0),k=
-i.arrowSize||12,l=this.nav;e.layout==="horizontal"&&(f/=2);g&&(f=O(f,g));if(a>f){this.clipHeight=c=f-20;this.pageCount=za(a/c);this.currentPage=n(this.currentPage,1);this.fullHeight=a;h.attr({height:c});if(!l)this.nav=l=d.g().attr({zIndex:1}).add(this.group),this.up=d.symbol("triangle",0,0,k,k).on("click",function(){b.scroll(-1,j)}).add(l),this.pager=d.text("",15,10).css(i.style).add(l),this.down=d.symbol("triangle-down",0,0,k,k).on("click",function(){b.scroll(1,j)}).add(l);b.scroll(0);a=f}else if(l)h.attr({height:c.chartHeight}),
-l.hide(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0;return a},scroll:function(a,b){var c=this.pageCount,d=this.currentPage+a,e=this.clipHeight,f=this.options.navigation,g=f.activeColor,h=f.inactiveColor,f=this.pager,i=this.padding;d>c&&(d=c);if(d>0)b!==A&&xa(b,this.chart),this.nav.attr({translateX:i,translateY:e+7,visibility:"visible"}),this.up.attr({fill:d===1?h:g}).css({cursor:d===1?"default":"pointer"}),f.attr({text:d+"/"+this.pageCount}),this.down.attr({x:18+this.pager.getBBox().width,
-fill:d===c?h:g}).css({cursor:d===c?"default":"pointer"}),e=-O(e*(d-1),this.fullHeight-e+i)+1,this.scrollGroup.animate({translateY:e}),f.attr({text:d+"/"+c}),this.currentPage=d,this.positionCheckboxes(e)}};sb.prototype={init:function(a,b){var c,d=a.series;a.series=null;c=B(N,a);c.series=a.series=d;var d=c.chart,e=d.margin,e=Y(e)?e:[e,e,e,e];this.optionsMarginTop=n(d.marginTop,e[0]);this.optionsMarginRight=n(d.marginRight,e[1]);this.optionsMarginBottom=n(d.marginBottom,e[2]);this.optionsMarginLeft=
-n(d.marginLeft,e[3]);this.runChartClick=(e=d.events)&&!!e.click;this.callback=b;this.isResizing=0;this.options=c;this.axes=[];this.series=[];this.hasCartesianSeries=d.showAxes;var f;this.index=Ha.length;Ha.push(this);d.reflow!==!1&&J(this,"load",this.initReflow);if(e)for(f in e)J(this,f,e[f]);this.xAxis=[];this.yAxis=[];this.animation=V?!1:n(d.animation,!0);this.pointCount=0;this.counters=new Hb;this.firstRender()},initSeries:function(a){var b=this.options.chart,b=new $[a.type||b.type||b.defaultSeriesType];
-b.init(this,a);return b},addSeries:function(a,b,c){var d,e=this;a&&(xa(c,e),b=n(b,!0),F(e,"addSeries",{options:a},function(){d=e.initSeries(a);e.isDirtyLegend=!0;b&&e.redraw()}));return d},isInsidePlot:function(a,b,c){var d=c?b:a,a=c?a:b;return d>=0&&d<=this.plotWidth&&a>=0&&a<=this.plotHeight},adjustTickAmounts:function(){this.options.chart.alignTicks!==!1&&o(this.axes,function(a){a.adjustTickAmount()});this.maxTicks=null},redraw:function(a){var b=this.axes,c=this.series,d=this.tracker,e=this.legend,
-f=this.isDirtyLegend,g,h=this.isDirtyBox,i=c.length,j=i,k=this.renderer,l=k.isHidden(),m=[];xa(a,this);for(l&&this.cloneRenderTo();j--;)if(a=c[j],a.isDirty&&a.options.stacking){g=!0;break}if(g)for(j=i;j--;)if(a=c[j],a.options.stacking)a.isDirty=!0;o(c,function(a){a.isDirty&&a.options.legendType==="point"&&(f=!0)});if(f&&e.options.enabled)e.render(),this.isDirtyLegend=!1;if(this.hasCartesianSeries){if(!this.isResizing)this.maxTicks=null,o(b,function(a){a.setScale()});this.adjustTickAmounts();this.getMargins();
-o(b,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=!1,m.push(function(){F(a,"afterSetExtremes",a.getExtremes())});if(a.isDirty||h||g)a.redraw(),h=!0})}h&&this.drawChartBox();o(c,function(a){a.isDirty&&a.visible&&(!a.isCartesian||a.xAxis)&&a.redraw()});d&&d.resetTracker&&d.resetTracker(!0);k.draw();F(this,"redraw");l&&this.cloneRenderTo(!0);o(m,function(a){a.call()})},showLoading:function(a){var b=this.options,c=this.loadingDiv,d=b.loading;if(!c)this.loadingDiv=c=T(ga,{className:"highcharts-loading"},
-x(d.style,{left:this.plotLeft+"px",top:this.plotTop+"px",width:this.plotWidth+"px",height:this.plotHeight+"px",zIndex:10,display:Q}),this.container),this.loadingSpan=T("span",null,d.labelStyle,c);this.loadingSpan.innerHTML=a||b.lang.loading;if(!this.loadingShown)I(c,{opacity:0,display:""}),xb(c,{opacity:d.style.opacity},{duration:d.showDuration||0}),this.loadingShown=!0},hideLoading:function(){var a=this.options,b=this.loadingDiv;b&&xb(b,{opacity:0},{duration:a.loading.hideDuration||100,complete:function(){I(b,
-{display:Q})}});this.loadingShown=!1},get:function(a){var b=this.axes,c=this.series,d,e;for(d=0;d<b.length;d++)if(b[d].options.id===a)return b[d];for(d=0;d<c.length;d++)if(c[d].options.id===a)return c[d];for(d=0;d<c.length;d++){e=c[d].points||[];for(b=0;b<e.length;b++)if(e[b].id===a)return e[b]}return null},getAxes:function(){var a=this,b=this.options,c=b.xAxis||{},b=b.yAxis||{},c=la(c);o(c,function(a,b){a.index=b;a.isX=!0});b=la(b);o(b,function(a,b){a.index=b});c=c.concat(b);o(c,function(b){new ob(a,
-b)});a.adjustTickAmounts()},getSelectedPoints:function(){var a=[];o(this.series,function(b){a=a.concat(Ob(b.points,function(a){return a.selected}))});return a},getSelectedSeries:function(){return Ob(this.series,function(a){return a.selected})},showResetZoom:function(){var a=this,b=N.lang,c=a.options.chart.resetZoomButton,d=c.theme,e=d.states,f=c.relativeTo==="chart"?null:"plotBox";this.resetZoomButton=a.renderer.button(b.resetZoom,null,null,function(){a.zoomOut()},d,e&&e.hover).attr({align:c.position.align,
-title:b.resetZoomTitle}).add().align(c.position,!1,a[f]);this.resetZoomButton.alignTo=f},zoomOut:function(){var a=this,b=a.resetZoomButton;F(a,"selection",{resetSelection:!0},function(){a.zoom()});if(b)a.resetZoomButton=b.destroy()},zoom:function(a){var b=this,c;!a||a.resetSelection?o(b.axes,function(a){c=a.zoom()}):o(a.xAxis.concat(a.yAxis),function(a){var e=a.axis;if(b.tracker[e.isXAxis?"zoomX":"zoomY"])c=e.zoom(a.min,a.max)});b.resetZoomButton||b.showResetZoom();c&&b.redraw(n(b.options.chart.animation,
-b.pointCount<100))},pan:function(a){var b=this.xAxis[0],c=this.mouseDownX,d=b.pointRange/2,e=b.getExtremes(),f=b.translate(c-a,!0)+d,c=b.translate(c+this.plotWidth-a,!0)-d;(d=this.hoverPoints)&&o(d,function(a){a.setState()});b.series.length&&f>O(e.dataMin,e.min)&&c<s(e.dataMax,e.max)&&b.setExtremes(f,c,!0,!1,{trigger:"pan"});this.mouseDownX=a;I(this.container,{cursor:"move"})},setTitle:function(a,b){var c=this,d=c.options,e;c.chartTitleOptions=e=B(d.title,a);c.chartSubtitleOptions=d=B(d.subtitle,
-b);o([["title",a,e],["subtitle",b,d]],function(a){var b=a[0],d=c[b],e=a[1],a=a[2];d&&e&&(c[b]=d=d.destroy());a&&a.text&&!d&&(c[b]=c.renderer.text(a.text,0,0,a.useHTML).attr({align:a.align,"class":"highcharts-"+b,zIndex:a.zIndex||4}).css(a.style).add().align(a,!1,c.spacingBox))})},getChartSize:function(){var a=this.options.chart,b=this.renderToClone||this.renderTo;this.containerWidth=eb(b,"width");this.containerHeight=eb(b,"height");this.chartWidth=s(0,n(a.width,this.containerWidth,600));this.chartHeight=
-s(0,n(a.height,this.containerHeight>19?this.containerHeight:400))},cloneRenderTo:function(a){var b=this.renderToClone,c=this.container;a?b&&(this.renderTo.appendChild(c),Na(b),delete this.renderToClone):(c&&this.renderTo.removeChild(c),this.renderToClone=b=this.renderTo.cloneNode(0),I(b,{position:"absolute",top:"-9999px",display:"block"}),C.body.appendChild(b),c&&b.appendChild(c))},getContainer:function(){var a,b=this.options.chart,c,d,e;this.renderTo=a=b.renderTo;e="highcharts-"+tb++;if(ja(a))this.renderTo=
-a=C.getElementById(a);a||Oa(13,!0);c=z(w(a,"data-highcharts-chart"));!isNaN(c)&&Ha[c]&&Ha[c].destroy();w(a,"data-highcharts-chart",this.index);a.innerHTML="";a.offsetWidth||this.cloneRenderTo();this.getChartSize();c=this.chartWidth;d=this.chartHeight;this.container=a=T(ga,{className:"highcharts-container"+(b.className?" "+b.className:""),id:e},x({position:"relative",overflow:"hidden",width:c+"px",height:d+"px",textAlign:"left",lineHeight:"normal",zIndex:0},b.style),this.renderToClone||a);this.renderer=
-b.forExport?new sa(a,c,d,!0):new Sa(a,c,d);V&&this.renderer.create(this,a,c,d)},getMargins:function(){var a=this.options.chart,b=a.spacingTop,c=a.spacingRight,d=a.spacingBottom,a=a.spacingLeft,e,f=this.legend,g=this.optionsMarginTop,h=this.optionsMarginLeft,i=this.optionsMarginRight,j=this.optionsMarginBottom,k=this.chartTitleOptions,l=this.chartSubtitleOptions,m=this.options.legend,q=n(m.margin,10),p=m.x,y=m.y,t=m.align,u=m.verticalAlign;this.resetMargins();e=this.axisOffset;if((this.title||this.subtitle)&&
-!r(this.optionsMarginTop))if(l=s(this.title&&!k.floating&&!k.verticalAlign&&k.y||0,this.subtitle&&!l.floating&&!l.verticalAlign&&l.y||0))this.plotTop=s(this.plotTop,l+n(k.margin,15)+b);if(f.display&&!m.floating)if(t==="right"){if(!r(i))this.marginRight=s(this.marginRight,f.legendWidth-p+q+c)}else if(t==="left"){if(!r(h))this.plotLeft=s(this.plotLeft,f.legendWidth+p+q+a)}else if(u==="top"){if(!r(g))this.plotTop=s(this.plotTop,f.legendHeight+y+q+b)}else if(u==="bottom"&&!r(j))this.marginBottom=s(this.marginBottom,
-f.legendHeight-y+q+d);this.extraBottomMargin&&(this.marginBottom+=this.extraBottomMargin);this.extraTopMargin&&(this.plotTop+=this.extraTopMargin);this.hasCartesianSeries&&o(this.axes,function(a){a.getOffset()});r(h)||(this.plotLeft+=e[3]);r(g)||(this.plotTop+=e[0]);r(j)||(this.marginBottom+=e[2]);r(i)||(this.marginRight+=e[1]);this.setChartSize()},initReflow:function(){function a(a){var g=c.width||eb(d,"width"),h=c.height||eb(d,"height"),a=a?a.target:L;if(!b.hasUserSize&&g&&h&&(a===L||a===C)){if(g!==
-b.containerWidth||h!==b.containerHeight)clearTimeout(e),b.reflowTimeout=e=setTimeout(function(){if(b.container)b.setSize(g,h,!1),b.hasUserSize=null},100);b.containerWidth=g;b.containerHeight=h}}var b=this,c=b.options.chart,d=b.renderTo,e;J(L,"resize",a);J(b,"destroy",function(){R(L,"resize",a)})},setSize:function(a,b,c){var d=this,e,f,g=d.resetZoomButton,h=d.title,i=d.subtitle,j;d.isResizing+=1;j=function(){d&&F(d,"endResize",null,function(){d.isResizing-=1})};xa(c,d);d.oldChartHeight=d.chartHeight;
-d.oldChartWidth=d.chartWidth;if(r(a))d.chartWidth=e=s(0,u(a)),d.hasUserSize=!!e;if(r(b))d.chartHeight=f=s(0,u(b));I(d.container,{width:e+"px",height:f+"px"});d.renderer.setSize(e,f,c);d.plotWidth=e-d.plotLeft-d.marginRight;d.plotHeight=f-d.plotTop-d.marginBottom;d.maxTicks=null;o(d.axes,function(a){a.isDirty=!0;a.setScale()});o(d.series,function(a){a.isDirty=!0});d.isDirtyLegend=!0;d.isDirtyBox=!0;d.getMargins();a=d.spacingBox;h&&h.align(null,null,a);i&&i.align(null,null,a);g&&g.align&&g.align(null,
-null,d[g.alignTo]);d.redraw(c);d.oldChartHeight=null;F(d,"resize");Pa===!1?j():setTimeout(j,Pa&&Pa.duration||500)},setChartSize:function(){var a=this.inverted,b=this.chartWidth,c=this.chartHeight,d=this.options.chart,e=d.spacingTop,f=d.spacingRight,g=d.spacingBottom,h=d.spacingLeft,i,j,k,l;this.plotLeft=i=u(this.plotLeft);this.plotTop=j=u(this.plotTop);this.plotWidth=k=s(0,u(b-i-this.marginRight));this.plotHeight=l=s(0,u(c-j-this.marginBottom));this.plotSizeX=a?l:k;this.plotSizeY=a?k:l;this.plotBorderWidth=
-a=d.plotBorderWidth||0;this.spacingBox={x:h,y:e,width:b-h-f,height:c-e-g};this.plotBox={x:i,y:j,width:k,height:l};this.clipBox={x:a/2,y:a/2,width:this.plotSizeX-a,height:this.plotSizeY-a};o(this.axes,function(a){a.setAxisSize();a.setAxisTranslation()})},resetMargins:function(){var a=this.options.chart,b=a.spacingRight,c=a.spacingBottom,d=a.spacingLeft;this.plotTop=n(this.optionsMarginTop,a.spacingTop);this.marginRight=n(this.optionsMarginRight,b);this.marginBottom=n(this.optionsMarginBottom,c);this.plotLeft=
-n(this.optionsMarginLeft,d);this.axisOffset=[0,0,0,0]},drawChartBox:function(){var a=this.options.chart,b=this.renderer,c=this.chartWidth,d=this.chartHeight,e=this.chartBackground,f=this.plotBackground,g=this.plotBorder,h=this.plotBGImage,i=a.borderWidth||0,j=a.backgroundColor,k=a.plotBackgroundColor,l=a.plotBackgroundImage,m=a.plotBorderWidth||0,n,p=this.plotLeft,o=this.plotTop,t=this.plotWidth,r=this.plotHeight,u=this.plotBox,v=this.clipRect,s=this.clipBox;n=i+(a.shadow?8:0);if(i||j)if(e)e.animate(e.crisp(null,
-null,null,c-n,d-n));else{e={fill:j||Q};if(i)e.stroke=a.borderColor,e["stroke-width"]=i;this.chartBackground=b.rect(n/2,n/2,c-n,d-n,a.borderRadius,i).attr(e).add().shadow(a.shadow)}if(k)f?f.animate(u):this.plotBackground=b.rect(p,o,t,r,0).attr({fill:k}).add().shadow(a.plotShadow);if(l)h?h.animate(u):this.plotBGImage=b.image(l,p,o,t,r).add();v?v.animate({width:s.width,height:s.height}):this.clipRect=b.clipRect(s);if(m)g?g.animate(g.crisp(null,p,o,t,r)):this.plotBorder=b.rect(p,o,t,r,0,m).attr({stroke:a.plotBorderColor,
-"stroke-width":m,zIndex:1}).add();this.isDirtyBox=!1},propFromSeries:function(){var a=this,b=a.options.chart,c,d=a.options.series,e,f;o(["inverted","angular","polar"],function(g){c=$[b.type||b.defaultSeriesType];f=a[g]||b[g]||c&&c.prototype[g];for(e=d&&d.length;!f&&e--;)(c=$[d[e].type])&&c.prototype[g]&&(f=!0);a[g]=f})},render:function(){var a=this,b=a.axes,c=a.renderer,d=a.options,e=d.labels,d=d.credits,f;a.setTitle();a.legend=new rb(a);o(b,function(a){a.setScale()});a.getMargins();a.maxTicks=null;
-o(b,function(a){a.setTickPositions(!0);a.setMaxTicks()});a.adjustTickAmounts();a.getMargins();a.drawChartBox();a.hasCartesianSeries&&o(b,function(a){a.render()});if(!a.seriesGroup)a.seriesGroup=c.g("series-group").attr({zIndex:3}).add();o(a.series,function(a){a.translate();a.setTooltipPoints();a.render()});e.items&&o(e.items,function(b){var d=x(e.style,b.style),f=z(d.left)+a.plotLeft,j=z(d.top)+a.plotTop+12;delete d.left;delete d.top;c.text(b.html,f,j).attr({zIndex:2}).css(d).add()});if(d.enabled&&
-!a.credits)f=d.href,a.credits=c.text(d.text,0,0).on("click",function(){if(f)location.href=f}).attr({align:d.position.align,zIndex:8}).css(d.style).add().align(d.position);a.hasRendered=!0},destroy:function(){var a=this,b=a.axes,c=a.series,d=a.container,e,f=d&&d.parentNode;F(a,"destroy");Ha[a.index]=A;a.renderTo.removeAttribute("data-highcharts-chart");R(a);for(e=b.length;e--;)b[e]=b[e].destroy();for(e=c.length;e--;)c[e]=c[e].destroy();o("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,tracker,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","),
-function(b){var c=a[b];c&&c.destroy&&(a[b]=c.destroy())});if(d)d.innerHTML="",R(d),f&&Na(d);for(e in a)delete a[e]},isReadyToRender:function(){var a=this;return!ca&&L==L.top&&C.readyState!=="complete"||V&&!L.canvg?(V?Rb.push(function(){a.firstRender()},a.options.global.canvasToolsURL):C.attachEvent("onreadystatechange",function(){C.detachEvent("onreadystatechange",a.firstRender);C.readyState==="complete"&&a.firstRender()}),!1):!0},firstRender:function(){var a=this,b=a.options,c=a.callback;if(a.isReadyToRender()){a.getContainer();
-F(a,"init");if(Highcharts.RangeSelector&&b.rangeSelector.enabled)a.rangeSelector=new Highcharts.RangeSelector(a);a.resetMargins();a.setChartSize();a.propFromSeries();a.getAxes();o(b.series||[],function(b){a.initSeries(b)});if(Highcharts.Scroller&&(b.navigator.enabled||b.scrollbar.enabled))a.scroller=new Highcharts.Scroller(a);a.tracker=new qb(a,b);a.render();a.renderer.draw();c&&c.apply(a,[a]);o(a.callbacks,function(b){b.apply(a,[a])});a.cloneRenderTo(!0);F(a,"load")}}};sb.prototype.callbacks=[];
-var Ua=function(){};Ua.prototype={init:function(a,b,c){var d=a.chart.counters;this.series=a;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint)b=a.chart.options.colors,this.color=this.color||b[d.color++],d.wrapColor(b.length);a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=typeof a;this.config=a;if(d==="number"||a===null)this.y=a;else if(typeof a[0]==="number")this.x=a[0],this.y=a[1];else if(d==="object"&&typeof a.length!=="number"){x(this,a);this.options=
-a;if(a.dataLabels)c._hasPointLabels=!0;if(a.marker)c._hasPointMarkers=!0}else if(typeof a[0]==="string")this.name=a[0],this.y=a[1];if(this.x===A)this.x=b===A?c.autoIncrement():b},destroy:function(){var a=this.series.chart,b=a.hoverPoints,c;a.pointCount--;if(b&&(this.setState(),ta(b,this),!b.length))a.hoverPoints=null;if(this===a.hoverPoint)this.onMouseOut();if(this.graphic||this.dataLabel)R(this),this.destroyElements();this.legendItem&&a.legend.destroyItem(this);for(c in this)this[c]=null},destroyElements:function(){for(var a=
-"graphic,tracker,dataLabel,dataLabelUpper,group,connector,shadowGroup".split(","),b,c=6;c--;)b=a[c],this[b]&&(this[b]=this[b].destroy())},getLabelConfig:function(){return{x:this.category,y:this.y,key:this.name||this.category,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}},select:function(a,b){var c=this,d=c.series.chart,a=n(a,!c.selected);c.firePointEvent(a?"select":"unselect",{accumulate:b},function(){c.selected=a;c.setState(a&&"select");b||o(d.getSelectedPoints(),
-function(a){if(a.selected&&a!==c)a.selected=!1,a.setState(""),a.firePointEvent("unselect")})})},onMouseOver:function(){var a=this.series,b=a.chart,c=b.tooltip,d=b.hoverPoint;if(d&&d!==this)d.onMouseOut();this.firePointEvent("mouseOver");c&&(!c.shared||a.noSharedTooltip)&&c.refresh(this);this.setState("hover");b.hoverPoint=this},onMouseOut:function(){var a=this.series.chart,b=a.hoverPoints;if(!b||Ub(this,b)===-1)this.firePointEvent("mouseOut"),this.setState(),a.hoverPoint=null},tooltipFormatter:function(a){var b=
-this.series,c=b.tooltipOptions,d=a.match(/\{(series|point)\.[a-zA-Z]+\}/g),e=/[{\.}]/,f,g,h,i,j={y:0,open:0,high:0,low:0,close:0,percentage:1,total:1};c.valuePrefix=c.valuePrefix||c.yPrefix;c.valueDecimals=n(c.valueDecimals,c.yDecimals);c.valueSuffix=c.valueSuffix||c.ySuffix;for(i in d)g=d[i],ja(g)&&g!==a&&(h=(" "+g).split(e),f={point:this,series:b}[h[1]],h=h[2],f===this&&j.hasOwnProperty(h)?(f=j[h]?h:"value",f=(c[f+"Prefix"]||"")+Ja(this[h],n(c[f+"Decimals"],-1))+(c[f+"Suffix"]||"")):f=f[h],a=a.replace(g,
-f));return a},update:function(a,b,c){var d=this,e=d.series,f=d.graphic,g,h=e.data,i=h.length,j=e.chart,b=n(b,!0);d.firePointEvent("update",{options:a},function(){d.applyOptions(a);Y(a)&&(e.getAttribs(),f&&f.attr(d.pointAttr[e.state]));for(g=0;g<i;g++)if(h[g]===d){e.xData[g]=d.x;e.yData[g]=d.toYData?d.toYData():d.y;e.options.data[g]=a;break}e.isDirty=!0;e.isDirtyData=!0;b&&j.redraw(c)})},remove:function(a,b){var c=this,d=c.series,e=d.chart,f,g=d.data,h=g.length;xa(b,e);a=n(a,!0);c.firePointEvent("remove",
-null,function(){for(f=0;f<h;f++)if(g[f]===c){g.splice(f,1);d.options.data.splice(f,1);d.xData.splice(f,1);d.yData.splice(f,1);break}c.destroy();d.isDirty=!0;d.isDirtyData=!0;a&&e.redraw()})},firePointEvent:function(a,b,c){var d=this,e=this.series.options;(e.point.events[a]||d.options&&d.options.events&&d.options.events[a])&&this.importEvents();a==="click"&&e.allowPointSelect&&(c=function(a){d.select(null,a.ctrlKey||a.metaKey||a.shiftKey)});F(this,a,b,c)},importEvents:function(){if(!this.hasImportedEvents){var a=
-B(this.series.options.point,this.options).events,b;this.events=a;for(b in a)J(this,b,a[b]);this.hasImportedEvents=!0}},setState:function(a){var b=this.plotX,c=this.plotY,d=this.series,e=d.options.states,f=X[d.type].marker&&d.options.marker,g=f&&!f.enabled,h=f&&f.states[a],i=h&&h.enabled===!1,j=d.stateMarkerGraphic,k=d.chart,l=this.pointAttr,a=a||"";if(!(a===this.state||this.selected&&a!=="select"||e[a]&&e[a].enabled===!1||a&&(i||g&&!h.enabled))){if(this.graphic)e=f&&this.graphic.symbolName&&l[a].r,
-this.graphic.attr(B(l[a],e?{x:b-e,y:c-e,width:2*e,height:2*e}:{}));else{if(a&&h)e=h.radius,j?j.attr({x:b-e,y:c-e}):d.stateMarkerGraphic=j=k.renderer.symbol(d.symbol,b-e,c-e,2*e,2*e).attr(l[a]).add(d.markerGroup);if(j)j[a&&k.isInsidePlot(b,c)?"show":"hide"]()}this.state=a}}};var P=function(){};P.prototype={isCartesian:!0,type:"line",pointClass:Ua,sorted:!0,requireSorting:!0,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor",r:"radius"},init:function(a,b){var c,d;this.chart=
-a;this.options=b=this.setOptions(b);this.bindAxes();x(this,{name:b.name,state:"",pointAttr:{},visible:b.visible!==!1,selected:b.selected===!0});if(V)b.animation=!1;d=b.events;for(c in d)J(this,c,d[c]);if(d&&d.click||b.point&&b.point.events&&b.point.events.click||b.allowPointSelect)a.runTrackerClick=!0;this.getColor();this.getSymbol();this.setData(b.data,!1);if(this.isCartesian)a.hasCartesianSeries=!0;a.series.push(this);Ib(a.series,function(a,b){return(a.options.index||0)-(b.options.index||0)});o(a.series,
-function(a,b){a.index=b;a.name=a.name||"Series "+(b+1)})},bindAxes:function(){var a=this,b=a.options,c=a.chart,d;a.isCartesian&&o(["xAxis","yAxis"],function(e){o(c[e],function(c){d=c.options;if(b[e]===d.index||b[e]===A&&d.index===0)c.series.push(a),a[e]=c,c.isDirty=!0})})},autoIncrement:function(){var a=this.options,b=this.xIncrement,b=n(b,a.pointStart,0);this.pointInterval=n(this.pointInterval,a.pointInterval,1);this.xIncrement=b+this.pointInterval;return b},getSegments:function(){var a=-1,b=[],
-c,d=this.points,e=d.length;if(e)if(this.options.connectNulls){for(c=e;c--;)d[c].y===null&&d.splice(c,1);d.length&&(b=[d])}else o(d,function(c,g){c.y===null?(g>a+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&&b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart.options,c=b.plotOptions,d=c[this.type],e=a.data;a.data=null;c=B(d,c.series,a);c.data=a.data=e;this.tooltipOptions=B(b.tooltip,c.tooltip);d.marker===null&&delete c.marker;return c},getColor:function(){var a=this.options,
-b=this.chart.options.colors,c=this.chart.counters;this.color=a.color||!a.colorByPoint&&b[c.color++]||"gray";c.wrapColor(b.length)},getSymbol:function(){var a=this.options.marker,b=this.chart,c=b.options.symbols,b=b.counters;this.symbol=a.symbol||c[b.symbol++];if(/^url/.test(this.symbol))a.radius=0;b.wrapSymbol(c.length)},drawLegendSymbol:function(a){var b=this.options,c=b.marker,d=a.options.symbolWidth,e=this.chart.renderer,f=this.legendGroup,a=a.baseline,g;if(b.lineWidth){g={"stroke-width":b.lineWidth};
-if(b.dashStyle)g.dashstyle=b.dashStyle;this.legendLine=e.path(["M",0,a-4,"L",d,a-4]).attr(g).add(f)}if(c&&c.enabled)b=c.radius,this.legendSymbol=e.symbol(this.symbol,d/2-b,a-4-b,2*b,2*b).add(f)},addPoint:function(a,b,c,d){var e=this.options,f=this.data,g=this.graph,h=this.area,i=this.chart,j=this.xData,k=this.yData,l=g&&g.shift||0,m=e.data,q=this.pointClass.prototype;xa(d,i);if(g&&c)g.shift=l+1;if(h){if(c)h.shift=l+1;h.isArea=!0}b=n(b,!0);d={series:this};q.applyOptions.apply(d,[a]);j.push(d.x);k.push(q.toYData?
-q.toYData.call(d):d.y);m.push(a);e.legendType==="point"&&this.generatePoints();c&&(f[0]&&f[0].remove?f[0].remove(!1):(f.shift(),j.shift(),k.shift(),m.shift()));this.getAttribs();this.isDirtyData=this.isDirty=!0;b&&i.redraw()},setData:function(a,b){var c=this.points,d=this.options,e=this.initialColor,f=this.chart,g=null,h=this.xAxis,i,j=this.pointClass.prototype;this.xIncrement=null;this.pointRange=h&&h.categories?1:d.pointRange;if(r(e))f.counters.color=e;var e=[],k=[],l=a?a.length:[],m=(i=this.pointArrayMap)&&
-i.length;if(l>(d.turboThreshold||1E3)){for(i=0;g===null&&i<l;)g=a[i],i++;if(Da(g)){j=n(d.pointStart,0);d=n(d.pointInterval,1);for(i=0;i<l;i++)e[i]=j,k[i]=a[i],j+=d;this.xIncrement=j}else if(Ia(g))if(m)for(i=0;i<l;i++)d=a[i],e[i]=d[0],k[i]=d.slice(1,m+1);else for(i=0;i<l;i++)d=a[i],e[i]=d[0],k[i]=d[1]}else for(i=0;i<l;i++)d={series:this},j.applyOptions.apply(d,[a[i]]),e[i]=d.x,k[i]=j.toYData?j.toYData.call(d):d.y;this.requireSorting&&e.length>1&&e[1]<e[0]&&Oa(15);ja(k[0])&&Oa(14,!0);this.data=[];this.options.data=
-a;this.xData=e;this.yData=k;for(i=c&&c.length||0;i--;)c[i]&&c[i].destroy&&c[i].destroy();if(h)h.minRange=h.userMinRange;this.isDirty=this.isDirtyData=f.isDirtyBox=!0;n(b,!0)&&f.redraw(!1)},remove:function(a,b){var c=this,d=c.chart,a=n(a,!0);if(!c.isRemoving)c.isRemoving=!0,F(c,"remove",null,function(){c.destroy();d.isDirtyLegend=d.isDirtyBox=!0;a&&d.redraw(b)});c.isRemoving=!1},processData:function(a){var b=this.xData,c=this.yData,d=b.length,e=0,f=d,g,h,i=this.xAxis,j=this.options,k=j.cropThreshold,
-l=this.isCartesian;if(l&&!this.isDirty&&!i.isDirty&&!this.yAxis.isDirty&&!a)return!1;if(l&&this.sorted&&(!k||d>k||this.forceCrop))if(a=i.getExtremes(),i=a.min,k=a.max,b[d-1]<i||b[0]>k)b=[],c=[];else if(b[0]<i||b[d-1]>k){for(a=0;a<d;a++)if(b[a]>=i){e=s(0,a-1);break}for(;a<d;a++)if(b[a]>k){f=a+1;break}b=b.slice(e,f);c=c.slice(e,f);g=!0}for(a=b.length-1;a>0;a--)if(d=b[a]-b[a-1],d>0&&(h===A||d<h))h=d;this.cropped=g;this.cropStart=e;this.processedXData=b;this.processedYData=c;if(j.pointRange===null)this.pointRange=
-h||1;this.closestPointRange=h},generatePoints:function(){var a=this.options.data,b=this.data,c,d=this.processedXData,e=this.processedYData,f=this.pointClass,g=d.length,h=this.cropStart||0,i,j=this.hasGroupedData,k,l=[],m;if(!b&&!j)b=[],b.length=a.length,b=this.data=b;for(m=0;m<g;m++)i=h+m,j?l[m]=(new f).init(this,[d[m]].concat(la(e[m]))):(b[i]?k=b[i]:a[i]!==A&&(b[i]=k=(new f).init(this,a[i],d[m])),l[m]=k);if(b&&(g!==(c=b.length)||j))for(m=0;m<c;m++)if(m===h&&!j&&(m+=g),b[m])b[m].destroyElements(),
-b[m].plotX=A;this.data=b;this.points=l},translate:function(){this.processedXData||this.processData();this.generatePoints();for(var a=this.chart,b=this.options,c=b.stacking,d=this.xAxis,e=d.categories,f=this.yAxis,g=this.points,h=g.length,i=!!this.modifyValue,j,k=f.series,l=k.length,m=b.pointPlacement==="between";l--;)if(k[l].visible){k[l]===this&&(j=!0);break}for(l=0;l<h;l++){var k=g[l],q=k.x,p=k.y,o=k.low,t=f.stacks[(p<b.threshold?"-":"")+this.stackKey];k.plotX=d.translate(q,0,0,0,1,m);if(c&&this.visible&&
-t&&t[q])o=t[q],q=o.total,o.cum=o=o.cum-p,p=o+p,j&&(o=n(b.threshold,f.min)),f.isLog&&o<=0&&(o=null),c==="percent"&&(o=q?o*100/q:0,p=q?p*100/q:0),k.percentage=q?k.y*100/q:0,k.total=k.stackTotal=q,k.stackY=p;k.yBottom=r(o)?f.translate(o,0,1,0,1):null;i&&(p=this.modifyValue(p,k));k.plotY=typeof p==="number"?u(f.translate(p,0,1,0,1)*10)/10:A;k.clientX=a.inverted?a.plotHeight-k.plotX:k.plotX;k.category=e&&e[k.x]!==A?e[k.x]:k.x}this.getSegments()},setTooltipPoints:function(a){var b=[],c,d,e=(c=this.xAxis)?
-c.tooltipLen||c.len:this.chart.plotSizeX,f=c&&c.tooltipPosName||"plotX",g,h,i=[];if(this.options.enableMouseTracking!==!1){if(a)this.tooltipPoints=null;o(this.segments||this.points,function(a){b=b.concat(a)});c&&c.reversed&&(b=b.reverse());a=b.length;for(h=0;h<a;h++){g=b[h];c=b[h-1]?d+1:0;for(d=b[h+1]?s(0,U((g[f]+(b[h+1]?b[h+1][f]:e))/2)):e;c>=0&&c<=d;)i[c++]=g}this.tooltipPoints=i}},tooltipHeaderFormatter:function(a){var b=this.tooltipOptions,c=b.xDateFormat,d=this.xAxis,e=d&&d.options.type==="datetime",
-f;if(e&&!c)for(f in D)if(D[f]>=d.closestPointRange){c=b.dateTimeLabelFormats[f];break}return b.headerFormat.replace("{point.key}",e&&Da(a)?db(c,a):a).replace("{series.name}",this.name).replace("{series.color}",this.color)},onMouseOver:function(){var a=this.chart,b=a.hoverSeries;if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&F(this,"mouseOver");this.setState("hover");a.hoverSeries=this},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;if(d)d.onMouseOut();
-this&&a.events.mouseOut&&F(this,"mouseOut");c&&!a.stickyTracking&&!c.shared&&c.hide();this.setState();b.hoverSeries=null},animate:function(a){var b=this,c=b.chart,d=c.renderer,e;e=b.options.animation;var f=c.clipBox,g=c.inverted,h;if(e&&!Y(e))e=X[b.type].animation;h="_sharedClip"+e.duration+e.easing;if(a)a=c[h],e=c[h+"m"],a||(c[h]=a=d.clipRect(x(f,{width:0})),c[h+"m"]=e=d.clipRect(-99,g?-c.plotLeft:-c.plotTop,99,g?c.chartWidth:c.chartHeight)),b.group.clip(a),b.markerGroup.clip(e),b.sharedClipKey=
-h;else{if(a=c[h])a.animate({width:c.plotSizeX},e),c[h+"m"].animate({width:c.plotSizeX+99},e);b.animate=null;b.animationTimeout=setTimeout(function(){b.afterAnimate()},e.duration)}},afterAnimate:function(){var a=this.chart,b=this.sharedClipKey,c=this.group,d=this.trackerGroup;c&&this.options.clip!==!1&&(c.clip(a.clipRect),d&&d.clip(a.clipRect),this.markerGroup.clip());setTimeout(function(){b&&a[b]&&(a[b]=a[b].destroy(),a[b+"m"]=a[b+"m"].destroy())},100)},drawPoints:function(){var a,b=this.points,c=
-this.chart,d,e,f,g,h,i,j,k,l=this.options.marker,m,o=this.markerGroup;if(l.enabled||this._hasPointMarkers)for(f=b.length;f--;)if(g=b[f],d=g.plotX,e=g.plotY,k=g.graphic,i=g.marker||{},a=l.enabled&&i.enabled===A||i.enabled,m=c.isInsidePlot(d,e,c.inverted),a&&e!==A&&!isNaN(e))if(a=g.pointAttr[g.selected?"select":""],h=a.r,i=n(i.symbol,this.symbol),j=i.indexOf("url")===0,k)k.attr({visibility:m?ca?"inherit":"visible":"hidden"}).animate(x({x:d-h,y:e-h},k.symbolName?{width:2*h,height:2*h}:{}));else{if(m&&
-(h>0||j))g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h).attr(a).add(o)}else if(k)g.graphic=k.destroy()},convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=n(a[g],b[f],c[f],d[f]);return h},getAttribs:function(){var a=this,b=X[a.type].marker?a.options.marker:a.options,c=b.states,d=c.hover,e,f=a.color,g={stroke:f,fill:f},h=a.points||[],i=[],j,k=a.pointAttrToOptions,l;a.options.marker?(d.radius=d.radius||b.radius+2,d.lineWidth=
-d.lineWidth||b.lineWidth+1):d.color=d.color||qa(d.color||f).brighten(d.brightness).get();i[""]=a.convertAttribs(b,g);o(["hover","select"],function(b){i[b]=a.convertAttribs(c[b],i[""])});a.pointAttr=i;for(f=h.length;f--;){g=h[f];if((b=g.options&&g.options.marker||g.options)&&b.enabled===!1)b.radius=0;e=a.options.colorByPoint;if(g.options)for(l in k)r(b[k[l]])&&(e=!0);if(e){b=b||{};j=[];c=b.states||{};e=c.hover=c.hover||{};if(!a.options.marker)e.color=qa(e.color||g.color).brighten(e.brightness||d.brightness).get();
-j[""]=a.convertAttribs(x({color:g.color},b),i[""]);j.hover=a.convertAttribs(c.hover,i.hover,j[""]);j.select=a.convertAttribs(c.select,i.select,j[""])}else j=i;g.pointAttr=j}},destroy:function(){var a=this,b=a.chart,c=/AppleWebKit\/533/.test(na),d,e,f=a.data||[],g,h,i;F(a,"destroy");R(a);o(["xAxis","yAxis"],function(b){if(i=a[b])ta(i.series,a),i.isDirty=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(e=f.length;e--;)(g=f[e])&&g.destroy&&g.destroy();a.points=null;clearTimeout(a.animationTimeout);
-o("area,graph,dataLabelsGroup,group,markerGroup,tracker,trackerGroup".split(","),function(b){a[b]&&(d=c&&b==="group"?"hide":"destroy",a[b][d]())});if(b.hoverSeries===a)b.hoverSeries=null;ta(b.series,a);for(h in a)delete a[h]},drawDataLabels:function(){var a=this,b=a.options.dataLabels,c=a.points,d,e,f,g;if(b.enabled||a._hasPointLabels)a.dlProcessOptions&&a.dlProcessOptions(b),g=a.plotGroup("dataLabelsGroup","data-labels",a.visible?"visible":"hidden",b.zIndex||6),e=b,o(c,function(c){var i,j=c.dataLabel,
-k,l=!0;d=c.options&&c.options.dataLabels;i=e.enabled||d&&d.enabled;if(j&&!i)c.dataLabel=j.destroy();else if(i){i=b.rotation;b=B(e,d);f=b.formatter.call(c.getLabelConfig(),b);b.style.color=n(b.color,b.style.color,a.color,"black");if(j)j.attr({text:f}),l=!1;else if(r(f)){j={fill:b.backgroundColor,stroke:b.borderColor,"stroke-width":b.borderWidth,r:b.borderRadius||0,rotation:i,padding:b.padding,zIndex:1};for(k in j)j[k]===A&&delete j[k];j=c.dataLabel=a.chart.renderer[i?"text":"label"](f,0,-999,null,
-null,null,b.useHTML).attr(j).css(b.style).add(g).shadow(b.shadow)}j&&a.alignDataLabel(c,j,b,null,l)}})},alignDataLabel:function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=n(a.plotX,-999),a=n(a.plotY,-999),i=b.getBBox(),d=x({x:g?f.plotWidth-a:h,y:u(g?f.plotHeight-h:a),width:0,height:0},d);x(c,{width:i.width,height:i.height});c.rotation?(d={align:c.align,x:d.x+c.x+d.width/2,y:d.y+c.y+d.height/2},b[e?"attr":"animate"](d)):(b.align(c,null,d),d=b.alignAttr);b.attr({visibility:c.crop===!1||f.isInsidePlot(d.x,
-d.y)||f.isInsidePlot(h,a,g)?f.renderer.isSVG?"inherit":"visible":"hidden"})},getSegmentPath:function(a){var b=this,c=[],d=b.options.step;o(a,function(e,f){var g=e.plotX,h=e.plotY,i;b.getPointSpline?c.push.apply(c,b.getPointSpline(a,e,f)):(c.push(f?"L":"M"),d&&f&&(i=a[f-1],d==="right"?c.push(i.plotX,h):d==="center"?c.push((i.plotX+g)/2,i.plotY,(i.plotX+g)/2,h):c.push(g,i.plotY)),c.push(e.plotX,e.plotY))});return c},getGraphPath:function(){var a=this,b=[],c,d=[];o(a.segments,function(e){c=a.getSegmentPath(e);
-e.length>1?b=b.concat(c):d.push(e[0])});a.singlePoints=d;return a.graphPath=b},drawGraph:function(){var a=this.options,b=this.graph,c=this.group,d=a.lineColor||this.color,e=a.lineWidth,f=a.dashStyle,g=this.getGraphPath();if(b)fb(b),b.animate({d:g});else if(e){b={stroke:d,"stroke-width":e,zIndex:1};if(f)b.dashstyle=f;this.graph=this.chart.renderer.path(g).attr(b).add(c).shadow(a.shadow)}},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};o(["group","trackerGroup","markerGroup"],
-function(c){b[c]&&b[c].attr(a).invert()})}var b=this,c=b.chart;J(c,"resize",a);J(b,"destroy",function(){R(c,"resize",a)});a();b.invertGroups=a},plotGroup:function(a,b,c,d,e){var f=this[a],g=this.chart,h=this.xAxis,i=this.yAxis;f||(this[a]=f=g.renderer.g(b).attr({visibility:c,zIndex:d||0.1}).add(e));f.translate(h?h.left:g.plotLeft,i?i.top:g.plotTop);return f},render:function(){var a=this.chart,b,c=this.options,d=c.animation&&!!this.animate,e=this.visible?"visible":"hidden",f=c.zIndex,g=this.hasRendered,
-h=a.seriesGroup;b=this.plotGroup("group","series",e,f,h);this.markerGroup=this.plotGroup("markerGroup","markers",e,f,h);d&&this.animate(!0);this.getAttribs();b.inverted=a.inverted;this.drawGraph&&this.drawGraph();this.drawPoints();this.drawDataLabels();this.options.enableMouseTracking!==!1&&this.drawTracker();a.inverted&&this.invertGroups();c.clip!==!1&&!this.sharedClipKey&&!g&&(b.clip(a.clipRect),this.trackerGroup&&this.trackerGroup.clip(a.clipRect));d?this.animate():g||this.afterAnimate();this.isDirty=
-this.isDirtyData=!1;this.hasRendered=!0},redraw:function(){var a=this.chart,b=this.isDirtyData,c=this.group;c&&(a.inverted&&c.attr({width:a.plotWidth,height:a.plotHeight}),c.animate({translateX:this.xAxis.left,translateY:this.yAxis.top}));this.translate();this.setTooltipPoints(!0);this.render();b&&F(this,"updatedData")},setState:function(a){var b=this.options,c=this.graph,d=b.states,b=b.lineWidth,a=a||"";if(this.state!==a)this.state=a,d[a]&&d[a].enabled===!1||(a&&(b=d[a].lineWidth||b+1),c&&!c.dashstyle&&
-c.attr({"stroke-width":b},a?0:500))},setVisible:function(a,b){var c=this.chart,d=this.legendItem,e=this.group,f=this.tracker,g=this.dataLabelsGroup,h=this.markerGroup,i,j=this.points,k=c.options.chart.ignoreHiddenSeries;i=this.visible;i=(this.visible=a=a===A?!i:a)?"show":"hide";if(e)e[i]();if(h)h[i]();if(f)f[i]();else if(j)for(e=j.length;e--;)if(f=j[e],f.tracker)f.tracker[i]();if(c.hoverSeries===this)this.onMouseOut();if(g)g[i]();d&&c.legend.colorizeItem(this,a);this.isDirty=!0;this.options.stacking&&
-o(c.series,function(a){if(a.options.stacking&&a.visible)a.isDirty=!0});if(k)c.isDirtyBox=!0;b!==!1&&c.redraw();F(this,i)},show:function(){this.setVisible(!0)},hide:function(){this.setVisible(!1)},select:function(a){this.selected=a=a===A?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;F(this,a?"select":"unselect")},drawTracker:function(){var a=this,b=a.options,c=b.trackByArea,d=[].concat(c?a.areaPath:a.graphPath),e=d.length,f=a.chart,g=f.renderer,h=f.options.tooltip.snap,i=a.tracker,j=b.cursor,
-j=j&&{cursor:j},k=a.singlePoints,l=this.isCartesian&&this.plotGroup("trackerGroup",null,"visible",b.zIndex||1,f.trackerGroup),m,n=function(){if(f.hoverSeries!==a)a.onMouseOver()},o=function(){if(!b.stickyTracking)a.onMouseOut()};if(e&&!c)for(m=e+1;m--;)d[m]==="M"&&d.splice(m+1,0,d[m+1]-h,d[m+2],"L"),(m&&d[m]==="M"||m===e)&&d.splice(m,0,"L",d[m-2]+h,d[m-1]);for(m=0;m<k.length;m++)e=k[m],d.push("M",e.plotX-h,e.plotY,"L",e.plotX+h,e.plotY);if(i)i.attr({d:d});else if(a.tracker=i=g.path(d).attr({isTracker:!0,
-"stroke-linejoin":"round",visibility:a.visible?"visible":"hidden",stroke:vb,fill:c?vb:Q,"stroke-width":b.lineWidth+(c?0:2*h)}).on("mouseover",n).on("mouseout",o).css(j).add(l),Ba)i.on("touchstart",n)}};G=ba(P);$.line=G;X.area=B(ea,{threshold:0});G=ba(P,{type:"area",getSegmentPath:function(a){var b=P.prototype.getSegmentPath.call(this,a),c=[].concat(b),d,e=this.options;b.length===3&&c.push("L",b[1],b[2]);if(e.stacking&&!this.closedStacks)for(d=a.length-1;d>=0;d--)d<a.length-1&&e.step&&c.push(a[d+1].plotX,
-a[d].yBottom),c.push(a[d].plotX,a[d].yBottom);else this.closeSegment(c,a);this.areaPath=this.areaPath.concat(c);return b},closeSegment:function(a,b){var c=this.yAxis.getThreshold(this.options.threshold);a.push("L",b[b.length-1].plotX,c,"L",b[0].plotX,c)},drawGraph:function(){this.areaPath=[];P.prototype.drawGraph.apply(this);var a=this.areaPath,b=this.options,c=this.area;c?c.animate({d:a}):this.area=this.chart.renderer.path(a).attr({fill:n(b.fillColor,qa(this.color).setOpacity(b.fillOpacity||0.75).get()),
-zIndex:0}).add(this.group)},drawLegendSymbol:function(a,b){b.legendSymbol=this.chart.renderer.rect(0,a.baseline-11,a.options.symbolWidth,12,2).attr({zIndex:3}).add(b.legendGroup)}});$.area=G;X.spline=B(ea);fa=ba(P,{type:"spline",getPointSpline:function(a,b,c){var d=b.plotX,e=b.plotY,f=a[c-1],g=a[c+1],h,i,j,k;if(f&&g){a=f.plotY;j=g.plotX;var g=g.plotY,l;h=(1.5*d+f.plotX)/2.5;i=(1.5*e+a)/2.5;j=(1.5*d+j)/2.5;k=(1.5*e+g)/2.5;l=(k-i)*(j-d)/(j-h)+e-k;i+=l;k+=l;i>a&&i>e?(i=s(a,e),k=2*e-i):i<a&&i<e&&(i=O(a,
-e),k=2*e-i);k>g&&k>e?(k=s(g,e),i=2*e-k):k<g&&k<e&&(k=O(g,e),i=2*e-k);b.rightContX=j;b.rightContY=k}c?(b=["C",f.rightContX||f.plotX,f.rightContY||f.plotY,h||d,i||e,d,e],f.rightContX=f.rightContY=null):b=["M",d,e];return b}});$.spline=fa;X.areaspline=B(X.area);var Ca=G.prototype,fa=ba(fa,{type:"areaspline",closedStacks:!0,getSegmentPath:Ca.getSegmentPath,closeSegment:Ca.closeSegment,drawGraph:Ca.drawGraph});$.areaspline=fa;X.column=B(ea,{borderColor:"#FFFFFF",borderWidth:1,borderRadius:0,groupPadding:0.2,
-marker:null,pointPadding:0.1,minPointLength:0,cropThreshold:50,pointRange:null,states:{hover:{brightness:0.1,shadow:!1},select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}},dataLabels:{align:null,verticalAlign:null,y:null},threshold:0});fa=ba(P,{type:"column",tooltipOutsidePlot:!0,pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color",r:"borderRadius"},init:function(){P.prototype.init.apply(this,arguments);var a=this,b=a.chart;b.hasRendered&&o(b.series,function(b){if(b.type===
-a.type)b.isDirty=!0})},translate:function(){var a=this,b=a.chart,c=a.options,d=c.stacking,e=c.borderWidth,f=0,g=a.xAxis,h=a.yAxis,i=g.reversed,j={},k,l;P.prototype.translate.apply(a);c.grouping===!1?f=1:o(b.series,function(b){var c=b.options;if(b.type===a.type&&b.visible&&a.options.group===c.group)c.stacking?(k=b.stackKey,j[k]===A&&(j[k]=f++),l=j[k]):c.grouping!==!1&&(l=f++),b.columnIndex=l});var m=a.points,g=M(g.transA)*(g.ordinalSlope||c.pointRange||g.closestPointRange||1),q=g*c.groupPadding,p=
-(g-2*q)/f,y=c.pointWidth,t=r(y)?(p-y)/2:p*c.pointPadding,u=n(y,p-2*t),x=za(s(u,1+2*e)),v=t+(q+((i?f-(a.columnIndex||0):a.columnIndex)||0)*p-g/2)*(i?-1:1),z=a.translatedThreshold=h.getThreshold(c.threshold),w=n(c.minPointLength,5);o(m,function(c){var f=O(s(-999,c.plotY),h.len+999),g=n(c.yBottom,z),i=c.plotX+v,j=za(O(f,g)),k=za(s(f,g)-j),l=h.stacks[(c.y<0?"-":"")+a.stackKey];d&&a.visible&&l&&l[c.x]&&l[c.x].setOffset(v,x);M(k)<w&&w&&(k=w,j=M(j-z)>w?g-w:z-(f<=z?w:0));c.barX=i;c.pointWidth=u;c.shapeType=
-"rect";c.shapeArgs=f=b.renderer.Element.prototype.crisp.call(0,e,i,j,x,k);e%2&&(f.y-=1,f.height+=1);c.trackerArgs=M(k)<3&&B(c.shapeArgs,{height:6,y:j-3})})},getSymbol:pa,drawLegendSymbol:G.prototype.drawLegendSymbol,drawGraph:pa,drawPoints:function(){var a=this,b=a.options,c=a.chart.renderer,d;o(a.points,function(e){var f=e.plotY,g=e.graphic;if(f!==A&&!isNaN(f)&&e.y!==null)d=e.shapeArgs,g?(fb(g),g.animate(B(d))):e.graphic=c[e.shapeType](d).attr(e.pointAttr[e.selected?"select":""]).add(a.group).shadow(b.shadow,
-null,b.stacking&&!b.borderRadius);else if(g)e.graphic=g.destroy()})},drawTracker:function(){for(var a=this,b=a.chart,c=b.renderer,d,e,f=+new Date,g=a.options,h=(d=g.cursor)&&{cursor:d},i=a.isCartesian&&a.plotGroup("trackerGroup",null,"visible",g.zIndex||1,b.trackerGroup),j,k,l=a.points,m,n=l.length,o=function(c){j=c.relatedTarget||c.fromElement;if(b.hoverSeries!==a&&w(j,"isTracker")!==f)a.onMouseOver();l[c.target._i].onMouseOver()},r=function(b){if(!g.stickyTracking&&(j=b.relatedTarget||b.toElement,
-w(j,"isTracker")!==f))a.onMouseOut()};n--;)if(m=l[n],e=m.tracker,d=m.trackerArgs||m.shapeArgs,k=m.plotY,k=!a.isCartesian||k!==A&&!isNaN(k),delete d.strokeWidth,m.y!==null&&k){if(e)e.attr(d);else if(m.tracker=e=c[m.shapeType](d).attr({isTracker:f,fill:vb,visibility:a.visible?"visible":"hidden"}).on("mouseover",o).on("mouseout",r).css(h).add(m.group||i),Ba)e.on("touchstart",o);e.element._i=n}},alignDataLabel:function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=a.below||a.plotY>n(this.translatedThreshold,
-f.plotSizeY),i=this.options.stacking||c.inside;if(a.shapeArgs&&(d=B(a.shapeArgs),g&&(d={x:f.plotWidth-d.y-d.height,y:f.plotHeight-d.x-d.width,width:d.height,height:d.width}),!i))g?(d.x+=h?0:d.width,d.width=0):(d.y+=h?d.height:0,d.height=0);c.align=n(c.align,!g||i?"center":h?"right":"left");c.verticalAlign=n(c.verticalAlign,g||i?"middle":h?"top":"bottom");P.prototype.alignDataLabel.call(this,a,b,c,d,e)},animate:function(a){var b=this,c=b.points,d=b.options;if(!a)o(c,function(a){var c=a.graphic,a=a.shapeArgs,
-g=b.yAxis,h=d.threshold;c&&(c.attr({height:0,y:r(h)?g.getThreshold(h):g.translate(g.getExtremes().min,0,1,0,1)}),c.animate({height:a.height,y:a.y},d.animation))}),b.animate=null},remove:function(){var a=this,b=a.chart;b.hasRendered&&o(b.series,function(b){if(b.type===a.type)b.isDirty=!0});P.prototype.remove.apply(a,arguments)}});$.column=fa;X.bar=B(X.column);Ca=ba(fa,{type:"bar",inverted:!0});$.bar=Ca;X.scatter=B(ea,{lineWidth:0,states:{hover:{lineWidth:0}},tooltip:{headerFormat:'<span style="font-size: 10px; color:{series.color}">{series.name}</span><br/>',
-pointFormat:"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>"}});Ca=ba(P,{type:"scatter",sorted:!1,requireSorting:!1,translate:function(){var a=this;P.prototype.translate.apply(a);o(a.points,function(b){b.shapeType="circle";b.shapeArgs={x:b.plotX,y:b.plotY,r:a.chart.options.tooltip.snap}})},drawTracker:function(){for(var a=this,b=a.options.cursor,b=b&&{cursor:b},c=a.points,d=c.length,e,f=a.markerGroup,g=function(b){a.onMouseOver();if(b.target._i!==A)c[b.target._i].onMouseOver()};d--;)if(e=c[d].graphic)e.element._i=
-d;if(a._hasTracking)a._hasTracking=!0;else if(f.attr({isTracker:!0}).on("mouseover",g).on("mouseout",function(){if(!a.options.stickyTracking)a.onMouseOut()}).css(b),Ba)f.on("touchstart",g)},setTooltipPoints:pa});$.scatter=Ca;X.pie=B(ea,{borderColor:"#FFFFFF",borderWidth:1,center:["50%","50%"],colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name}},legendType:"point",marker:null,size:"75%",showInLegend:!1,slicedOffset:10,states:{hover:{brightness:0.1,shadow:!1}}});
-pa={type:"pie",isCartesian:!1,pointClass:ba(Ua,{init:function(){Ua.prototype.init.apply(this,arguments);var a=this,b;x(a,{visible:a.visible!==!1,name:n(a.name,"Slice")});b=function(){a.slice()};J(a,"select",b);J(a,"unselect",b);return a},setVisible:function(a){var b=this.series,c=b.chart,d=this.tracker,e=this.dataLabel,f=this.connector,g=this.shadowGroup,h;h=(this.visible=a=a===A?!this.visible:a)?"show":"hide";this.group[h]();if(d)d[h]();if(e)e[h]();if(f)f[h]();if(g)g[h]();this.legendItem&&c.legend.colorizeItem(this,
-a);if(!b.isDirty&&b.options.ignoreHiddenPoint)b.isDirty=!0,c.redraw()},slice:function(a,b,c){var d=this.series.chart,e=this.slicedTranslation;xa(c,d);n(b,!0);a=this.sliced=r(a)?a:!this.sliced;a={translateX:a?e[0]:d.plotLeft,translateY:a?e[1]:d.plotTop};this.group.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)}}),requireSorting:!1,pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},getColor:function(){this.initialColor=this.chart.counters.color},animate:function(){var a=
-this,b=a.startAngleRad;o(a.points,function(c){var d=c.graphic,c=c.shapeArgs;d&&(d.attr({r:a.center[3]/2,start:b,end:b}),d.animate({r:c.r,start:c.start,end:c.end},a.options.animation))});a.animate=null},setData:function(a,b){P.prototype.setData.call(this,a,!1);this.processData();this.generatePoints();n(b,!0)&&this.chart.redraw()},getCenter:function(){var a=this.options,b=this.chart,c=b.plotWidth,d=b.plotHeight,a=a.center.concat([a.size,a.innerSize||0]),e=O(c,d),f;return Ta(a,function(a,b){return(f=
-/%$/.test(a))?[c,d,e,e][b]*z(a)/100:a})},translate:function(){this.generatePoints();var a=0,b=0,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f,g=this.chart,h,i,j,k=this.startAngleRad=Aa/180*((c.startAngle||0)%360-90),l=this.points,m=2*Aa,n=c.dataLabels.distance,o=c.ignoreHiddenPoint,r,t=l.length,s;this.center=f=this.getCenter();this.getX=function(a,b){j=K.asin((a-f[1])/(f[2]/2+n));return f[0]+(b?-1:1)*W(j)*(f[2]/2+n)};for(r=0;r<t;r++)s=l[r],a+=o&&!s.visible?0:s.y;for(r=0;r<t;r++){s=l[r];c=a?
-s.y/a:0;h=u((k+b*m)*1E3)/1E3;if(!o||s.visible)b+=c;i=u((k+b*m)*1E3)/1E3;s.shapeType="arc";s.shapeArgs={x:f[0],y:f[1],r:f[2]/2,innerR:f[3]/2,start:h,end:i};j=(i+h)/2;j>0.75*m&&(j-=2*Aa);s.slicedTranslation=Ta([W(j)*d+g.plotLeft,Z(j)*d+g.plotTop],u);h=W(j)*f[2]/2;i=Z(j)*f[2]/2;s.tooltipPos=[f[0]+h*0.7,f[1]+i*0.7];s.half=j<m/4?0:1;s.angle=j;s.labelPos=[f[0]+h+W(j)*n,f[1]+i+Z(j)*n,f[0]+h+W(j)*e,f[1]+i+Z(j)*e,f[0]+h,f[1]+i,n<0?"center":s.half?"right":"left",j];s.percentage=c*100;s.total=a}this.setTooltipPoints()},
-render:function(){this.getAttribs();this.drawPoints();this.options.enableMouseTracking!==!1&&this.drawTracker();this.drawDataLabels();this.options.animation&&this.animate&&this.animate();this.isDirty=!1},drawPoints:function(){var a=this,b=a.chart,c=b.renderer,d,e,f,g=a.options.shadow,h,i;o(a.points,function(j){e=j.graphic;i=j.shapeArgs;f=j.group;h=j.shadowGroup;if(g&&!h)h=j.shadowGroup=c.g("shadow").attr({zIndex:4}).add();if(!f)f=j.group=c.g("point").attr({zIndex:5}).add();d=j.sliced?j.slicedTranslation:
-[b.plotLeft,b.plotTop];f.translate(d[0],d[1]);h&&h.translate(d[0],d[1]);e?e.animate(i):j.graphic=e=c.arc(i).setRadialReference(a.center).attr(x(j.pointAttr[""],{"stroke-linejoin":"round"})).add(j.group).shadow(g,h);j.visible===!1&&j.setVisible(!1)})},drawDataLabels:function(){var a=this.data,b,c=this.chart,d=this.options.dataLabels,e=n(d.connectorPadding,10),f=n(d.connectorWidth,1),g,h,i=n(d.softConnector,!0),j=d.distance,k=this.center,l=k[2]/2,m=k[1],q=j>0,p=[[],[]],r,t,s,u=2,v,x=function(a,b){return b.y-
-a.y},z=function(a,b){a.sort(function(a,c){return(c.angle-a.angle)*b})};if(d.enabled||this._hasPointLabels){P.prototype.drawDataLabels.apply(this);o(a,function(a){a.dataLabel&&p[a.half].push(a)});for(a=p[0][0]&&p[0][0].dataLabel&&(p[0][0].dataLabel.getBBox().height||21);u--;){var w=[],A=[],B=p[u],C=B.length,D;z(B,u-0.5);if(j>0){for(v=m-l-j;v<=m+l+j;v+=a)w.push(v);s=w.length;if(C>s){h=[].concat(B);h.sort(x);for(v=C;v--;)h[v].rank=v;for(v=C;v--;)B[v].rank>=s&&B.splice(v,1);C=B.length}for(v=0;v<C;v++){b=
-B[v];h=b.labelPos;b=9999;for(t=0;t<s;t++)g=M(w[t]-h[1]),g<b&&(b=g,D=t);if(D<v&&w[v]!==null)D=v;else for(s<C-v+D&&w[v]!==null&&(D=s-C+v);w[D]===null;)D++;A.push({i:D,y:w[D]});w[D]=null}A.sort(x)}for(v=0;v<C;v++){b=B[v];h=b.labelPos;g=b.dataLabel;s=b.visible===!1?"hidden":"visible";r=h[1];if(j>0){if(t=A.pop(),D=t.i,t=t.y,r>t&&w[D+1]!==null||r<t&&w[D-1]!==null)t=r}else t=r;r=d.justify?k[0]+(u?-1:1)*(l+j):this.getX(D===0||D===w.length-1?r:t,u);g.attr({visibility:s,align:h[6]})[g.moved?"animate":"attr"]({x:r+
-d.x+({left:e,right:-e}[h[6]]||0),y:t+d.y-10});g.moved=!0;if(q&&f)g=b.connector,h=i?["M",r+(h[6]==="left"?5:-5),t,"C",r,t,2*h[2]-h[4],2*h[3]-h[5],h[2],h[3],"L",h[4],h[5]]:["M",r+(h[6]==="left"?5:-5),t,"L",h[2],h[3],"L",h[4],h[5]],g?(g.animate({d:h}),g.attr("visibility",s)):b.connector=g=this.chart.renderer.path(h).attr({"stroke-width":f,stroke:d.connectorColor||b.color||"#606060",visibility:s,zIndex:3}).translate(c.plotLeft,c.plotTop).add()}}}},alignDataLabel:pa,drawTracker:fa.prototype.drawTracker,
-drawLegendSymbol:G.prototype.drawLegendSymbol,getSymbol:function(){}};pa=ba(P,pa);$.pie=pa;x(Highcharts,{Axis:ob,CanVGRenderer:gb,Chart:sb,Color:qa,Legend:rb,MouseTracker:qb,Point:Ua,Tick:Qa,Tooltip:pb,Renderer:Sa,Series:P,SVGRenderer:sa,VMLRenderer:ha,arrayMin:Fa,arrayMax:wa,charts:Ha,dateFormat:db,pathAnim:ub,getOptions:function(){return N},hasBidiBug:Sb,isTouchDevice:Mb,numberFormat:Ja,seriesTypes:$,setOptions:function(a){N=B(N,a);Jb();return N},addEvent:J,removeEvent:R,createElement:T,discardElement:Na,
-css:I,each:o,extend:x,map:Ta,merge:B,pick:n,splat:la,extendClass:ba,pInt:z,wrap:function(a,b,c){var d=a[b];a[b]=function(){var a=Array.prototype.slice.call(arguments);a.unshift(d);return c.apply(this,a)}},svg:ca,canvas:V,vml:!ca&&!V,product:"Highcharts",version:"2.3.5"})})();
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js
deleted file mode 100644
index 006e953102ded2db8e217e4507de3baa8bcc976d..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
-//@ sourceMappingURL=jquery.min.map
-*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
-return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
-}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
deleted file mode 100644
index 95ac7839a22fe3454fcc4ddb3484b1dad9271637..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
+++ /dev/null
@@ -1,11 +0,0 @@
-     <tr>
-      <td class="{methods_level}" colspan="4">{name}</td>
-      <td class="{methods_level} big">{methods_bar}</td>
-      <td class="{methods_level} small"><div align="right">{methods_tested_percent}</div></td>
-      <td class="{methods_level} small"><div align="right">{methods_number}</div></td>
-      <td class="{methods_level} small">{crap}</td>
-      <td class="{lines_level} big">{lines_bar}</td>
-      <td class="{lines_level} small"><div align="right">{lines_executed_percent}</div></td>
-      <td class="{lines_level} small"><div align="right">{lines_number}</div></td>
-     </tr>
-
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util.php b/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util.php
deleted file mode 100644
index 5a4673ccdd82afc5e628e9e60673d589c7009adb..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.0.0
- */
-
-/**
- * Utility methods.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.0.0
- */
-class PHP_CodeCoverage_Util
-{
-    /**
-     * @var array
-     */
-    protected static $ignoredLines = array();
-
-    /**
-     * @var array
-     */
-    protected static $ids = array();
-
-
-    /**
-     * Returns the lines of a source file that should be ignored.
-     *
-     * @param  string  $filename
-     * @param  boolean $cacheTokens
-     * @return array
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
-    {
-        if (!is_string($filename)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'string'
-            );
-        }
-
-        if (!is_bool($cacheTokens)) {
-            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              2, 'boolean'
-            );
-        }
-
-        if (!isset(self::$ignoredLines[$filename])) {
-            self::$ignoredLines[$filename] = array();
-            $ignore                        = FALSE;
-            $stop                          = FALSE;
-            $lines                         = file($filename);
-
-            foreach ($lines as $index => $line) {
-                if (!trim($line)) {
-                    self::$ignoredLines[$filename][$index+1] = TRUE;
-                }
-            }
-
-            if ($cacheTokens) {
-                $tokens = PHP_Token_Stream_CachingFactory::get($filename);
-            } else {
-                $tokens = new PHP_Token_Stream($filename);
-            }
-
-            $classes = array_merge($tokens->getClasses(), $tokens->getTraits());
-            $tokens  = $tokens->tokens();
-
-            foreach ($tokens as $token) {
-                switch (get_class($token)) {
-                    case 'PHP_Token_COMMENT':
-                    case 'PHP_Token_DOC_COMMENT': {
-
-                        $_token = trim($token);
-                        $_line  = trim($lines[$token->getLine() - 1]);
-
-                        if ($_token == '// @codeCoverageIgnore' ||
-                            $_token == '//@codeCoverageIgnore') {
-                            $ignore = TRUE;
-                            $stop   = TRUE;
-                        }
-
-                        else if ($_token == '// @codeCoverageIgnoreStart' ||
-                                 $_token == '//@codeCoverageIgnoreStart') {
-                            $ignore = TRUE;
-                        }
-
-                        else if ($_token == '// @codeCoverageIgnoreEnd' ||
-                                 $_token == '//@codeCoverageIgnoreEnd') {
-                            $stop = TRUE;
-                        }
-
-                        // be sure the comment doesn't have some token BEFORE it on the same line...
-                        // it would not be safe to ignore the whole line in those cases.
-                        if (0 === strpos($_token, $_line)) {
-                            $count = substr_count($token, "\n");
-                            $line  = $token->getLine();
-
-                            for ($i = $line; $i < $line + $count; $i++) {
-                                self::$ignoredLines[$filename][$i] = TRUE;
-                            }
-
-                            if ($token instanceof PHP_Token_DOC_COMMENT) {
-                                // Workaround for the fact the DOC_COMMENT token
-                                // does not include the final \n character in its
-                                // text.
-                                if (substr(trim($lines[$i-1]), -2) == '*/') {
-                                    self::$ignoredLines[$filename][$i] = TRUE;
-                                }
-                            }
-                        }
-                    }
-                    break;
-
-                    case 'PHP_Token_INTERFACE':
-                    case 'PHP_Token_TRAIT':
-                    case 'PHP_Token_CLASS':
-                    case 'PHP_Token_FUNCTION': {
-                        $docblock = $token->getDocblock();
-
-                        if (strpos($docblock, '@codeCoverageIgnore')) {
-                            $endLine = $token->getEndLine();
-
-                            for ($i = $token->getLine(); $i <= $endLine; $i++) {
-                                self::$ignoredLines[$filename][$i] = TRUE;
-                            }
-                        }
-
-                        else if ($token instanceof PHP_Token_INTERFACE ||
-                                 $token instanceof PHP_Token_TRAIT ||
-                                 $token instanceof PHP_Token_CLASS) {
-                            if (empty($classes[$token->getName()]['methods'])) {
-                                for ($i = $token->getLine();
-                                     $i <= $token->getEndLine();
-                                     $i++) {
-                                    self::$ignoredLines[$filename][$i] = TRUE;
-                                }
-                            } else {
-                                $firstMethod = array_shift(
-                                  $classes[$token->getName()]['methods']
-                                );
-
-                                $lastMethod = array_pop(
-                                  $classes[$token->getName()]['methods']
-                                );
-
-                                if ($lastMethod === NULL) {
-                                    $lastMethod = $firstMethod;
-                                }
-
-                                for ($i = $token->getLine();
-                                     $i < $firstMethod['startLine'];
-                                     $i++) {
-                                    self::$ignoredLines[$filename][$i] = TRUE;
-                                }
-
-                                for ($i = $token->getEndLine();
-                                     $i > $lastMethod['endLine'];
-                                     $i--) {
-                                    self::$ignoredLines[$filename][$i] = TRUE;
-                                }
-                            }
-                        }
-                    }
-                    break;
-
-                    case 'PHP_Token_INTERFACE': {
-                        $endLine = $token->getEndLine();
-
-                        for ($i = $token->getLine(); $i <= $endLine; $i++) {
-                            self::$ignoredLines[$filename][$i] = TRUE;
-                        }
-                    }
-                    break;
-
-                    case 'PHP_Token_NAMESPACE': {
-                        self::$ignoredLines[$filename][$token->getEndLine()] = TRUE;
-                    } // Intentional fallthrough
-                    case 'PHP_Token_OPEN_TAG':
-                    case 'PHP_Token_CLOSE_TAG':
-                    case 'PHP_Token_USE': {
-                        self::$ignoredLines[$filename][$token->getLine()] = TRUE;
-                    }
-                    break;
-                }
-
-                if ($ignore) {
-                    self::$ignoredLines[$filename][$token->getLine()] = TRUE;
-
-                    if ($stop) {
-                        $ignore = FALSE;
-                        $stop   = FALSE;
-                    }
-                }
-            }
-        }
-
-        return self::$ignoredLines[$filename];
-    }
-
-    /**
-     * @param  float $a
-     * @param  float $b
-     * @return float ($a / $b) * 100
-     */
-    public static function percent($a, $b, $asString = FALSE, $fixedWidth = FALSE)
-    {
-        if ($asString && $b == 0) {
-            return '';
-        }
-
-        if ($b > 0) {
-            $percent = ($a / $b) * 100;
-        } else {
-            $percent = 100;
-        }
-
-        if ($asString) {
-            if ($fixedWidth) {
-                return sprintf('%6.2F%%', $percent);
-            }
-
-            return sprintf('%01.2F%%', $percent);
-        } else {
-            return $percent;
-        }
-    }
-}
diff --git a/core/vendor/phpunit/php-code-coverage/README.markdown b/core/vendor/phpunit/php-code-coverage/README.markdown
deleted file mode 100644
index 61d7837af21243fa45fb98691d3a1ec8ff768a4f..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/README.markdown
+++ /dev/null
@@ -1,53 +0,0 @@
-# PHP_CodeCoverage
-
-**PHP_CodeCoverage** is a library that provides collection, processing, and rendering functionality for PHP code coverage information.
-
-## Requirements
-
-* PHP_CodeCoverage 1.2 requires PHP 5.3.3 (or later) but PHP 5.4.7 (or later) is highly recommended.
-* [Xdebug](http://xdebug.org/) 2.0.5 (or later) is required but Xdebug 2.2.1 (or later) is highly recommended.
-
-## Installation
-
-You can use the [PEAR Installer](http://pear.php.net/manual/en/guide.users.commandline.cli.php) or [Composer](http://getcomposer.org/) to download and install PHP_CodeCoverage as well as its dependencies
-
-### PEAR Installer
-
-Depending on your OS distribution and/or your PHP environment, you may need to install PEAR or update your existing PEAR installation before you can proceed with the following instructions. `sudo pear upgrade PEAR` usually suffices to upgrade an existing PEAR installation. The [PEAR Manual ](http://pear.php.net/manual/en/installation.getting.php) explains how to perform a fresh installation of PEAR.
-
-The following two commands (which you may have to run as `root`) are all that is required to install PHP_CodeCoverage using the PEAR Installer:
-
-    pear config-set auto_discover 1
-    pear install pear.phpunit.de/PHP_CodeCoverage
-
-After the installation you can find the PHP_CodeCoverage source files inside your local PEAR directory; the path is usually `/usr/lib/php/PHP/CodeCoverage`.
-
-### Composer
-
-To add PHP_CodeCoverage as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-code-coverage` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_CodeCoverage 1.2:
-
-    {
-        "require": {
-            "phpunit/php-code-coverage": ">=1.2.10,<1.3.0"
-        }
-    }
-
-## Using the PHP_CodeCoverage API
-
-```php
-<?php
-require 'PHP/CodeCoverage/Autoload.php';
-
-$coverage = new PHP_CodeCoverage;
-$coverage->start('<name of test>');
-
-// ...
-
-$coverage->stop();
-
-$writer = new PHP_CodeCoverage_Report_Clover;
-$writer->process($coverage, '/tmp/clover.xml');
-
-$writer = new PHP_CodeCoverage_Report_HTML;
-$writer->process($coverage, '/tmp/code-coverage-report');
-```
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/README.md b/core/vendor/phpunit/php-code-coverage/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..603d623a4ed7db27a903deb0203c9304c6363b97
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/README.md
@@ -0,0 +1,40 @@
+[![Latest Stable Version](https://poser.pugx.org/phpunit/php-code-coverage/v/stable.png)](https://packagist.org/packages/phpunit/php-code-coverage)
+[![Build Status](https://travis-ci.org/sebastianbergmann/php-code-coverage.png?branch=master)](https://travis-ci.org/sebastianbergmann/php-code-coverage)
+
+# PHP_CodeCoverage
+
+**PHP_CodeCoverage** is a library that provides collection, processing, and rendering functionality for PHP code coverage information.
+
+## Requirements
+
+* PHP 5.3.3 is required but using the latest version of PHP is highly recommended
+* [Xdebug](http://xdebug.org/) 2.1.3 is required but using the latest version of Xdebug is highly recommended
+
+## Installation
+
+To add PHP_CodeCoverage as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-code-coverage` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_CodeCoverage 2.1:
+
+    {
+        "require": {
+            "phpunit/php-code-coverage": "2.1.*"
+        }
+    }
+
+## Using the PHP_CodeCoverage API
+
+```php
+<?php
+$coverage = new PHP_CodeCoverage;
+$coverage->start('<name of test>');
+
+// ...
+
+$coverage->stop();
+
+$writer = new PHP_CodeCoverage_Report_Clover;
+$writer->process($coverage, '/tmp/clover.xml');
+
+$writer = new PHP_CodeCoverage_Report_HTML;
+$writer->process($coverage, '/tmp/code-coverage-report');
+```
+
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/UtilTest.php b/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/UtilTest.php
deleted file mode 100644
index f23ad7236c53c44832bd293553bccf43895e9f97..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/UtilTest.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @subpackage Tests
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.0.0
- */
-
-if (!defined('TEST_FILES_PATH')) {
-    define(
-      'TEST_FILES_PATH',
-      dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR .
-      '_files' . DIRECTORY_SEPARATOR
-    );
-}
-
-require_once TEST_FILES_PATH . 'CoverageClassExtendedTest.php';
-require_once TEST_FILES_PATH . 'CoverageClassTest.php';
-require_once TEST_FILES_PATH . 'CoverageFunctionTest.php';
-require_once TEST_FILES_PATH . 'CoverageFunctionParenthesesTest.php';
-require_once TEST_FILES_PATH . 'CoverageFunctionParenthesesWhitespaceTest.php';
-require_once TEST_FILES_PATH . 'CoverageMethodTest.php';
-require_once TEST_FILES_PATH . 'CoverageMethodOneLineAnnotationTest.php';
-require_once TEST_FILES_PATH . 'CoverageMethodParenthesesTest.php';
-require_once TEST_FILES_PATH . 'CoverageMethodParenthesesWhitespaceTest.php';
-require_once TEST_FILES_PATH . 'CoverageNoneTest.php';
-require_once TEST_FILES_PATH . 'CoverageNotPrivateTest.php';
-require_once TEST_FILES_PATH . 'CoverageNotProtectedTest.php';
-require_once TEST_FILES_PATH . 'CoverageNotPublicTest.php';
-require_once TEST_FILES_PATH . 'CoveragePrivateTest.php';
-require_once TEST_FILES_PATH . 'CoverageProtectedTest.php';
-require_once TEST_FILES_PATH . 'CoveragePublicTest.php';
-require_once TEST_FILES_PATH . 'CoverageTwoDefaultClassAnnotations.php';
-require_once TEST_FILES_PATH . 'CoveredClass.php';
-require_once TEST_FILES_PATH . 'CoveredFunction.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageClassExtendedTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageClassTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageCoversClassTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageCoversClassPublicTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageMethodTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageNotPrivateTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageNotProtectedTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageNotPublicTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoveragePrivateTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoverageProtectedTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoveragePublicTest.php';
-require_once TEST_FILES_PATH . 'NamespaceCoveredClass.php';
-require_once TEST_FILES_PATH . 'NotExistingCoveredElementTest.php';
-require_once TEST_FILES_PATH . 'CoverageNothingTest.php';
-/**
- * Tests for the PHP_CodeCoverage_Util class.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @subpackage Tests
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.0.0
- */
-class PHP_CodeCoverage_UtilTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers PHP_CodeCoverage_Util::getLinesToBeIgnored
-     */
-    public function testGetLinesToBeIgnored()
-    {
-        $this->assertEquals(
-          array(
-             1 => TRUE,
-             3 => TRUE,
-             4 => TRUE,
-             5 => TRUE,
-             7 => TRUE,
-             8 => TRUE,
-             9 => TRUE,
-            10 => TRUE,
-            11 => TRUE,
-            12 => TRUE,
-            13 => TRUE,
-            14 => TRUE,
-            15 => TRUE,
-            16 => TRUE,
-            17 => TRUE,
-            18 => TRUE,
-            19 => TRUE,
-            20 => TRUE,
-            21 => TRUE,
-            22 => TRUE,
-            23 => TRUE,
-            24 => TRUE,
-            25 => TRUE,
-            26 => TRUE,
-            27 => TRUE,
-            30 => TRUE,
-            32 => TRUE,
-            33 => TRUE,
-            34 => TRUE,
-            35 => TRUE,
-            36 => TRUE,
-            37 => TRUE,
-            38 => TRUE,
-          ),
-          PHP_CodeCoverage_Util::getLinesToBeIgnored(
-            TEST_FILES_PATH . 'source_with_ignore.php'
-          )
-        );
-    }
-
-    /**
-     * @covers PHP_CodeCoverage_Util::getLinesToBeIgnored
-     */
-    public function testGetLinesToBeIgnored2()
-    {
-        $this->assertEquals(
-          array(1 => TRUE),
-          PHP_CodeCoverage_Util::getLinesToBeIgnored(
-            TEST_FILES_PATH . 'source_without_ignore.php'
-          )
-        );
-    }
-
-    /**
-     * @covers PHP_CodeCoverage_Util::getLinesToBeIgnored
-     */
-    public function testGetLinesToBeIgnoredOneLineAnnotations()
-    {
-        $this->assertEquals(
-          array(
-            1 => TRUE,
-            2 => TRUE,
-            3 => TRUE,
-            4 => TRUE,
-            5 => TRUE,
-            6 => TRUE,
-            7 => TRUE,
-            8 => TRUE,
-            9 => TRUE,
-            10 => TRUE,
-            11 => TRUE,
-            12 => TRUE,
-            13 => TRUE,
-            14 => TRUE,
-            17 => TRUE,
-            19 => TRUE,
-            22 => TRUE,
-            23 => TRUE,
-            27 => TRUE,
-            28 => TRUE,
-            29 => TRUE,
-            30 => TRUE,
-            31 => TRUE,
-            32 => TRUE,
-            33 => TRUE,
-          ),
-          PHP_CodeCoverage_Util::getLinesToBeIgnored(
-            TEST_FILES_PATH . 'source_with_oneline_annotations.php'
-          )
-        );
-    }
-
-
-    /**
-     * @covers PHP_CodeCoverage_Util::percent
-     */
-    public function testPercent()
-    {
-        $this->assertEquals(100, PHP_CodeCoverage_Util::percent(100, 0));
-        $this->assertEquals(100, PHP_CodeCoverage_Util::percent(100, 100));
-        $this->assertEquals(
-          '100.00%', PHP_CodeCoverage_Util::percent(100, 100, TRUE)
-        );
-    }
-}
diff --git a/core/vendor/phpunit/php-code-coverage/build.xml b/core/vendor/phpunit/php-code-coverage/build.xml
index bace8afcd9fa44c93dd6a28d212acfafaa19845a..6604b76b8f6b18494688cb5ab01ed7ce410c6b76 100644
--- a/core/vendor/phpunit/php-code-coverage/build.xml
+++ b/core/vendor/phpunit/php-code-coverage/build.xml
@@ -1,162 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<project name="PHP_CodeCoverage" default="build">
- <property name="php" value="php"/>
- <property name="phpunit" value="phpunit"/>
-
- <target name="build"
-   depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpcb"/>
-
- <target name="build-parallel"
-   depends="prepare,lint,tools-parallel,phpunit,phpcb"/>
-
- <target name="tools-parallel"
-         description="Run tools in parallel">
-  <parallel threadCount="2">
-   <sequential>
-    <antcall target="pdepend"/>
-    <antcall target="phpmd-ci"/>
-   </sequential>
-   <antcall target="phpcpd"/>
-   <antcall target="phpcs-ci"/>
-   <antcall target="phploc"/>
-  </parallel>
- </target>
-
+<project name="PHP_CodeCoverage">
  <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/build/api"/>
-  <delete dir="${basedir}/build/code-browser"/>
-  <delete dir="${basedir}/build/coverage"/>
-  <delete dir="${basedir}/build/logs"/>
-  <delete dir="${basedir}/build/pdepend"/>
- </target>
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
 
- <target name="prepare" depends="clean,phpab"
-         description="Prepare for build">
-  <mkdir dir="${basedir}/build/api"/>
-  <mkdir dir="${basedir}/build/code-browser"/>
-  <mkdir dir="${basedir}/build/coverage"/>
-  <mkdir dir="${basedir}/build/logs"/>
-  <mkdir dir="${basedir}/build/pdepend"/>
- </target>
-
- <target name="phpab" description="Generate autoloader scripts">
-  <exec executable="phpab">
-   <arg value="--output" />
-   <arg path="PHP/CodeCoverage/Autoload.php" />
-   <arg value="--template" />
-   <arg path="PHP/CodeCoverage/Autoload.php.in" />
-   <arg value="--indent" />
-   <arg value="            " />
-   <arg path="PHP" />
-  </exec>
- </target>
-
- <target name="lint">
-  <apply executable="${php}" failonerror="true">
-   <arg value="-l" />
-
-   <fileset dir="${basedir}/PHP">
-    <include name="**/*.php" />
-    <modified />
-   </fileset>
-
-   <fileset dir="${basedir}/Tests">
-    <include name="**/*.php" />
-    <modified />
+  <delete>
+   <fileset dir="${basedir}/build">
+    <include name="**/*.phar" />
    </fileset>
-  </apply>
+  </delete>
  </target>
 
- <target name="phploc" description="Measure project size using PHPLOC">
-  <exec executable="phploc">
-   <arg value="--log-csv" />
-   <arg value="${basedir}/build/logs/phploc.csv" />
-   <arg path="${basedir}/PHP" />
-  </exec>
- </target>
-
- <target name="pdepend"
-         description="Calculate software metrics using PHP_Depend">
-  <exec executable="pdepend">
-   <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
-   <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
-   <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}/PHP" />
-  </exec>
- </target>
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
 
- <target name="phpmd"
-         description="Perform project mess detection using PHPMD">
-  <exec executable="phpmd">
-   <arg path="${basedir}/PHP" />
-   <arg value="text" />
-   <arg value="${basedir}/build/phpmd.xml" />
-  </exec>
- </target>
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
 
- <target name="phpmd-ci"
-         description="Perform project mess detection using PHPMD">
-  <exec executable="phpmd">
-   <arg path="${basedir}/PHP" />
-   <arg value="xml" />
-   <arg value="${basedir}/build/phpmd.xml" />
-   <arg value="--reportfile" />
-   <arg value="${basedir}/build/logs/pmd.xml" />
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
   </exec>
  </target>
 
- <target name="phpcs"
-         description="Find coding standard violations using PHP_CodeSniffer">
+ <target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer">
   <exec executable="phpcs">
-   <arg value="--standard=${basedir}/build/PHPCS" />
+   <arg value="--standard=PSR2" />
    <arg value="--extensions=php" />
-   <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHP" />
-   <arg path="${basedir}/Tests" />
-  </exec>
- </target>
-
- <target name="phpcs-ci"
-         description="Find coding standard violations using PHP_CodeSniffer">
-  <exec executable="phpcs" output="/dev/null">
-   <arg value="--report=checkstyle" />
-   <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
-   <arg value="--standard=${basedir}/build/PHPCS" />
-   <arg value="--extensions=php" />
-   <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHP" />
-   <arg path="${basedir}/Tests" />
-  </exec>
- </target>
-
- <target name="phpcpd" description="Find duplicate code using PHPCPD">
-  <exec executable="phpcpd">
-   <arg value="--log-pmd" />
-   <arg value="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/PHP" />
-  </exec>
- </target>
-
- <target name="phpunit" description="Run unit tests with PHPUnit">
-  <condition property="phpunit_cmd" value="${php} ${phpunit}" else="${phpunit}">
-   <not>
-    <equals arg1="${phpunit}" arg2="phpunit" />
-   </not>
-  </condition>
-
-  <exec executable="${phpunit_cmd}" failonerror="true"/>
- </target>
-
- <target name="phpcb"
-         description="Aggregate tool output with PHP_CodeBrowser">
-  <exec executable="phpcb">
-   <arg value="--log" />
-   <arg path="${basedir}/build/logs" />
-   <arg value="--source" />
-   <arg path="${basedir}/PHP" />
-   <arg value="--output" />
-   <arg path="${basedir}/build/code-browser" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
   </exec>
  </target>
 </project>
+
diff --git a/core/vendor/phpunit/php-code-coverage/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php b/core/vendor/phpunit/php-code-coverage/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
deleted file mode 100644
index bf9d520d3842e61c4602b5c46b5aaef140451248..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class PHPCS_Sniffs_ControlStructures_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
-{
-    public function __construct()
-    {
-        parent::__construct(true);
-    }
-
-    protected function getPatterns()
-    {
-        return array(
-          'do {EOL...} while (...);EOL',
-          'while (...) {EOL',
-          'for (...) {EOL',
-          'if (...) {EOL',
-          'foreach (...) {EOL',
-          '}EOLelse if (...) {EOL',
-          '}EOLelse {EOL',
-          'do {EOL',
-        );
-    }
-}
diff --git a/core/vendor/phpunit/php-code-coverage/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php b/core/vendor/phpunit/php-code-coverage/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
deleted file mode 100644
index e91d6c6dd543832cfdb097d8430b656eb8d7ff0d..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class PHPCS_Sniffs_Whitespace_ConcatenationSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-    public function register()
-    {
-        return array(T_STRING_CONCAT);
-    }
-
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[($stackPtr - 1)]['code'] !== T_WHITESPACE ||
-            $tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
-
-            $phpcsFile->addError(
-              'Concatenation operator must be surrounded by whitespace',
-              $stackPtr
-            );
-        }
-    }
-}
diff --git a/core/vendor/phpunit/php-code-coverage/build/PHPCS/ruleset.xml b/core/vendor/phpunit/php-code-coverage/build/PHPCS/ruleset.xml
deleted file mode 100644
index 402f2140b598cc2774a08155070c91900996c87a..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/build/PHPCS/ruleset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Sebastian">
- <description>Sebastian Bergmann's coding standard</description>
-
- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
- <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
- <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
- <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
- <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
- <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
-
- <rule ref="Generic.Commenting.Todo"/>
-
- <rule ref="Generic.ControlStructures.InlineControlStructure"/>
-
- <rule ref="Generic.Files.LineEndings"/>
-
- <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
- <rule ref="Generic.Formatting.NoSpaceAfterCast"/>
-
- <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
- <rule ref="PEAR.Functions.ValidDefaultValue"/>
-
- <rule ref="Generic.NamingConventions.ConstructorName"/>
- <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
- <rule ref="PEAR.NamingConventions.ValidClassName"/>
-
- <rule ref="Generic.PHP.DisallowShortOpenTag"/>
- <rule ref="Generic.PHP.NoSilencedErrors"/>
- <rule ref="Generic.PHP.UpperCaseConstant"/>
-
- <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
- <rule ref="Generic.WhiteSpace.ScopeIndent"/>
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
-</ruleset>
diff --git a/core/vendor/phpunit/php-code-coverage/build/phpmd.xml b/core/vendor/phpunit/php-code-coverage/build/phpmd.xml
deleted file mode 100644
index 23ecb8b0b6310c84cba60ba87378fa04aa7ee361..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/build/phpmd.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<ruleset name="Sebastian"
-         xmlns="http://pmd.sf.net/ruleset/1.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-  <description>Sebastian Bergmann's ruleset</description>
-
-  <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
-  <rule ref="rulesets/codesize.xml/NPathComplexity" />
-  <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity" />
-  <rule ref="rulesets/codesize.xml/ExcessiveClassLength" />
-  <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
-  <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
-
-  <rule ref="rulesets/design.xml/EvalExpression" />
-  <rule ref="rulesets/design.xml/ExitExpression" />
-  <rule ref="rulesets/design.xml/GotoStatement" />
-
-  <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
-
-  <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
-  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
-</ruleset>
diff --git a/core/vendor/phpunit/php-code-coverage/build/travis-ci.xml b/core/vendor/phpunit/php-code-coverage/build/travis-ci.xml
index 51d344695694226bbf54441a1e0e89df992168c9..15e879fa6fe7c540a6ffd5cdcf463f45536b2471 100644
--- a/core/vendor/phpunit/php-code-coverage/build/travis-ci.xml
+++ b/core/vendor/phpunit/php-code-coverage/build/travis-ci.xml
@@ -5,7 +5,7 @@
          colors="true">
   <testsuites>
     <testsuite name="PHP_CodeCoverage">
-      <directory suffix="Test.php">../Tests/PHP</directory>
+      <directory suffix="Test.php">../tests/PHP</directory>
     </testsuite>
   </testsuites>
 
@@ -15,10 +15,7 @@
 
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../PHP</directory>
-      <exclude>
-        <file>../PHP/CodeCoverage/Autoload.php</file>
-      </exclude>
+      <directory suffix=".php">../src</directory>
     </whitelist>
   </filter>
 </phpunit>
diff --git a/core/vendor/phpunit/php-code-coverage/composer.json b/core/vendor/phpunit/php-code-coverage/composer.json
index 201b14968a705ef424059ffbe8f7c5fa298077aa..355c622104ca530982c75bc312858a3a5c832dd9 100644
--- a/core/vendor/phpunit/php-code-coverage/composer.json
+++ b/core/vendor/phpunit/php-code-coverage/composer.json
@@ -22,22 +22,31 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "phpunit/php-file-iterator": ">=1.3.0@stable",
-        "phpunit/php-token-stream": ">=1.1.3@stable",
-        "phpunit/php-text-template": ">=1.1.1@stable"
+        "phpunit/php-file-iterator": "~1.3.1",
+        "phpunit/php-token-stream": "~1.2.2",
+        "phpunit/php-text-template": "~1.2.0",
+        "sebastian/environment": "~1.0.0",
+        "sebastian/version": "~1.0.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.*"
+        "phpunit/phpunit": "~4.0.14",
+        "ext-xdebug": ">=2.1.4"
     },
     "suggest": {
         "ext-dom": "*",
-        "ext-xdebug": ">=2.0.5"
+        "ext-xdebug": ">=2.2.1",
+        "ext-xmlwriter": "*"
     },
     "autoload": {
         "classmap": [
-            "PHP/"
+            "src/"
         ]
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
+    },
     "include-path": [
         ""
     ]
diff --git a/core/vendor/phpunit/php-code-coverage/package.xml b/core/vendor/phpunit/php-code-coverage/package.xml
deleted file mode 100644
index 8b256332930a3e18ad4a00d64c51c8e03b4d9e11..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-code-coverage/package.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.10" version="2.0"
-  xmlns="http://pear.php.net/dtd/package-2.0"
-  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-                      http://pear.php.net/dtd/tasks-1.0.xsd
-                      http://pear.php.net/dtd/package-2.0
-                      http://pear.php.net/dtd/package-2.0.xsd">
- <name>PHP_CodeCoverage</name>
- <channel>pear.phpunit.de</channel>
- <summary>Library that provides collection, processing, and rendering functionality for PHP code coverage information.</summary>
- <description>Library that provides collection, processing, and rendering functionality for PHP code coverage information.</description>
- <lead>
-  <name>Sebastian Bergmann</name>
-  <user>sb</user>
-  <email>sb@sebastian-bergmann.de</email>
-  <active>yes</active>
- </lead>
- <date>2013-05-23</date>
- <version>
-  <release>1.2.11</release>
-  <api>1.2.11</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license>The BSD 3-Clause License</license>
- <notes>http://github.com/sebastianbergmann/php-code-coverage/</notes>
- <contents>
-  <dir name="/">
-   <dir name="PHP">
-    <dir name="CodeCoverage">
-     <dir name="Driver">
-      <file baseinstalldir="/" name="Xdebug.php" role="php" />
-     </dir>
-     <dir name="Report">
-      <dir name="HTML">
-       <dir name="Renderer">
-        <dir name="Template">
-         <dir name="css">
-          <file baseinstalldir="/" name="bootstrap-responsive.min.css" role="php" />
-          <file baseinstalldir="/" name="bootstrap.min.css" role="php" />
-          <file baseinstalldir="/" name="style.css" role="php" />
-         </dir>
-         <dir name="img">
-          <file baseinstalldir="/" name="glyphicons-halflings-white.png" role="php" />
-          <file baseinstalldir="/" name="glyphicons-halflings.png" role="php" />
-         </dir>
-         <dir name="js">
-          <file baseinstalldir="/" name="bootstrap.min.js" role="php" />
-          <file baseinstalldir="/" name="highcharts.js" role="php" />
-          <file baseinstalldir="/" name="html5shiv.js" role="php" />
-          <file baseinstalldir="/" name="jquery.min.js" role="php" />
-         </dir>
-         <file baseinstalldir="/" name="coverage_bar.html.dist" role="php" />
-         <file baseinstalldir="/" name="dashboard.html.dist" role="php" />
-         <file baseinstalldir="/" name="directory.html.dist" role="php" />
-         <file baseinstalldir="/" name="directory_item.html.dist" role="php" />
-         <file baseinstalldir="/" name="file.html.dist" role="php" />
-         <file baseinstalldir="/" name="file_item.html.dist" role="php" />
-         <file baseinstalldir="/" name="method_item.html.dist" role="php" />
-        </dir>
-        <file baseinstalldir="/" name="Dashboard.php" role="php" />
-        <file baseinstalldir="/" name="Directory.php" role="php" />
-        <file baseinstalldir="/" name="File.php" role="php" />
-       </dir>
-       <file baseinstalldir="/" name="Renderer.php" role="php" />
-      </dir>
-      <dir name="Node">
-       <file baseinstalldir="/" name="Directory.php" role="php" />
-       <file baseinstalldir="/" name="File.php" role="php" />
-       <file baseinstalldir="/" name="Iterator.php" role="php" />
-      </dir>
-      <file baseinstalldir="/" name="Clover.php" role="php" />
-      <file baseinstalldir="/" name="Factory.php" role="php" />
-      <file baseinstalldir="/" name="HTML.php" role="php" />
-      <file baseinstalldir="/" name="Node.php" role="php" />
-      <file baseinstalldir="/" name="PHP.php" role="php" />
-      <file baseinstalldir="/" name="Text.php" role="php" />
-     </dir>
-     <dir name="Util">
-      <file baseinstalldir="/" name="InvalidArgumentHelper.php" role="php" />
-     </dir>
-     <file baseinstalldir="/" name="Autoload.php" role="php" />
-     <file baseinstalldir="/" name="Driver.php" role="php" />
-     <file baseinstalldir="/" name="Exception.php" role="php" />
-     <file baseinstalldir="/" name="Filter.php" role="php" />
-     <file baseinstalldir="/" name="Util.php" role="php" />
-     <file baseinstalldir="/" name="Version.php" role="php" />
-    </dir>
-    <file baseinstalldir="/" name="CodeCoverage.php" role="php" />
-   </dir>
-   <file baseinstalldir="/" name="ChangeLog.markdown" role="doc" />
-   <file baseinstalldir="/" name="LICENSE" role="doc" />
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.3.3</min>
-   </php>
-   <pearinstaller>
-    <min>1.9.4</min>
-   </pearinstaller>
-   <package>
-    <name>File_Iterator</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.3.0</min>
-   </package>
-   <package>
-    <name>PHP_TokenStream</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.1.3</min>
-   </package>
-   <package>
-    <name>Text_Template</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.1.1</min>
-   </package>
-  </required>
-  <optional>
-   <extension>
-    <name>dom</name>
-   </extension>
-   <extension>
-    <name>xdebug</name>
-    <min>2.0.5</min>
-   </extension>
-  </optional>
- </dependencies>
- <phprelease />
-</package>
diff --git a/core/vendor/phpunit/php-code-coverage/phpunit.xml.dist b/core/vendor/phpunit/php-code-coverage/phpunit.xml.dist
index 31c6172900eebf0976c993c899d057198411b323..f5fa606e2aa783c2bb05d2c8a94c4bd2f815b40c 100644
--- a/core/vendor/phpunit/php-code-coverage/phpunit.xml.dist
+++ b/core/vendor/phpunit/php-code-coverage/phpunit.xml.dist
@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         syntaxCheck="false"
-         bootstrap="PHP/CodeCoverage/Autoload.php">
+         bootstrap="vendor/autoload.php">
   <testsuites>
-    <testsuite name="php-code-coverage">
-      <directory suffix="Test.php">Tests/PHP</directory>
+    <testsuite name="PHP_CodeCoverage">
+      <directory suffix="Test.php">tests/PHP</directory>
     </testsuite>
   </testsuites>
 
   <logging>
-    <log type="coverage-html" target="build/coverage" title="PHP_CodeCoverage"
-         charset="UTF-8" yui="true" highlight="true"
-         lowUpperBound="35" highLowerBound="70"/>
+    <log type="coverage-html" target="build/coverage"/>
     <log type="coverage-clover" target="build/logs/clover.xml"/>
     <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
   </logging>
 
   <filter>
     <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">PHP</directory>
-      <exclude>
-        <file>PHP/CodeCoverage/Autoload.php</file>
-      </exclude>
+      <directory suffix=".php">src</directory>
     </whitelist>
   </filter>
 </phpunit>
+
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
new file mode 100644
index 0000000000000000000000000000000000000000..1debd145b6486cc1119331203541ab839dc10508
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage.php
@@ -0,0 +1,901 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 1.0.0
+ */
+
+use SebastianBergmann\Environment\Runtime;
+
+/**
+ * Provides collection functionality for PHP code coverage information.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage
+{
+    /**
+     * @var PHP_CodeCoverage_Driver
+     */
+    private $driver;
+
+    /**
+     * @var PHP_CodeCoverage_Filter
+     */
+    private $filter;
+
+    /**
+     * @var boolean
+     */
+    private $cacheTokens = false;
+
+    /**
+     * @var boolean
+     */
+    private $checkForUnintentionallyCoveredCode = false;
+
+    /**
+     * @var boolean
+     */
+    private $forceCoversAnnotation = false;
+
+    /**
+     * @var boolean
+     */
+    private $mapTestClassNameToCoveredClassName = false;
+
+    /**
+     * @var boolean
+     */
+    private $addUncoveredFilesFromWhitelist = true;
+
+    /**
+     * @var boolean
+     */
+    private $processUncoveredFilesFromWhitelist = false;
+
+    /**
+     * @var mixed
+     */
+    private $currentId;
+
+    /**
+     * Code coverage data.
+     *
+     * @var array
+     */
+    private $data = array();
+
+    /**
+     * @var array
+     */
+    private $ignoredLines = array();
+
+    /**
+     * Test data.
+     *
+     * @var array
+     */
+    private $tests = array();
+
+    /**
+     * Constructor.
+     *
+     * @param  PHP_CodeCoverage_Driver $driver
+     * @param  PHP_CodeCoverage_Filter $filter
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function __construct(PHP_CodeCoverage_Driver $driver = null, PHP_CodeCoverage_Filter $filter = null)
+    {
+        if ($driver === null) {
+            $runtime = new Runtime;
+
+            if ($runtime->isHHVM()) {
+                $driver = new PHP_CodeCoverage_Driver_HHVM;
+            } elseif ($runtime->hasXdebug()) {
+                $driver = new PHP_CodeCoverage_Driver_Xdebug;
+            } else {
+                throw new PHP_CodeCoverage_Exception('No code coverage driver available');
+            }
+        }
+
+        if ($filter === null) {
+            $filter = new PHP_CodeCoverage_Filter;
+        }
+
+        $this->driver = $driver;
+        $this->filter = $filter;
+    }
+
+    /**
+     * Returns the PHP_CodeCoverage_Report_Node_* object graph
+     * for this PHP_CodeCoverage object.
+     *
+     * @return PHP_CodeCoverage_Report_Node_Directory
+     * @since  Method available since Release 1.1.0
+     */
+    public function getReport()
+    {
+        $factory = new PHP_CodeCoverage_Report_Factory;
+
+        return $factory->create($this);
+    }
+
+    /**
+     * Clears collected code coverage data.
+     */
+    public function clear()
+    {
+        $this->currentId = null;
+        $this->data      = array();
+        $this->tests     = array();
+    }
+
+    /**
+     * Returns the PHP_CodeCoverage_Filter used.
+     *
+     * @return PHP_CodeCoverage_Filter
+     */
+    public function filter()
+    {
+        return $this->filter;
+    }
+
+    /**
+     * Returns the collected code coverage data.
+     * Set $raw = true to bypass all filters.
+     *
+     * @param bool $raw
+     * @return array
+     * @since  Method available since Release 1.1.0
+     */
+    public function getData($raw = false)
+    {
+        if (!$raw && $this->addUncoveredFilesFromWhitelist) {
+            $this->addUncoveredFilesFromWhitelist();
+        }
+
+        // We need to apply the blacklist filter a second time
+        // when no whitelist is used.
+        if (!$raw && !$this->filter->hasWhitelist()) {
+            $this->applyListsFilter($this->data);
+        }
+
+        return $this->data;
+    }
+
+    /**
+     * Sets the coverage data.
+     *
+     * @param array $data
+     * @since Method available since Release 2.0.0
+     */
+    public function setData(array $data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * Returns the test data.
+     *
+     * @return array
+     * @since  Method available since Release 1.1.0
+     */
+    public function getTests()
+    {
+        return $this->tests;
+    }
+
+    /**
+     * Sets the test data.
+     *
+     * @param array $tests
+     * @since Method available since Release 2.0.0
+     */
+    public function setTests(array $tests)
+    {
+        $this->tests = $tests;
+    }
+
+    /**
+     * Start collection of code coverage information.
+     *
+     * @param  mixed                      $id
+     * @param  boolean                    $clear
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function start($id, $clear = false)
+    {
+        if (!is_bool($clear)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        if ($clear) {
+            $this->clear();
+        }
+
+        $this->currentId = $id;
+
+        $this->driver->start();
+    }
+
+    /**
+     * Stop collection of code coverage information.
+     *
+     * @param  boolean                    $append
+     * @param  mixed                      $linesToBeCovered
+     * @param  array                      $linesToBeUsed
+     * @return array
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function stop($append = true, $linesToBeCovered = array(), array $linesToBeUsed = array())
+    {
+        if (!is_bool($append)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        if (!is_array($linesToBeCovered) && $linesToBeCovered !== false) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                2,
+                'array or false'
+            );
+        }
+
+        $data = $this->driver->stop();
+        $this->append($data, null, $append, $linesToBeCovered, $linesToBeUsed);
+
+        $this->currentId = null;
+
+        return $data;
+    }
+
+    /**
+     * Appends code coverage data.
+     *
+     * @param  array                      $data
+     * @param  mixed                      $id
+     * @param  boolean                    $append
+     * @param  mixed                      $linesToBeCovered
+     * @param  array                      $linesToBeUsed
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function append(array $data, $id = null, $append = true, $linesToBeCovered = array(), array $linesToBeUsed = array())
+    {
+        if ($id === null) {
+            $id = $this->currentId;
+        }
+
+        if ($id === null) {
+            throw new PHP_CodeCoverage_Exception;
+        }
+
+        $this->applyListsFilter($data);
+        $this->applyIgnoredLinesFilter($data);
+        $this->initializeFilesThatAreSeenTheFirstTime($data);
+
+        if (!$append) {
+            return;
+        }
+
+        if ($id != 'UNCOVERED_FILES_FROM_WHITELIST') {
+            $this->applyCoversAnnotationFilter(
+                $data,
+                $linesToBeCovered,
+                $linesToBeUsed
+            );
+        }
+
+        if (empty($data)) {
+            return;
+        }
+
+        $status = null;
+
+        if ($id instanceof PHPUnit_Framework_TestCase) {
+            $status = $id->getStatus();
+            $id     = get_class($id) . '::' . $id->getName();
+        } elseif ($id instanceof PHPUnit_Extensions_PhptTestCase) {
+            $id = $id->getName();
+        }
+
+        $this->tests[$id] = $status;
+
+        foreach ($data as $file => $lines) {
+            if (!$this->filter->isFile($file)) {
+                continue;
+            }
+
+            foreach ($lines as $k => $v) {
+                if ($v == 1) {
+                    $this->data[$file][$k][] = $id;
+                }
+            }
+        }
+    }
+
+    /**
+     * Merges the data from another instance of PHP_CodeCoverage.
+     *
+     * @param PHP_CodeCoverage $that
+     */
+    public function merge(PHP_CodeCoverage $that)
+    {
+        foreach ($that->data as $file => $lines) {
+            if (!isset($this->data[$file])) {
+                if (!$this->filter->isFiltered($file)) {
+                    $this->data[$file] = $lines;
+                }
+
+                continue;
+            }
+
+            foreach ($lines as $line => $data) {
+                if ($data !== null) {
+                    if (!isset($this->data[$file][$line])) {
+                        $this->data[$file][$line] = $data;
+                    } else {
+                        $this->data[$file][$line] = array_unique(
+                            array_merge($this->data[$file][$line], $data)
+                        );
+                    }
+                }
+            }
+        }
+
+        $this->tests = array_merge($this->tests, $that->getTests());
+    }
+
+    /**
+     * @param  boolean                    $flag
+     * @throws PHP_CodeCoverage_Exception
+     * @since  Method available since Release 1.1.0
+     */
+    public function setCacheTokens($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->cacheTokens = $flag;
+    }
+
+    /**
+     * @since Method available since Release 1.1.0
+     */
+    public function getCacheTokens()
+    {
+        return $this->cacheTokens;
+    }
+
+    /**
+     * @param  boolean                    $flag
+     * @throws PHP_CodeCoverage_Exception
+     * @since  Method available since Release 2.0.0
+     */
+    public function setCheckForUnintentionallyCoveredCode($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->checkForUnintentionallyCoveredCode = $flag;
+    }
+
+    /**
+     * @param  boolean                    $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setForceCoversAnnotation($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->forceCoversAnnotation = $flag;
+    }
+
+    /**
+     * @param  boolean                    $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setMapTestClassNameToCoveredClassName($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->mapTestClassNameToCoveredClassName = $flag;
+    }
+
+    /**
+     * @param  boolean                    $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setAddUncoveredFilesFromWhitelist($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->addUncoveredFilesFromWhitelist = $flag;
+    }
+
+    /**
+     * @param  boolean                    $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setProcessUncoveredFilesFromWhitelist($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->processUncoveredFilesFromWhitelist = $flag;
+    }
+
+    /**
+     * Applies the @covers annotation filtering.
+     *
+     * @param  array                                                 $data
+     * @param  mixed                                                 $linesToBeCovered
+     * @param  array                                                 $linesToBeUsed
+     * @throws PHP_CodeCoverage_Exception_UnintentionallyCoveredCode
+     */
+    private function applyCoversAnnotationFilter(array &$data, $linesToBeCovered, array $linesToBeUsed)
+    {
+        if ($linesToBeCovered === false ||
+            ($this->forceCoversAnnotation && empty($linesToBeCovered))) {
+            $data = array();
+
+            return;
+        }
+
+        if (empty($linesToBeCovered)) {
+            return;
+        }
+
+        if ($this->checkForUnintentionallyCoveredCode) {
+            $this->performUnintentionallyCoveredCodeCheck(
+                $data,
+                $linesToBeCovered,
+                $linesToBeUsed
+            );
+        }
+
+        $data = array_intersect_key($data, $linesToBeCovered);
+
+        foreach (array_keys($data) as $filename) {
+            $_linesToBeCovered = array_flip($linesToBeCovered[$filename]);
+
+            $data[$filename] = array_intersect_key(
+                $data[$filename],
+                $_linesToBeCovered
+            );
+        }
+    }
+
+    /**
+     * Applies the blacklist/whitelist filtering.
+     *
+     * @param array $data
+     */
+    private function applyListsFilter(array &$data)
+    {
+        foreach (array_keys($data) as $filename) {
+            if ($this->filter->isFiltered($filename)) {
+                unset($data[$filename]);
+            }
+        }
+    }
+
+    /**
+     * Applies the "ignored lines" filtering.
+     *
+     * @param array $data
+     */
+    private function applyIgnoredLinesFilter(array &$data)
+    {
+        foreach (array_keys($data) as $filename) {
+            if (!$this->filter->isFile($filename)) {
+                continue;
+            }
+
+            foreach ($this->getLinesToBeIgnored($filename) as $line) {
+                unset($data[$filename][$line]);
+            }
+
+            if (empty($data[$filename])) {
+                unset($data[$filename]);
+            }
+        }
+    }
+
+    /**
+     * @param array $data
+     * @since Method available since Release 1.1.0
+     */
+    private function initializeFilesThatAreSeenTheFirstTime(array $data)
+    {
+        foreach ($data as $file => $lines) {
+            if ($this->filter->isFile($file) && !isset($this->data[$file])) {
+                $this->data[$file] = array();
+
+                foreach ($lines as $k => $v) {
+                    $this->data[$file][$k] = $v == -2 ? null : array();
+                }
+            }
+        }
+    }
+
+    /**
+     * Processes whitelisted files that are not covered.
+     */
+    private function addUncoveredFilesFromWhitelist()
+    {
+        $data           = array();
+        $uncoveredFiles = array_diff(
+            $this->filter->getWhitelist(),
+            array_keys($this->data)
+        );
+
+        foreach ($uncoveredFiles as $uncoveredFile) {
+            if (!file_exists($uncoveredFile)) {
+                continue;
+            }
+
+            if ($this->processUncoveredFilesFromWhitelist) {
+                $this->processUncoveredFileFromWhitelist(
+                    $uncoveredFile,
+                    $data,
+                    $uncoveredFiles
+                );
+            } else {
+                $data[$uncoveredFile] = array();
+
+                $lines = count(file($uncoveredFile));
+
+                for ($i = 1; $i <= $lines; $i++) {
+                    $data[$uncoveredFile][$i] = -1;
+                }
+            }
+        }
+
+        $this->append($data, 'UNCOVERED_FILES_FROM_WHITELIST');
+    }
+
+    /**
+     * @param string $uncoveredFile
+     * @param array  $data
+     * @param array  $uncoveredFiles
+     */
+    private function processUncoveredFileFromWhitelist($uncoveredFile, array &$data, array $uncoveredFiles)
+    {
+        $this->driver->start();
+        include_once $uncoveredFile;
+        $coverage = $this->driver->stop();
+
+        foreach ($coverage as $file => $fileCoverage) {
+            if (!isset($data[$file]) &&
+                in_array($file, $uncoveredFiles)) {
+                foreach (array_keys($fileCoverage) as $key) {
+                    if ($fileCoverage[$key] == 1) {
+                        $fileCoverage[$key] = -1;
+                    }
+                }
+
+                $data[$file] = $fileCoverage;
+            }
+        }
+    }
+
+    /**
+     * Returns the lines of a source file that should be ignored.
+     *
+     * @param  string                     $filename
+     * @return array
+     * @throws PHP_CodeCoverage_Exception
+     * @since  Method available since Release 2.0.0
+     */
+    private function getLinesToBeIgnored($filename)
+    {
+        if (!is_string($filename)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'string'
+            );
+        }
+
+        if (!isset($this->ignoredLines[$filename])) {
+            $this->ignoredLines[$filename] = array();
+            $ignore                        = false;
+            $stop                          = false;
+            $lines                         = file($filename);
+            $numLines                      = count($lines);
+
+            foreach ($lines as $index => $line) {
+                if (!trim($line)) {
+                    $this->ignoredLines[$filename][] = $index + 1;
+                }
+            }
+
+            if ($this->cacheTokens) {
+                $tokens = PHP_Token_Stream_CachingFactory::get($filename);
+            } else {
+                $tokens = new PHP_Token_Stream($filename);
+            }
+
+            $classes = array_merge($tokens->getClasses(), $tokens->getTraits());
+            $tokens  = $tokens->tokens();
+
+            foreach ($tokens as $token) {
+                switch (get_class($token)) {
+                    case 'PHP_Token_COMMENT':
+                    case 'PHP_Token_DOC_COMMENT':
+                        $_token = trim($token);
+                        $_line  = trim($lines[$token->getLine() - 1]);
+
+                        if ($_token == '// @codeCoverageIgnore' ||
+                            $_token == '//@codeCoverageIgnore') {
+                            $ignore = true;
+                            $stop   = true;
+                        } elseif ($_token == '// @codeCoverageIgnoreStart' ||
+                            $_token == '//@codeCoverageIgnoreStart') {
+                            $ignore = true;
+                        } elseif ($_token == '// @codeCoverageIgnoreEnd' ||
+                            $_token == '//@codeCoverageIgnoreEnd') {
+                            $stop = true;
+                        }
+
+                        // Do not ignore the whole line when there is a token
+                        // before the comment on the same line
+                        if (0 === strpos($_token, $_line)) {
+                            $count = substr_count($token, "\n");
+                            $line  = $token->getLine();
+
+                            for ($i = $line; $i < $line + $count; $i++) {
+                                $this->ignoredLines[$filename][] = $i;
+                            }
+
+                            if ($token instanceof PHP_Token_DOC_COMMENT) {
+                                // The DOC_COMMENT token does not contain the
+                                // final \n character in its text
+                                if (substr(trim($lines[$i-1]), -2) == '*/') {
+                                    $this->ignoredLines[$filename][] = $i;
+                                }
+                            }
+                        }
+                        break;
+
+                    case 'PHP_Token_INTERFACE':
+                    case 'PHP_Token_TRAIT':
+                    case 'PHP_Token_CLASS':
+                    case 'PHP_Token_FUNCTION':
+                        $docblock = $token->getDocblock();
+
+                        $this->ignoredLines[$filename][] = $token->getLine();
+
+                        if (strpos($docblock, '@codeCoverageIgnore')) {
+                            $endLine = $token->getEndLine();
+
+                            for ($i = $token->getLine(); $i <= $endLine; $i++) {
+                                $this->ignoredLines[$filename][] = $i;
+                            }
+                        } elseif ($token instanceof PHP_Token_INTERFACE ||
+                            $token instanceof PHP_Token_TRAIT ||
+                            $token instanceof PHP_Token_CLASS) {
+                            if (empty($classes[$token->getName()]['methods'])) {
+                                for ($i = $token->getLine();
+                                     $i <= $token->getEndLine();
+                                     $i++) {
+                                    $this->ignoredLines[$filename][] = $i;
+                                }
+                            } else {
+                                $firstMethod = array_shift(
+                                    $classes[$token->getName()]['methods']
+                                );
+
+                                do {
+                                    $lastMethod = array_pop(
+                                        $classes[$token->getName()]['methods']
+                                    );
+                                } while ($lastMethod !== null &&
+                                    substr($lastMethod['signature'], 0, 18) == 'anonymous function');
+
+                                if ($lastMethod === null) {
+                                    $lastMethod = $firstMethod;
+                                }
+
+                                for ($i = $token->getLine();
+                                     $i < $firstMethod['startLine'];
+                                     $i++) {
+                                    $this->ignoredLines[$filename][] = $i;
+                                }
+
+                                for ($i = $token->getEndLine();
+                                     $i > $lastMethod['endLine'];
+                                     $i--) {
+                                    $this->ignoredLines[$filename][] = $i;
+                                }
+                            }
+                        }
+                        break;
+
+                    case 'PHP_Token_NAMESPACE':
+                        $this->ignoredLines[$filename][] = $token->getEndLine();
+
+                    // Intentional fallthrough
+                    case 'PHP_Token_OPEN_TAG':
+                    case 'PHP_Token_CLOSE_TAG':
+                    case 'PHP_Token_USE':
+                        $this->ignoredLines[$filename][] = $token->getLine();
+                        break;
+                }
+
+                if ($ignore) {
+                    $this->ignoredLines[$filename][] = $token->getLine();
+
+                    if ($stop) {
+                        $ignore = false;
+                        $stop   = false;
+                    }
+                }
+            }
+
+            $this->ignoredLines[$filename][] = $numLines + 1;
+
+            $this->ignoredLines[$filename] = array_unique(
+                $this->ignoredLines[$filename]
+            );
+
+            sort($this->ignoredLines[$filename]);
+        }
+
+        return $this->ignoredLines[$filename];
+    }
+
+    /**
+     * @param  array                                                 $data
+     * @param  array                                                 $linesToBeCovered
+     * @param  array                                                 $linesToBeUsed
+     * @throws PHP_CodeCoverage_Exception_UnintentionallyCoveredCode
+     * @since Method available since Release 2.0.0
+     */
+    private function performUnintentionallyCoveredCodeCheck(array &$data, array $linesToBeCovered, array $linesToBeUsed)
+    {
+        $allowedLines = $this->getAllowedLines(
+            $linesToBeCovered,
+            $linesToBeUsed
+        );
+
+        $message = '';
+
+        foreach ($data as $file => $_data) {
+            foreach ($_data as $line => $flag) {
+                if ($flag == 1 &&
+                    (!isset($allowedLines[$file]) ||
+                        !isset($allowedLines[$file][$line]))) {
+                    $message .= sprintf(
+                        '- %s:%d' . PHP_EOL,
+                        $file,
+                        $line
+                    );
+                }
+            }
+        }
+
+        if (!empty($message)) {
+            throw new PHP_CodeCoverage_Exception_UnintentionallyCoveredCode(
+                $message
+            );
+        }
+    }
+
+    /**
+     * @param  array $linesToBeCovered
+     * @param  array $linesToBeUsed
+     * @return array
+     * @since Method available since Release 2.0.0
+     */
+    private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed)
+    {
+        $allowedLines = array();
+
+        foreach (array_keys($linesToBeCovered) as $file) {
+            if (!isset($allowedLines[$file])) {
+                $allowedLines[$file] = array();
+            }
+
+            $allowedLines[$file] = array_merge(
+                $allowedLines[$file],
+                $linesToBeCovered[$file]
+            );
+        }
+
+        foreach (array_keys($linesToBeUsed) as $file) {
+            if (!isset($allowedLines[$file])) {
+                $allowedLines[$file] = array();
+            }
+
+            $allowedLines[$file] = array_merge(
+                $allowedLines[$file],
+                $linesToBeUsed[$file]
+            );
+        }
+
+        foreach (array_keys($allowedLines) as $file) {
+            $allowedLines[$file] = array_flip(
+                array_unique($allowedLines[$file])
+            );
+        }
+
+        return $allowedLines;
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php
similarity index 93%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php
index 5cd79127fc60b46015d8ca75b574a7665371eeee..e9bd69991f62e8ee75f546af8a5751e636c9006f 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.0.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.0.0
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver/Xdebug.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php
similarity index 72%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver/Xdebug.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php
index a169a224eeee085dd99cbc2c525c078127e291f1..cc370e76e7a1796d544d22220c96a091b7a95860 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver/Xdebug.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,40 +37,33 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.0.0
+ * @since      File available since Release 1.3.0
  */
 
 /**
- * Driver for Xdebug's code coverage functionality.
+ * Driver for HHVM's code coverage functionality.
  *
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.0.0
+ * @since      Class available since Release 1.3.0
  * @codeCoverageIgnore
  */
-class PHP_CodeCoverage_Driver_Xdebug implements PHP_CodeCoverage_Driver
+class PHP_CodeCoverage_Driver_HHVM implements PHP_CodeCoverage_Driver
 {
     /**
      * Constructor.
      */
     public function __construct()
     {
-        if (!extension_loaded('xdebug')) {
-            throw new PHP_CodeCoverage_Exception('Xdebug is not loaded.');
-        }
-
-        if (version_compare(phpversion('xdebug'), '2.2.0-dev', '>=') &&
-            !ini_get('xdebug.coverage_enable')) {
-            throw new PHP_CodeCoverage_Exception(
-              'You need to set xdebug.coverage_enable=On in your php.ini.'
-            );
+        if (!defined('HHVM_VERSION')) {
+            throw new PHP_CodeCoverage_Exception('This driver requires HHVM');
         }
     }
 
@@ -79,7 +72,7 @@ public function __construct()
      */
     public function start()
     {
-        xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+        fb_enable_code_coverage();
     }
 
     /**
@@ -89,8 +82,9 @@ public function start()
      */
     public function stop()
     {
-        $codeCoverage = xdebug_get_code_coverage();
-        xdebug_stop_code_coverage();
+        $codeCoverage = fb_get_code_coverage(TRUE);
+
+        fb_disable_code_coverage();
 
         return $codeCoverage;
     }
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php
new file mode 100644
index 0000000000000000000000000000000000000000..3c2fb4c7bdb2efa6064659a8c2e825dc4605de27
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Driver for Xdebug's code coverage functionality.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 1.0.0
+ * @codeCoverageIgnore
+ */
+class PHP_CodeCoverage_Driver_Xdebug implements PHP_CodeCoverage_Driver
+{
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        if (!extension_loaded('xdebug')) {
+            throw new PHP_CodeCoverage_Exception('This driver requires Xdebug');
+        }
+
+        if (version_compare(phpversion('xdebug'), '2.2.0-dev', '>=') &&
+            !ini_get('xdebug.coverage_enable')) {
+            throw new PHP_CodeCoverage_Exception(
+                'xdebug.coverage_enable=On has to be set in php.ini'
+            );
+        }
+    }
+
+    /**
+     * Start collection of code coverage information.
+     */
+    public function start()
+    {
+        xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+    }
+
+    /**
+     * Stop collection of code coverage information.
+     *
+     * @return array
+     */
+    public function stop()
+    {
+        $data = xdebug_get_code_coverage();
+        xdebug_stop_code_coverage();
+
+        return $this->cleanup($data);
+    }
+
+    /**
+     * @param  array $data
+     * @return array
+     * @since Method available since Release 2.0.0
+     */
+    private function cleanup(array $data)
+    {
+        foreach (array_keys($data) as $file) {
+            if (isset($data[$file][0])) {
+                unset($data[$file][0]);
+            }
+
+            if (file_exists($file)) {
+                $numLines = $this->getNumberOfLinesInFile($file);
+
+                foreach (array_keys($data[$file]) as $line) {
+                    if (isset($data[$file][$line]) && $line > $numLines) {
+                        unset($data[$file][$line]);
+                    }
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * @param  string $file
+     * @return integer
+     * @since Method available since Release 2.0.0
+     */
+    private function getNumberOfLinesInFile($file)
+    {
+        $buffer = file_get_contents($file);
+        $lines  = substr_count($buffer, "\n");
+
+        if (substr($buffer, -1) !== "\n") {
+            $lines++;
+        }
+
+        return $lines;
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Exception.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php
similarity index 92%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Exception.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php
index 412a4e12d9c18c69d9f93e9d38a877b7fabcfe8c..9d302d0c3e306f2140acaaed1a92ffa122d0c619 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Exception.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php
new file mode 100644
index 0000000000000000000000000000000000000000..323383d531c282eecbbf9556ac2a1b9452624f47
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Exception that is raised when code is unintentionally covered.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Exception_UnintentionallyCoveredCode extends PHP_CodeCoverage_Exception
+{
+}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Filter.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php
similarity index 68%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Filter.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php
index 586a65c0e5b83af5478ecc8ddcb7a362c137bc9c..a9cb3beaa4037a2de20ae4ec19ff806cfcd988ba 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Filter.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Filter.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.0.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.0.0
@@ -61,19 +61,45 @@ class PHP_CodeCoverage_Filter
      *
      * @var array
      */
-    protected $blacklistedFiles = array();
+    private $blacklistedFiles = array();
 
     /**
      * Source files that are whitelisted.
      *
      * @var array
      */
-    protected $whitelistedFiles = array();
+    private $whitelistedFiles = array();
 
     /**
      * @var boolean
      */
-    protected $blacklistPrefilled = FALSE;
+    private $blacklistPrefilled = false;
+
+    /**
+     * A list of classes which are always blacklisted
+     *
+     * @var array
+     */
+    public static $blacklistClassNames = array(
+        'File_Iterator' => 1,
+        'PHP_CodeCoverage' => 1,
+        'PHP_Invoker' => 1,
+        'PHP_Timer' => 1,
+        'PHP_Token' => 1,
+        'PHPUnit_Framework_TestCase' => 2,
+        'PHPUnit_Extensions_Database_TestCase' => 2,
+        'PHPUnit_Framework_MockObject_Generator' => 2,
+        'PHPUnit_Extensions_SeleniumTestCase' => 2,
+        'PHPUnit_Extensions_Story_TestCase' => 2,
+        'Text_Template' => 1,
+        'Symfony\Component\Yaml\Yaml' => 1,
+        'SebastianBergmann\Diff\Diff' => 1,
+        'SebastianBergmann\Comparator\Comparator' => 1,
+        'SebastianBergmann\Environment\Runtime' => 1,
+        'SebastianBergmann\Exporter\Exporter' => 1,
+        'SebastianBergmann\Version' => 1,
+        'Composer\Autoload\ClassLoader' => 1
+    );
 
     /**
      * Adds a directory to the blacklist (recursively).
@@ -85,9 +111,7 @@ class PHP_CodeCoverage_Filter
     public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix = '')
     {
         $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray(
-          $directory, $suffix, $prefix
-        );
+        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
 
         foreach ($files as $file) {
             $this->addFileToBlacklist($file);
@@ -101,7 +125,7 @@ public function addDirectoryToBlacklist($directory, $suffix = '.php', $prefix =
      */
     public function addFileToBlacklist($filename)
     {
-        $this->blacklistedFiles[realpath($filename)] = TRUE;
+        $this->blacklistedFiles[realpath($filename)] = true;
     }
 
     /**
@@ -126,9 +150,7 @@ public function addFilesToBlacklist(array $files)
     public function removeDirectoryFromBlacklist($directory, $suffix = '.php', $prefix = '')
     {
         $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray(
-          $directory, $suffix, $prefix
-        );
+        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
 
         foreach ($files as $file) {
             $this->removeFileFromBlacklist($file);
@@ -159,9 +181,7 @@ public function removeFileFromBlacklist($filename)
     public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix = '')
     {
         $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray(
-          $directory, $suffix, $prefix
-        );
+        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
 
         foreach ($files as $file) {
             $this->addFileToWhitelist($file);
@@ -175,7 +195,7 @@ public function addDirectoryToWhitelist($directory, $suffix = '.php', $prefix =
      */
     public function addFileToWhitelist($filename)
     {
-        $this->whitelistedFiles[realpath($filename)] = TRUE;
+        $this->whitelistedFiles[realpath($filename)] = true;
     }
 
     /**
@@ -200,9 +220,7 @@ public function addFilesToWhitelist(array $files)
     public function removeDirectoryFromWhitelist($directory, $suffix = '.php', $prefix = '')
     {
         $facade = new File_Iterator_Facade;
-        $files  = $facade->getFilesAsArray(
-          $directory, $suffix, $prefix
-        );
+        $files  = $facade->getFilesAsArray($directory, $suffix, $prefix);
 
         foreach ($files as $file) {
             $this->removeFileFromWhitelist($file);
@@ -231,15 +249,17 @@ public function removeFileFromWhitelist($filename)
     public function isFile($filename)
     {
         if ($filename == '-' ||
-            strpos($filename, 'eval()\'d code') !== FALSE ||
-            strpos($filename, 'runtime-created function') !== FALSE ||
-            strpos($filename, 'runkit created function') !== FALSE ||
-            strpos($filename, 'assert code') !== FALSE ||
-            strpos($filename, 'regexp code') !== FALSE) {
-            return FALSE;
+            strpos($filename, 'vfs://') === 0 ||
+            strpos($filename, 'xdebug://debug-eval') !== false ||
+            strpos($filename, 'eval()\'d code') !== false ||
+            strpos($filename, 'runtime-created function') !== false ||
+            strpos($filename, 'runkit created function') !== false ||
+            strpos($filename, 'assert code') !== false ||
+            strpos($filename, 'regexp code') !== false) {
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
@@ -248,13 +268,17 @@ public function isFile($filename)
      * When the whitelist is empty (default), blacklisting is used.
      * When the whitelist is not empty, whitelisting is used.
      *
-     * @param  string  $filename
-     * @param  boolean $ignoreWhitelist
+     * @param  string                     $filename
+     * @param  boolean                    $ignoreWhitelist
      * @return boolean
      * @throws PHP_CodeCoverage_Exception
      */
     public function isFiltered($filename)
     {
+        if (!$this->isFile($filename)) {
+            return true;
+        }
+
         $filename = realpath($filename);
 
         if (!empty($this->whitelistedFiles)) {
@@ -302,26 +326,17 @@ public function hasWhitelist()
     /**
      * @since Method available since Release 1.2.3
      */
-    protected function prefillBlacklist()
+    private function prefillBlacklist()
     {
         if (defined('__PHPUNIT_PHAR__')) {
             $this->addFileToBlacklist(__PHPUNIT_PHAR__);
         }
 
-        $this->addDirectoryContainingClassToBlacklist('File_Iterator');
-        $this->addDirectoryContainingClassToBlacklist('PHP_CodeCoverage');
-        $this->addDirectoryContainingClassToBlacklist('PHP_Invoker');
-        $this->addDirectoryContainingClassToBlacklist('PHP_Timer');
-        $this->addDirectoryContainingClassToBlacklist('PHP_Token');
-        $this->addDirectoryContainingClassToBlacklist('PHPUnit_Framework_TestCase', 2);
-        $this->addDirectoryContainingClassToBlacklist('PHPUnit_Extensions_Database_TestCase', 2);
-        $this->addDirectoryContainingClassToBlacklist('PHPUnit_Framework_MockObject_Generator', 2);
-        $this->addDirectoryContainingClassToBlacklist('PHPUnit_Extensions_SeleniumTestCase', 2);
-        $this->addDirectoryContainingClassToBlacklist('PHPUnit_Extensions_Story_TestCase', 2);
-        $this->addDirectoryContainingClassToBlacklist('Text_Template');
-        $this->addDirectoryContainingClassToBlacklist('Symfony\Component\Yaml\Yaml');
-
-        $this->blacklistPrefilled = TRUE;
+        foreach (self::$blacklistClassNames as $className => $parent) {
+            $this->addDirectoryContainingClassToBlacklist($className, $parent);
+        }
+
+        $this->blacklistPrefilled = true;
     }
 
     /**
@@ -329,7 +344,7 @@ protected function prefillBlacklist()
      * @param integer $parent
      * @since Method available since Release 1.2.3
      */
-    protected function addDirectoryContainingClassToBlacklist($className, $parent = 1)
+    private function addDirectoryContainingClassToBlacklist($className, $parent = 1)
     {
         if (!class_exists($className)) {
             return;
@@ -344,4 +359,48 @@ protected function addDirectoryContainingClassToBlacklist($className, $parent =
 
         $this->addDirectoryToBlacklist($directory);
     }
+
+    /**
+     * Returns the blacklisted files.
+     *
+     * @return array
+     * @since Method available since Release 2.0.0
+     */
+    public function getBlacklistedFiles()
+    {
+        return $this->blacklistedFiles;
+    }
+
+    /**
+     * Sets the blacklisted files.
+     *
+     * @param array $blacklistedFiles
+     * @since Method available since Release 2.0.0
+     */
+    public function setBlacklistedFiles($blacklistedFiles)
+    {
+        $this->blacklistedFiles = $blacklistedFiles;
+    }
+
+    /**
+     * Returns the whitelisted files.
+     *
+     * @return array
+     * @since Method available since Release 2.0.0
+     */
+    public function getWhitelistedFiles()
+    {
+        return $this->whitelistedFiles;
+    }
+
+    /**
+     * Sets the whitelisted files.
+     *
+     * @param array $whitelistedFiles
+     * @since Method available since Release 2.0.0
+     */
+    public function setWhitelistedFiles($whitelistedFiles)
+    {
+        $this->whitelistedFiles = $whitelistedFiles;
+    }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Clover.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php
similarity index 67%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Clover.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php
index 03658540b13db34e5837c9a397660deaa117d250..f2c0242b30cd86ff23eec06ec1bc93f0abb1e6b7 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Clover.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.0.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.0.0
@@ -62,17 +62,17 @@ class PHP_CodeCoverage_Report_Clover
      * @param  string           $name
      * @return string
      */
-    public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL)
+    public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
     {
         $xmlDocument = new DOMDocument('1.0', 'UTF-8');
-        $xmlDocument->formatOutput = TRUE;
+        $xmlDocument->formatOutput = true;
 
         $xmlCoverage = $xmlDocument->createElement('coverage');
-        $xmlCoverage->setAttribute('generated', (int)$_SERVER['REQUEST_TIME']);
+        $xmlCoverage->setAttribute('generated', (int) $_SERVER['REQUEST_TIME']);
         $xmlDocument->appendChild($xmlCoverage);
 
         $xmlProject = $xmlDocument->createElement('project');
-        $xmlProject->setAttribute('timestamp', (int)$_SERVER['REQUEST_TIME']);
+        $xmlProject->setAttribute('timestamp', (int) $_SERVER['REQUEST_TIME']);
 
         if (is_string($name)) {
             $xmlProject->setAttribute('name', $name);
@@ -94,67 +94,42 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
             $xmlFile = $xmlDocument->createElement('file');
             $xmlFile->setAttribute('name', $item->getPath());
 
-            $classes      = $item->getClassesAndTraits();
-            $coverage     = $item->getCoverageData();
-            $lines        = array();
-            $ignoredLines = $item->getIgnoredLines();
+            $classes  = $item->getClassesAndTraits();
+            $coverage = $item->getCoverageData();
+            $lines    = array();
 
             foreach ($classes as $className => $class) {
                 $classStatements        = 0;
                 $coveredClassStatements = 0;
                 $coveredMethods         = 0;
+                $classMethods           = 0;
 
                 foreach ($class['methods'] as $methodName => $method) {
-                    $methodCount        = 0;
-                    $methodLines        = 0;
-                    $methodLinesCovered = 0;
+                    if ($method['executableLines']  == 0) {
+                        continue;
+                    }
 
+                    $classMethods++;
+                    $classStatements        += $method['executableLines'];
+                    $coveredClassStatements += $method['executedLines'];
+                    if ($method['coverage'] == 100) {
+                        $coveredMethods++;
+                    }
+
+                    $methodCount = 0;
                     for ($i  = $method['startLine'];
                          $i <= $method['endLine'];
                          $i++) {
-                        if (isset($ignoredLines[$i])) {
-                            continue;
-                        }
-
-                        $add   = TRUE;
-                        $count = 0;
-
-                        if (isset($coverage[$i])) {
-                            if ($coverage[$i] !== NULL) {
-                                $classStatements++;
-                                $methodLines++;
-                            } else {
-                                $add = FALSE;
-                            }
-
-                            $count = count($coverage[$i]);
-
-                            if ($count > 0) {
-                                $coveredClassStatements++;
-                                $methodLinesCovered++;
-                            }
-                        } else {
-                            $add = FALSE;
-                        }
-
-                        $methodCount = max($methodCount, $count);
-
-                        if ($add) {
-                            $lines[$i] = array(
-                              'count' => $count, 'type'  => 'stmt'
-                            );
+                        if (isset($coverage[$i]) && ($coverage[$i] !== null)) {
+                            $methodCount = max($methodCount, count($coverage[$i]));
                         }
                     }
 
-                    if ($methodCount > 0) {
-                        $coveredMethods++;
-                    }
-
                     $lines[$method['startLine']] = array(
-                      'count' => $methodCount,
-                      'crap'  => $method['crap'],
-                      'type'  => 'method',
-                      'name'  => $methodName
+                        'count' => $methodCount,
+                        'crap'  => $method['crap'],
+                        'type'  => 'method',
+                        'name'  => $methodName
                     );
                 }
 
@@ -168,72 +143,72 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
 
                 if (!empty($class['package']['fullPackage'])) {
                     $xmlClass->setAttribute(
-                      'fullPackage', $class['package']['fullPackage']
+                        'fullPackage',
+                        $class['package']['fullPackage']
                     );
                 }
 
                 if (!empty($class['package']['category'])) {
                     $xmlClass->setAttribute(
-                      'category', $class['package']['category']
+                        'category',
+                        $class['package']['category']
                     );
                 }
 
                 if (!empty($class['package']['package'])) {
                     $xmlClass->setAttribute(
-                      'package', $class['package']['package']
+                        'package',
+                        $class['package']['package']
                     );
                 }
 
                 if (!empty($class['package']['subpackage'])) {
                     $xmlClass->setAttribute(
-                      'subpackage', $class['package']['subpackage']
+                        'subpackage',
+                        $class['package']['subpackage']
                     );
                 }
 
                 $xmlFile->appendChild($xmlClass);
 
                 $xmlMetrics = $xmlDocument->createElement('metrics');
-                $xmlMetrics->setAttribute('methods', count($class['methods']));
+                $xmlMetrics->setAttribute('methods', $classMethods);
                 $xmlMetrics->setAttribute('coveredmethods', $coveredMethods);
                 $xmlMetrics->setAttribute('conditionals', 0);
                 $xmlMetrics->setAttribute('coveredconditionals', 0);
                 $xmlMetrics->setAttribute('statements', $classStatements);
                 $xmlMetrics->setAttribute(
-                  'coveredstatements', $coveredClassStatements
+                    'coveredstatements',
+                    $coveredClassStatements
                 );
                 $xmlMetrics->setAttribute(
-                  'elements',
-                  count($class['methods']) +
-                  $classStatements
-                  /* + conditionals */);
+                    'elements',
+                    $classMethods +
+                    $classStatements
+                    /* + conditionals */
+                );
                 $xmlMetrics->setAttribute(
-                  'coveredelements',
-                  $coveredMethods +
-                  $coveredClassStatements
-                  /* + coveredconditionals */
+                    'coveredelements',
+                    $coveredMethods +
+                    $coveredClassStatements
+                    /* + coveredconditionals */
                 );
                 $xmlClass->appendChild($xmlMetrics);
             }
 
             foreach ($coverage as $line => $data) {
-                if ($data === NULL ||
-                    isset($lines[$line]) ||
-                    isset($ignoredLines[$line])) {
+                if ($data === null || isset($lines[$line])) {
                     continue;
                 }
 
                 $lines[$line] = array(
-                  'count' => count($data), 'type' => 'stmt'
+                    'count' => count($data), 'type' => 'stmt'
                 );
             }
 
             ksort($lines);
 
             foreach ($lines as $line => $data) {
-                if (isset($ignoredLines[$line])) {
-                    continue;
-                }
-
                 $xmlLine = $xmlDocument->createElement('line');
                 $xmlLine->setAttribute('num', $line);
                 $xmlLine->setAttribute('type', $data['type']);
@@ -258,27 +233,28 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
             $xmlMetrics->setAttribute('classes', $item->getNumClassesAndTraits());
             $xmlMetrics->setAttribute('methods', $item->getNumMethods());
             $xmlMetrics->setAttribute(
-              'coveredmethods', $item->getNumTestedMethods()
+                'coveredmethods',
+                $item->getNumTestedMethods()
             );
             $xmlMetrics->setAttribute('conditionals', 0);
             $xmlMetrics->setAttribute('coveredconditionals', 0);
             $xmlMetrics->setAttribute(
-              'statements', $item->getNumExecutableLines()
+                'statements',
+                $item->getNumExecutableLines()
             );
             $xmlMetrics->setAttribute(
-              'coveredstatements', $item->getNumExecutedLines()
+                'coveredstatements',
+                $item->getNumExecutedLines()
             );
             $xmlMetrics->setAttribute(
-              'elements',
-              $item->getNumMethods() +
-              $item->getNumExecutableLines()
-              /* + conditionals */
+                'elements',
+                $item->getNumMethods() + $item->getNumExecutableLines()
+                /* + conditionals */
             );
             $xmlMetrics->setAttribute(
-              'coveredelements',
-              $item->getNumTestedMethods() +
-              $item->getNumExecutedLines()
-              /* + coveredconditionals */
+                'coveredelements',
+                $item->getNumTestedMethods() + $item->getNumExecutedLines()
+                /* + coveredconditionals */
             );
             $xmlFile->appendChild($xmlMetrics);
 
@@ -287,7 +263,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
             } else {
                 if (!isset($packages[$namespace])) {
                     $packages[$namespace] = $xmlDocument->createElement(
-                      'package'
+                        'package'
                     );
 
                     $packages[$namespace]->setAttribute('name', $namespace);
@@ -305,37 +281,40 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
         $xmlMetrics->setAttribute('loc', $linesOfCode['loc']);
         $xmlMetrics->setAttribute('ncloc', $linesOfCode['ncloc']);
         $xmlMetrics->setAttribute(
-          'classes', $report->getNumClassesAndTraits()
+            'classes',
+            $report->getNumClassesAndTraits()
         );
         $xmlMetrics->setAttribute('methods', $report->getNumMethods());
         $xmlMetrics->setAttribute(
-          'coveredmethods', $report->getNumTestedMethods()
+            'coveredmethods',
+            $report->getNumTestedMethods()
         );
         $xmlMetrics->setAttribute('conditionals', 0);
         $xmlMetrics->setAttribute('coveredconditionals', 0);
         $xmlMetrics->setAttribute(
-          'statements', $report->getNumExecutableLines()
+            'statements',
+            $report->getNumExecutableLines()
         );
         $xmlMetrics->setAttribute(
-          'coveredstatements', $report->getNumExecutedLines()
+            'coveredstatements',
+            $report->getNumExecutedLines()
         );
         $xmlMetrics->setAttribute(
-          'elements',
-          $report->getNumMethods() +
-          $report->getNumExecutableLines()
-          /* + conditionals */
+            'elements',
+            $report->getNumMethods() + $report->getNumExecutableLines()
+            /* + conditionals */
         );
         $xmlMetrics->setAttribute(
-          'coveredelements',
-          $report->getNumTestedMethods() +
-          $report->getNumExecutedLines()
-          /* + coveredconditionals */
+            'coveredelements',
+            $report->getNumTestedMethods() + $report->getNumExecutedLines()
+            /* + coveredconditionals */
         );
+
         $xmlProject->appendChild($xmlMetrics);
 
-        if ($target !== NULL) {
+        if ($target !== null) {
             if (!is_dir(dirname($target))) {
-                mkdir(dirname($target), 0777, TRUE);
+                mkdir(dirname($target), 0777, true);
             }
 
             return $xmlDocument->save($target);
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php
new file mode 100644
index 0000000000000000000000000000000000000000..a66adc16b6a3529e2949ffee7981baac80f280d3
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Zsolt Takács <zsolt@takacs.cc>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Zsolt Takács <zsolt@takacs.cc>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_Crap4j
+{
+    private $threshold = 30;
+
+    /**
+     * @param  PHP_CodeCoverage $coverage
+     * @param  string           $target
+     * @param  string           $name
+     * @return string
+     */
+    public function process(PHP_CodeCoverage $coverage, $target = null, $name = null)
+    {
+        $document = new DOMDocument('1.0', 'UTF-8');
+        $document->formatOutput = true;
+
+        $root = $document->createElement('crap_result');
+        $document->appendChild($root);
+
+        $project = $document->createElement('project', is_string($name) ? $name : '');
+        $root->appendChild($project);
+        $root->appendChild($document->createElement('timestamp', date('Y-m-d H:i:s', (int) $_SERVER['REQUEST_TIME'])));
+
+        $stats = $document->createElement('stats');
+        $methodsNode = $document->createElement('methods');
+
+        $report   = $coverage->getReport();
+        unset($coverage);
+
+        $fullMethodCount = 0;
+        $fullCrapMethodCount = 0;
+        $fullCrapLoad = 0;
+        $fullCrap = 0;
+
+        foreach ($report as $item) {
+            if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
+                continue;
+            }
+
+            $file = $document->createElement('file');
+            $file->setAttribute('name', $item->getPath());
+
+            $classes = $item->getClassesAndTraits();
+
+            foreach ($classes as $className => $class) {
+                foreach ($class['methods'] as $methodName => $method) {
+                    $crapLoad = $this->getCrapLoad($method['crap'], $method['ccn'], $method['coverage']);
+
+                    $fullCrap += $method['crap'];
+                    $fullCrapLoad += $crapLoad;
+                    $fullMethodCount++;
+
+                    if ($method['crap'] >= $this->threshold) {
+                        $fullCrapMethodCount++;
+                    }
+
+                    $methodNode = $document->createElement('method');
+
+                    $methodNode->appendChild($document->createElement('package', ''));
+                    $methodNode->appendChild($document->createElement('className', $className));
+                    $methodNode->appendChild($document->createElement('methodName', $methodName));
+                    $methodNode->appendChild($document->createElement('methodSignature', htmlspecialchars($method['signature'])));
+                    $methodNode->appendChild($document->createElement('fullMethod', htmlspecialchars($method['signature'])));
+                    $methodNode->appendChild($document->createElement('crap', $this->roundValue($method['crap'])));
+                    $methodNode->appendChild($document->createElement('complexity', $method['ccn']));
+                    $methodNode->appendChild($document->createElement('coverage', $this->roundValue($method['coverage'])));
+                    $methodNode->appendChild($document->createElement('crapLoad', round($crapLoad)));
+
+                    $methodsNode->appendChild($methodNode);
+                }
+            }
+        }
+
+        $stats->appendChild($document->createElement('name', 'Method Crap Stats'));
+        $stats->appendChild($document->createElement('methodCount', $fullMethodCount));
+        $stats->appendChild($document->createElement('crapMethodCount', $fullCrapMethodCount));
+        $stats->appendChild($document->createElement('crapLoad', round($fullCrapLoad)));
+        $stats->appendChild($document->createElement('totalCrap', $fullCrap));
+        $stats->appendChild($document->createElement('crapMethodPercent', $this->roundValue(100 * $fullCrapMethodCount / $fullMethodCount)));
+
+        $root->appendChild($stats);
+        $root->appendChild($methodsNode);
+
+        if ($target !== null) {
+            if (!is_dir(dirname($target))) {
+                mkdir(dirname($target), 0777, true);
+            }
+
+            return $document->save($target);
+        } else {
+            return $document->saveXML();
+        }
+    }
+
+    private function getCrapLoad($crapValue, $cyclomaticComplexity, $coveragePercent)
+    {
+        $crapLoad = 0;
+        if ($crapValue > $this->threshold) {
+            $crapLoad += $cyclomaticComplexity * (1.0 - $coveragePercent / 100);
+            $crapLoad += $cyclomaticComplexity / $this->threshold;
+        }
+
+        return $crapLoad;
+    }
+
+    private function roundValue($value)
+    {
+        return round($value, 2);
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Factory.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php
similarity index 90%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Factory.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php
index ab0f4005b297b784d163f3f83884d74a491cac84..c8cb63b4b30d5151699c72a23e2e8ab9349f8b40 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Factory.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
@@ -64,14 +64,14 @@ public function create(PHP_CodeCoverage $coverage)
         $files      = $coverage->getData();
         $commonPath = $this->reducePaths($files);
         $root       = new PHP_CodeCoverage_Report_Node_Directory(
-                        $commonPath, NULL
-                      );
+            $commonPath, null
+        );
 
         $this->addItems(
-          $root,
-          $this->buildDirectoryStructure($files),
-          $coverage->getTests(),
-          $coverage->getCacheTokens()
+            $root,
+            $this->buildDirectoryStructure($files),
+            $coverage->getTests(),
+            $coverage->getCacheTokens()
         );
 
         return $root;
@@ -83,7 +83,7 @@ public function create(PHP_CodeCoverage $coverage)
      * @param array                                  $tests
      * @param boolean                                $cacheTokens
      */
-    protected function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $cacheTokens)
+    private function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $cacheTokens)
     {
         foreach ($items as $key => $value) {
             if (substr($key, -2) == '/f') {
@@ -142,7 +142,7 @@ protected function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array
      * @param  array $files
      * @return array
      */
-    protected function buildDirectoryStructure($files)
+    private function buildDirectoryStructure($files)
     {
         $result = array();
 
@@ -204,10 +204,10 @@ protected function buildDirectoryStructure($files)
      * )
      * </code>
      *
-     * @param  array $files
+     * @param  array  $files
      * @return string
      */
-    protected function reducePaths(&$files)
+    private function reducePaths(&$files)
     {
         if (empty($files)) {
             return '.';
@@ -231,6 +231,7 @@ protected function reducePaths(&$files)
             // strip phar:// prefixes
             if (strpos($paths[$i], 'phar://') === 0) {
                 $paths[$i] = substr($paths[$i], 7);
+                $paths[$i] = strtr($paths[$i], '/', DIRECTORY_SEPARATOR);
             }
             $paths[$i] = explode(DIRECTORY_SEPARATOR, $paths[$i]);
 
@@ -239,7 +240,7 @@ protected function reducePaths(&$files)
             }
         }
 
-        $done = FALSE;
+        $done = false;
         $max  = count($paths);
 
         while (!$done) {
@@ -247,7 +248,7 @@ protected function reducePaths(&$files)
                 if (!isset($paths[$i][0]) ||
                     !isset($paths[$i+1][0]) ||
                     $paths[$i][0] != $paths[$i+1][0]) {
-                    $done = TRUE;
+                    $done = true;
                     break;
                 }
             }
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php
similarity index 61%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php
index b2546259e56aa15d725f2d06868bcc1782a9730f..bbfa2e87fbda254e8865dc765836b0aa2e093915 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.0.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.0.0
@@ -59,54 +59,44 @@ class PHP_CodeCoverage_Report_HTML
     /**
      * @var string
      */
-    protected $templatePath;
+    private $templatePath;
 
     /**
      * @var string
      */
-    protected $charset;
-
-    /**
-     * @var string
-     */
-    protected $generator;
+    private $generator;
 
     /**
      * @var integer
      */
-    protected $lowUpperBound;
+    private $lowUpperBound;
 
     /**
      * @var integer
      */
-    protected $highLowerBound;
-
-    /**
-     * @var boolean
-     */
-    protected $highlight;
+    private $highLowerBound;
 
     /**
      * Constructor.
      *
-     * @param array $options
+     * @param integer $lowUpperBound
+     * @param integer $highLowerBound
+     * @param string  $generator
      */
-    public function __construct($charset = 'UTF-8', $highlight = FALSE, $lowUpperBound = 35, $highLowerBound = 70, $generator = '')
+    public function __construct($lowUpperBound = 50, $highLowerBound = 90, $generator = '')
     {
-        $this->charset        = $charset;
         $this->generator      = $generator;
         $this->highLowerBound = $highLowerBound;
-        $this->highlight      = $highlight;
         $this->lowUpperBound  = $lowUpperBound;
 
         $this->templatePath = sprintf(
-          '%s%sHTML%sRenderer%sTemplate%s',
+            '%s%sHTML%sRenderer%sTemplate%s',
 
-          dirname(__FILE__),
-          DIRECTORY_SEPARATOR,
-          DIRECTORY_SEPARATOR,
-          DIRECTORY_SEPARATOR,
-          DIRECTORY_SEPARATOR
+            dirname(__FILE__),
+            DIRECTORY_SEPARATOR,
+            DIRECTORY_SEPARATOR,
+            DIRECTORY_SEPARATOR,
+            DIRECTORY_SEPARATOR
         );
     }
 
@@ -127,43 +117,49 @@ public function process(PHP_CodeCoverage $coverage, $target)
         $date = date('D M j G:i:s T Y', $_SERVER['REQUEST_TIME']);
 
         $dashboard = new PHP_CodeCoverage_Report_HTML_Renderer_Dashboard(
-          $this->templatePath,
-          $this->charset,
-          $this->generator,
-          $date,
-          $this->lowUpperBound,
-          $this->highLowerBound
+            $this->templatePath,
+            $this->generator,
+            $date,
+            $this->lowUpperBound,
+            $this->highLowerBound
         );
 
         $directory = new PHP_CodeCoverage_Report_HTML_Renderer_Directory(
-          $this->templatePath,
-          $this->charset,
-          $this->generator,
-          $date,
-          $this->lowUpperBound,
-          $this->highLowerBound
+            $this->templatePath,
+            $this->generator,
+            $date,
+            $this->lowUpperBound,
+            $this->highLowerBound
         );
 
         $file = new PHP_CodeCoverage_Report_HTML_Renderer_File(
-          $this->templatePath,
-          $this->charset,
-          $this->generator,
-          $date,
-          $this->lowUpperBound,
-          $this->highLowerBound,
-          $this->highlight
+            $this->templatePath,
+            $this->generator,
+            $date,
+            $this->lowUpperBound,
+            $this->highLowerBound
         );
 
-        $dashboard->render($report, $target . 'index.dashboard.html');
         $directory->render($report, $target . 'index.html');
+        $dashboard->render($report, $target . 'dashboard.html');
 
         foreach ($report as $node) {
             $id = $node->getId();
 
             if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
-                $dashboard->render($node, $target . $id . '.dashboard.html');
-                $directory->render($node, $target . $id . '.html');
+                if (!file_exists($target . $id)) {
+                    mkdir($target . $id, 0777, true);
+                }
+
+                $directory->render($node, $target . $id . '/index.html');
+                $dashboard->render($node, $target . $id . '/dashboard.html');
             } else {
+                $dir = dirname($target . $id);
+
+                if (!file_exists($dir)) {
+                    mkdir($dir, 0777, true);
+                }
+
                 $file->render($node, $target . $id . '.html');
             }
         }
@@ -174,31 +170,36 @@ public function process(PHP_CodeCoverage $coverage, $target)
     /**
      * @param string $target
      */
-    protected function copyFiles($target)
+    private function copyFiles($target)
     {
         $dir = $this->getDirectory($target . 'css');
         copy($this->templatePath . 'css/bootstrap.min.css', $dir . 'bootstrap.min.css');
-        copy($this->templatePath . 'css/bootstrap-responsive.min.css', $dir . 'bootstrap-responsive.min.css');
+        copy($this->templatePath . 'css/nv.d3.css', $dir . 'nv.d3.css');
         copy($this->templatePath . 'css/style.css', $dir . 'style.css');
 
+        $dir = $this->getDirectory($target . 'fonts');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.eot', $dir . 'glyphicons-halflings-regular.eot');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.svg', $dir . 'glyphicons-halflings-regular.svg');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.ttf', $dir . 'glyphicons-halflings-regular.ttf');
+        copy($this->templatePath . 'fonts/glyphicons-halflings-regular.woff', $dir . 'glyphicons-halflings-regular.woff');
+
         $dir = $this->getDirectory($target . 'js');
         copy($this->templatePath . 'js/bootstrap.min.js', $dir . 'bootstrap.min.js');
-        copy($this->templatePath . 'js/highcharts.js', $dir . 'highcharts.js');
-        copy($this->templatePath . 'js/jquery.min.js', $dir . 'jquery.min.js');
+        copy($this->templatePath . 'js/d3.min.js', $dir . 'd3.min.js');
+        copy($this->templatePath . 'js/holder.js', $dir . 'holder.js');
         copy($this->templatePath . 'js/html5shiv.js', $dir . 'html5shiv.js');
-
-        $dir = $this->getDirectory($target . 'img');
-        copy($this->templatePath . 'img/glyphicons-halflings.png', $dir . 'glyphicons-halflings.png');
-        copy($this->templatePath . 'img/glyphicons-halflings-white.png', $dir . 'glyphicons-halflings-white.png');
+        copy($this->templatePath . 'js/jquery.js', $dir . 'jquery.js');
+        copy($this->templatePath . 'js/nv.d3.min.js', $dir . 'nv.d3.min.js');
+        copy($this->templatePath . 'js/respond.min.js', $dir . 'respond.min.js');
     }
 
     /**
-     * @param  string $directory
+     * @param  string                     $directory
      * @return string
      * @throws PHP_CodeCoverage_Exception
      * @since  Method available since Release 1.2.0
      */
-    protected function getDirectory($directory)
+    private function getDirectory($directory)
     {
         if (substr($directory, -1, 1) != DIRECTORY_SEPARATOR) {
             $directory .= DIRECTORY_SEPARATOR;
@@ -208,15 +209,15 @@ protected function getDirectory($directory)
             return $directory;
         }
 
-        if (@mkdir($directory, 0777, TRUE)) {
+        if (@mkdir($directory, 0777, true)) {
             return $directory;
         }
 
         throw new PHP_CodeCoverage_Exception(
-          sprintf(
-            'Directory "%s" does not exist.',
-            $directory
-          )
+            sprintf(
+                'Directory "%s" does not exist.',
+                $directory
+            )
         );
     }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php
similarity index 60%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php
index 3ed476f241771bb9296b2417681e787f67039fd8..9dcb42b4b9b2aa9410ef3286132f575be54cf29a 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,19 +37,21 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
  */
 
+use SebastianBergmann\Environment\Runtime;
+
 /**
  * Base class for PHP_CodeCoverage_Report_Node renderers.
  *
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
@@ -61,11 +63,6 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
      */
     protected $templatePath;
 
-    /**
-     * @var string
-     */
-    protected $charset;
-
     /**
      * @var string
      */
@@ -86,24 +83,30 @@ abstract class PHP_CodeCoverage_Report_HTML_Renderer
      */
     protected $highLowerBound;
 
+    /**
+     * @var string
+     */
+    protected $version;
+
     /**
      * Constructor.
      *
      * @param string  $templatePath
-     * @param string  $charset
      * @param string  $generator
      * @param string  $date
      * @param integer $lowUpperBound
      * @param integer $highLowerBound
      */
-    public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound)
+    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
     {
+        $version = new SebastianBergmann\Version('2.0.8', dirname(dirname(dirname(dirname(__DIR__)))));
+
         $this->templatePath   = $templatePath;
-        $this->charset        = $charset;
         $this->generator      = $generator;
         $this->date           = $date;
         $this->lowUpperBound  = $lowUpperBound;
         $this->highLowerBound = $highLowerBound;
+        $this->version        = $version->getVersion();
     }
 
     /**
@@ -122,10 +125,10 @@ protected function renderItemTemplate(Text_Template $template, array $data)
             $classesLevel = $this->getColorLevel($data['testedClassesPercent']);
 
             $classesNumber = $data['numTestedClasses'] . $numSeperator .
-                             $data['numClasses'];
+                $data['numClasses'];
 
             $classesBar = $this->getCoverageBar(
-              $data['testedClassesPercent']
+                $data['testedClassesPercent']
             );
         }
 
@@ -137,10 +140,10 @@ protected function renderItemTemplate(Text_Template $template, array $data)
             $methodsLevel = $this->getColorLevel($data['testedMethodsPercent']);
 
             $methodsNumber = $data['numTestedMethods'] . $numSeperator .
-                             $data['numMethods'];
+                $data['numMethods'];
 
             $methodsBar = $this->getCoverageBar(
-              $data['testedMethodsPercent']
+                $data['testedMethodsPercent']
             );
         }
 
@@ -152,31 +155,31 @@ protected function renderItemTemplate(Text_Template $template, array $data)
             $linesLevel = $this->getColorLevel($data['linesExecutedPercent']);
 
             $linesNumber = $data['numExecutedLines'] . $numSeperator .
-                           $data['numExecutableLines'];
+                $data['numExecutableLines'];
 
             $linesBar = $this->getCoverageBar(
-              $data['linesExecutedPercent']
+                $data['linesExecutedPercent']
             );
         }
 
         $template->setVar(
-          array(
-            'icon' => isset($data['icon']) ? $data['icon'] : '',
-            'crap' => isset($data['crap']) ? $data['crap'] : '',
-            'name' => $data['name'],
-            'lines_bar' => $linesBar,
-            'lines_executed_percent' => $data['linesExecutedPercentAsString'],
-            'lines_level' => $linesLevel,
-            'lines_number' => $linesNumber,
-            'methods_bar' => $methodsBar,
-            'methods_tested_percent' => $data['testedMethodsPercentAsString'],
-            'methods_level' => $methodsLevel,
-            'methods_number' => $methodsNumber,
-            'classes_bar' => $classesBar,
-            'classes_tested_percent' => isset($data['testedClassesPercentAsString']) ? $data['testedClassesPercentAsString'] : '',
-            'classes_level' => $classesLevel,
-            'classes_number' => $classesNumber
-          )
+            array(
+                'icon' => isset($data['icon']) ? $data['icon'] : '',
+                'crap' => isset($data['crap']) ? $data['crap'] : '',
+                'name' => $data['name'],
+                'lines_bar' => $linesBar,
+                'lines_executed_percent' => $data['linesExecutedPercentAsString'],
+                'lines_level' => $linesLevel,
+                'lines_number' => $linesNumber,
+                'methods_bar' => $methodsBar,
+                'methods_tested_percent' => $data['testedMethodsPercentAsString'],
+                'methods_level' => $methodsLevel,
+                'methods_number' => $methodsNumber,
+                'classes_bar' => $classesBar,
+                'classes_tested_percent' => isset($data['testedClassesPercentAsString']) ? $data['testedClassesPercentAsString'] : '',
+                'classes_level' => $classesLevel,
+                'classes_number' => $classesNumber
+            )
         );
 
         return $template->render();
@@ -188,74 +191,96 @@ protected function renderItemTemplate(Text_Template $template, array $data)
      */
     protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeCoverage_Report_Node $node)
     {
+        $runtime = new Runtime;
+
         $template->setVar(
-          array(
-            'id'               => $node->getId(),
-            'full_path'        => $node->getPath(),
-            'breadcrumbs'      => $this->getBreadcrumbs($node),
-            'charset'          => $this->charset,
-            'date'             => $this->date,
-            'version'          => PHP_CodeCoverage_Version::id(),
-            'php_version'      => PHP_VERSION,
-            'generator'        => $this->generator,
-            'low_upper_bound'  => $this->lowUpperBound,
-            'high_lower_bound' => $this->highLowerBound
-          )
+            array(
+                'id'               => $node->getId(),
+                'full_path'        => $node->getPath(),
+                'path_to_root'     => $this->getPathToRoot($node),
+                'breadcrumbs'      => $this->getBreadcrumbs($node),
+                'date'             => $this->date,
+                'version'          => $this->version,
+                'runtime_name'     => $runtime->getName(),
+                'runtime_version'  => $runtime->getVersion(),
+                'runtime_link'     => $runtime->getVendorUrl(),
+                'generator'        => $this->generator,
+                'low_upper_bound'  => $this->lowUpperBound,
+                'high_lower_bound' => $this->highLowerBound
+            )
         );
     }
 
     protected function getBreadcrumbs(PHP_CodeCoverage_Report_Node $node)
     {
         $breadcrumbs = '';
+        $path        = $node->getPathAsArray();
+        $pathToRoot  = array();
+        $max         = count($path);
 
-        $path = $node->getPathAsArray();
+        if ($node instanceof PHP_CodeCoverage_Report_Node_File) {
+            $max--;
+        }
+
+        for ($i = 0; $i < $max; $i++) {
+            $pathToRoot[] = str_repeat('../', $i);
+        }
 
         foreach ($path as $step) {
             if ($step !== $node) {
-                $breadcrumbs .= $this->getInactiveBreadcrumb($step);
-            } else {
-                $breadcrumbs .= $this->getActiveBreadcrumb(
-                  $step,
-                  $node instanceof PHP_CodeCoverage_Report_Node_Directory
+                $breadcrumbs .= $this->getInactiveBreadcrumb(
+                    $step, array_pop($pathToRoot)
                 );
+            } else {
+                $breadcrumbs .= $this->getActiveBreadcrumb($step);
             }
         }
 
         return $breadcrumbs;
     }
 
-    protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $isDirectory)
+    protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
     {
         $buffer = sprintf(
-          '        <li class="active">%s</li>' . "\n",
-          $node->getName()
+            '        <li class="active">%s</li>' . "\n",
+            $node->getName()
         );
 
-        if ($isDirectory) {
-            $buffer .= sprintf(
-              '        <li>(<a href="%s.dashboard.html">Dashboard</a>)</li>' . "\n",
-              $node->getId()
-            );
+        if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
+            $buffer .= '        <li>(<a href="dashboard.html">Dashboard</a>)</li>' . "\n";
         }
 
         return $buffer;
     }
 
-    protected function getInactiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
+    protected function getInactiveBreadcrumb(PHP_CodeCoverage_Report_Node $node, $pathToRoot)
     {
         return sprintf(
-          '        <li><a href="%s.html">%s</a> <span class="divider">/</span></li>' . "\n",
-          $node->getId(),
-          $node->getName()
+            '        <li><a href="%sindex.html">%s</a></li>' . "\n",
+            $pathToRoot,
+            $node->getName()
         );
     }
 
+    protected function getPathToRoot(PHP_CodeCoverage_Report_Node $node)
+    {
+        $id    = $node->getId();
+        $depth = substr_count($id, '/');
+
+        if ($id != 'index' &&
+            $node instanceof PHP_CodeCoverage_Report_Node_Directory) {
+            $depth++;
+        }
+
+        return str_repeat('../', $depth);
+    }
+
     protected function getCoverageBar($percent)
     {
         $level = $this->getColorLevel($percent);
 
         $template = new Text_Template(
-          $this->templatePath . 'coverage_bar.html'
+            $this->templatePath . 'coverage_bar.html', '{{', '}}'
         );
 
         $template->setVar(array('level' => $level, 'percent' => sprintf("%.2F", $percent)));
@@ -271,14 +296,10 @@ protected function getColorLevel($percent)
     {
         if ($percent < $this->lowUpperBound) {
             return 'danger';
-        }
-
-        else if ($percent >= $this->lowUpperBound &&
-                 $percent <  $this->highLowerBound) {
+        } elseif ($percent >= $this->lowUpperBound &&
+            $percent <  $this->highLowerBound) {
             return 'warning';
-        }
-
-        else {
+        } else {
             return 'success';
         }
     }
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php
new file mode 100644
index 0000000000000000000000000000000000000000..b913c4262d9a5a2078331e5038c8be440c3fb7bd
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 1.1.0
+ */
+
+/**
+ * Renders the dashboard for a PHP_CodeCoverage_Report_Node_Directory node.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 1.1.0
+ */
+class PHP_CodeCoverage_Report_HTML_Renderer_Dashboard extends PHP_CodeCoverage_Report_HTML_Renderer
+{
+    /**
+     * @param PHP_CodeCoverage_Report_Node_Directory $node
+     * @param string                                 $file
+     */
+    public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
+    {
+        $classes  = $node->getClassesAndTraits();
+        $template = new Text_Template(
+            $this->templatePath . 'dashboard.html', '{{', '}}'
+        );
+
+        $this->setCommonTemplateVariables($template, $node);
+
+        $complexity           = $this->complexity($classes);
+        $coverageDistribution = $this->coverageDistribution($classes);
+        $insufficientCoverage = $this->insufficientCoverage($classes);
+        $projectRisks         = $this->projectRisks($classes);
+
+        $template->setVar(
+            array(
+                'insufficient_coverage_classes' => $insufficientCoverage['class'],
+                'insufficient_coverage_methods' => $insufficientCoverage['method'],
+                'project_risks_classes'         => $projectRisks['class'],
+                'project_risks_methods'         => $projectRisks['method'],
+                'complexity_class'              => $complexity['class'],
+                'complexity_method'             => $complexity['method'],
+                'class_coverage_distribution'   => $coverageDistribution['class'],
+                'method_coverage_distribution'  => $coverageDistribution['method']
+            )
+        );
+
+        $template->renderTo($file);
+    }
+
+    /**
+     * Returns the data for the Class/Method Complexity charts.
+     *
+     * @param  array $classes
+     * @return array
+     */
+    protected function complexity(array $classes)
+    {
+        $result = array('class' => array(), 'method' => array());
+
+        foreach ($classes as $className => $class) {
+            foreach ($class['methods'] as $methodName => $method) {
+                if ($className != '*') {
+                    $methodName = $className . '::' . $methodName;
+                }
+
+                $result['method'][] = array(
+                    $method['coverage'],
+                    $method['ccn'],
+                    sprintf(
+                        '<a href="%s">%s</a>',
+                        $method['link'],
+                        $methodName
+                    )
+                );
+            }
+
+            $result['class'][] = array(
+                $class['coverage'],
+                $class['ccn'],
+                sprintf(
+                    '<a href="%s">%s</a>',
+                    $class['link'],
+                    $className
+                )
+            );
+        }
+
+        return array(
+            'class' => json_encode($result['class']),
+            'method' => json_encode($result['method'])
+        );
+    }
+
+    /**
+     * Returns the data for the Class / Method Coverage Distribution chart.
+     *
+     * @param  array $classes
+     * @return array
+     */
+    protected function coverageDistribution(array $classes)
+    {
+        $result = array(
+            'class' => array(
+                '0%'      => 0,
+                '0-10%'   => 0,
+                '10-20%'  => 0,
+                '20-30%'  => 0,
+                '30-40%'  => 0,
+                '40-50%'  => 0,
+                '50-60%'  => 0,
+                '60-70%'  => 0,
+                '70-80%'  => 0,
+                '80-90%'  => 0,
+                '90-100%' => 0,
+                '100%'    => 0
+            ),
+            'method' => array(
+                '0%'      => 0,
+                '0-10%'   => 0,
+                '10-20%'  => 0,
+                '20-30%'  => 0,
+                '30-40%'  => 0,
+                '40-50%'  => 0,
+                '50-60%'  => 0,
+                '60-70%'  => 0,
+                '70-80%'  => 0,
+                '80-90%'  => 0,
+                '90-100%' => 0,
+                '100%'    => 0
+            )
+        );
+
+        foreach ($classes as $class) {
+            foreach ($class['methods'] as $methodName => $method) {
+                if ($method['coverage'] == 0) {
+                    $result['method']['0%']++;
+                } elseif ($method['coverage'] == 100) {
+                    $result['method']['100%']++;
+                } else {
+                    $key = floor($method['coverage'] / 10) * 10;
+                    $key = $key . '-' . ($key + 10) . '%';
+                    $result['method'][$key]++;
+                }
+            }
+
+            if ($class['coverage'] == 0) {
+                $result['class']['0%']++;
+            } elseif ($class['coverage'] == 100) {
+                $result['class']['100%']++;
+            } else {
+                $key = floor($class['coverage'] / 10) * 10;
+                $key = $key . '-' . ($key + 10) . '%';
+                $result['class'][$key]++;
+            }
+        }
+
+        return array(
+            'class' => json_encode(array_values($result['class'])),
+            'method' => json_encode(array_values($result['method']))
+        );
+    }
+
+    /**
+     * Returns the classes / methods with insufficient coverage.
+     *
+     * @param  array $classes
+     * @return array
+     */
+    protected function insufficientCoverage(array $classes)
+    {
+        $leastTestedClasses = array();
+        $leastTestedMethods = array();
+        $result             = array('class' => '', 'method' => '');
+
+        foreach ($classes as $className => $class) {
+            foreach ($class['methods'] as $methodName => $method) {
+                if ($method['coverage'] < $this->highLowerBound) {
+                    if ($className != '*') {
+                        $key = $className . '::' . $methodName;
+                    } else {
+                        $key = $methodName;
+                    }
+
+                    $leastTestedMethods[$key] = $method['coverage'];
+                }
+            }
+
+            if ($class['coverage'] < $this->highLowerBound) {
+                $leastTestedClasses[$className] = $class['coverage'];
+            }
+        }
+
+        asort($leastTestedClasses);
+        asort($leastTestedMethods);
+
+        foreach ($leastTestedClasses as $className => $coverage) {
+            $result['class'] .= sprintf(
+                '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d%%</td></tr>' . "\n",
+                $classes[$className]['link'],
+                $className,
+                $coverage
+            );
+        }
+
+        foreach ($leastTestedMethods as $methodName => $coverage) {
+            list($class, $method) = explode('::', $methodName);
+
+            $result['method'] .= sprintf(
+                '       <tr><td><a href="%s"><abbr title="%s">%s</a></a></td><td class="text-right">%d%%</td></tr>' . "\n",
+                $classes[$class]['methods'][$method]['link'],
+                $methodName,
+                $method,
+                $coverage
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the project risks according to the CRAP index.
+     *
+     * @param  array $classes
+     * @return array
+     */
+    protected function projectRisks(array $classes)
+    {
+        $classRisks  = array();
+        $methodRisks = array();
+        $result      = array('class' => '', 'method' => '');
+
+        foreach ($classes as $className => $class) {
+            foreach ($class['methods'] as $methodName => $method) {
+                if ($method['coverage'] < $this->highLowerBound &&
+                    $method['ccn'] > 1) {
+                    if ($className != '*') {
+                        $key = $className . '::' . $methodName;
+                    } else {
+                        $key = $methodName;
+                    }
+
+                    $methodRisks[$key] = $method['crap'];
+                }
+            }
+
+            if ($class['coverage'] < $this->highLowerBound &&
+                $class['ccn'] > count($class['methods'])) {
+                $classRisks[$className] = $class['crap'];
+            }
+        }
+
+        arsort($classRisks);
+        arsort($methodRisks);
+
+        foreach ($classRisks as $className => $crap) {
+            $result['class'] .= sprintf(
+                '       <tr><td><a href="%s">%s</a></td><td class="text-right">%d</td></tr>' . "\n",
+                $classes[$className]['link'],
+                $className,
+                $crap
+            );
+        }
+
+        foreach ($methodRisks as $methodName => $crap) {
+            list($class, $method) = explode('::', $methodName);
+
+            $result['method'] .= sprintf(
+                '       <tr><td><a href="%s"><abbr title="%s">%s</abbr></a></td><td class="text-right">%d</td></tr>' . "\n",
+                $classes[$class]['methods'][$method]['link'],
+                $methodName,
+                $method,
+                $crap
+            );
+        }
+
+        return $result;
+    }
+
+    protected function getActiveBreadcrumb(PHP_CodeCoverage_Report_Node $node)
+    {
+        return sprintf(
+            '        <li><a href="index.html">%s</a></li>' . "\n" .
+            '        <li class="active">(Dashboard)</li>' . "\n",
+            $node->getName()
+        );
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php
similarity index 63%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php
index c38f84489e085d2eb45c261999a93ebc36f4a8f1..4cf6000ca9654f8a56c7edb63704dff6fcab5811 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
@@ -62,11 +62,11 @@ class PHP_CodeCoverage_Report_HTML_Renderer_Directory extends PHP_CodeCoverage_R
      */
     public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
     {
-        $template = new Text_Template($this->templatePath . 'directory.html');
+        $template = new Text_Template($this->templatePath . 'directory.html', '{{', '}}');
 
         $this->setCommonTemplateVariables($template, $node);
 
-        $items = $this->renderItem($node, TRUE);
+        $items = $this->renderItem($node, true);
 
         foreach ($node->getDirectories() as $item) {
             $items .= $this->renderItem($item);
@@ -77,10 +77,10 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
         }
 
         $template->setVar(
-          array(
-            'id'    => $node->getId(),
-            'items' => $items
-          )
+            array(
+                'id'    => $node->getId(),
+                'items' => $items
+            )
         );
 
         $template->renderTo($file);
@@ -91,42 +91,48 @@ public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file)
      * @param  boolean                      $total
      * @return string
      */
-    protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = FALSE)
+    protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = false)
     {
         $data = array(
-          'numClasses'                   => $item->getNumClassesAndTraits(),
-          'numTestedClasses'             => $item->getNumTestedClassesAndTraits(),
-          'numMethods'                   => $item->getNumMethods(),
-          'numTestedMethods'             => $item->getNumTestedMethods(),
-          'linesExecutedPercent'         => $item->getLineExecutedPercent(FALSE),
-          'linesExecutedPercentAsString' => $item->getLineExecutedPercent(),
-          'numExecutedLines'             => $item->getNumExecutedLines(),
-          'numExecutableLines'           => $item->getNumExecutableLines(),
-          'testedMethodsPercent'         => $item->getTestedMethodsPercent(FALSE),
-          'testedMethodsPercentAsString' => $item->getTestedMethodsPercent(),
-          'testedClassesPercent'         => $item->getTestedClassesAndTraitsPercent(FALSE),
-          'testedClassesPercentAsString' => $item->getTestedClassesAndTraitsPercent()
+            'numClasses'                   => $item->getNumClassesAndTraits(),
+            'numTestedClasses'             => $item->getNumTestedClassesAndTraits(),
+            'numMethods'                   => $item->getNumMethods(),
+            'numTestedMethods'             => $item->getNumTestedMethods(),
+            'linesExecutedPercent'         => $item->getLineExecutedPercent(false),
+            'linesExecutedPercentAsString' => $item->getLineExecutedPercent(),
+            'numExecutedLines'             => $item->getNumExecutedLines(),
+            'numExecutableLines'           => $item->getNumExecutableLines(),
+            'testedMethodsPercent'         => $item->getTestedMethodsPercent(false),
+            'testedMethodsPercentAsString' => $item->getTestedMethodsPercent(),
+            'testedClassesPercent'         => $item->getTestedClassesAndTraitsPercent(false),
+            'testedClassesPercentAsString' => $item->getTestedClassesAndTraitsPercent()
         );
 
         if ($total) {
             $data['name'] = 'Total';
         } else {
-            $data['name'] = sprintf(
-              '<a href="%s.html">%s</a>',
-              $item->getId(),
-              $item->getName()
-            );
-
             if ($item instanceof PHP_CodeCoverage_Report_Node_Directory) {
-                $data['icon'] = '<i class="icon-folder-open"></i> ';
+                $data['name'] = sprintf(
+                    '<a href="%s/index.html">%s</a>',
+                    $item->getName(),
+                    $item->getName()
+                );
+
+                $data['icon'] = '<span class="glyphicon glyphicon-folder-open"></span> ';
             } else {
-                $data['icon'] = '<i class="icon-file"></i> ';
+                $data['name'] = sprintf(
+                    '<a href="%s.html">%s</a>',
+                    $item->getName(),
+                    $item->getName()
+                );
+
+                $data['icon'] = '<span class="glyphicon glyphicon-file"></span> ';
             }
         }
 
         return $this->renderItemTemplate(
-          new Text_Template($this->templatePath . 'directory_item.html'),
-          $data
+            new Text_Template($this->templatePath . 'directory_item.html', '{{', '}}'),
+            $data
         );
     }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php
similarity index 60%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php
index 351028b985cabc516e64736955cfc5604de289ca..8c73f8f63d2f587db334ffa4a8eb6b38f7aac17a 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -55,6 +55,14 @@
 if (!defined('T_CALLABLE')) {
     define('T_CALLABLE', 1003);
 }
+
+if (!defined('T_FINALLY')) {
+    define('T_FINALLY', 1004);
+}
+
+if (!defined('T_YIELD')) {
+    define('T_YIELD', 1005);
+}
 // @codeCoverageIgnoreEnd
 
 /**
@@ -63,41 +71,31 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
  */
 class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report_HTML_Renderer
 {
-    /**
-     * @var boolean
-     */
-    protected $highlight;
-
     /**
      * Constructor.
      *
      * @param string  $templatePath
-     * @param string  $charset
      * @param string  $generator
      * @param string  $date
      * @param integer $lowUpperBound
      * @param integer $highLowerBound
-     * @param boolean $highlight
      */
-    public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound, $highlight)
+    public function __construct($templatePath, $generator, $date, $lowUpperBound, $highLowerBound)
     {
         parent::__construct(
-          $templatePath,
-          $charset,
-          $generator,
-          $date,
-          $lowUpperBound,
-          $highLowerBound
+            $templatePath,
+            $generator,
+            $date,
+            $lowUpperBound,
+            $highLowerBound
         );
-
-        $this->highlight = $highlight;
     }
 
     /**
@@ -106,13 +104,13 @@ public function __construct($templatePath, $charset, $generator, $date, $lowUppe
      */
     public function render(PHP_CodeCoverage_Report_Node_File $node, $file)
     {
-        $template = new Text_Template($this->templatePath . 'file.html');
+        $template = new Text_Template($this->templatePath . 'file.html', '{{', '}}');
 
         $template->setVar(
-          array(
-            'items' => $this->renderItems($node),
-            'lines' => $this->renderSource($node)
-          )
+            array(
+                'items' => $this->renderItems($node),
+                'lines' => $this->renderSource($node)
+            )
         );
 
         $this->setCommonTemplateVariables($template, $node);
@@ -126,42 +124,47 @@ public function render(PHP_CodeCoverage_Report_Node_File $node, $file)
      */
     protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
     {
-        $template = new Text_Template($this->templatePath . 'file_item.html');
+        $template = new Text_Template($this->templatePath . 'file_item.html', '{{', '}}');
 
         $methodItemTemplate = new Text_Template(
-          $this->templatePath . 'method_item.html'
+            $this->templatePath . 'method_item.html', '{{', '}}'
         );
 
         $items = $this->renderItemTemplate(
-          $template,
-          array(
-            'name'                         => 'Total',
-            'numClasses'                   => $node->getNumClassesAndTraits(),
-            'numTestedClasses'             => $node->getNumTestedClassesAndTraits(),
-            'numMethods'                   => $node->getNumMethods(),
-            'numTestedMethods'             => $node->getNumTestedMethods(),
-            'linesExecutedPercent'         => $node->getLineExecutedPercent(FALSE),
-            'linesExecutedPercentAsString' => $node->getLineExecutedPercent(),
-            'numExecutedLines'             => $node->getNumExecutedLines(),
-            'numExecutableLines'           => $node->getNumExecutableLines(),
-            'testedMethodsPercent'         => $node->getTestedMethodsPercent(FALSE),
-            'testedMethodsPercentAsString' => $node->getTestedMethodsPercent(),
-            'testedClassesPercent'         => $node->getTestedClassesAndTraitsPercent(FALSE),
-            'testedClassesPercentAsString' => $node->getTestedClassesAndTraitsPercent(),
-            'crap'                         => '<acronym title="Change Risk Anti-Patterns (CRAP) Index">CRAP</acronym>'
-          )
+            $template,
+            array(
+                'name'                         => 'Total',
+                'numClasses'                   => $node->getNumClassesAndTraits(),
+                'numTestedClasses'             => $node->getNumTestedClassesAndTraits(),
+                'numMethods'                   => $node->getNumMethods(),
+                'numTestedMethods'             => $node->getNumTestedMethods(),
+                'linesExecutedPercent'         => $node->getLineExecutedPercent(false),
+                'linesExecutedPercentAsString' => $node->getLineExecutedPercent(),
+                'numExecutedLines'             => $node->getNumExecutedLines(),
+                'numExecutableLines'           => $node->getNumExecutableLines(),
+                'testedMethodsPercent'         => $node->getTestedMethodsPercent(false),
+                'testedMethodsPercentAsString' => $node->getTestedMethodsPercent(),
+                'testedClassesPercent'         => $node->getTestedClassesAndTraitsPercent(false),
+                'testedClassesPercentAsString' => $node->getTestedClassesAndTraitsPercent(),
+                'crap'                         => '<abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr>'
+            )
         );
 
         $items .= $this->renderFunctionItems(
-          $node->getFunctions(), $methodItemTemplate
+            $node->getFunctions(),
+            $methodItemTemplate
         );
 
         $items .= $this->renderTraitOrClassItems(
-          $node->getTraits(), $template, $methodItemTemplate
+            $node->getTraits(),
+            $template,
+            $methodItemTemplate
         );
 
         $items .= $this->renderTraitOrClassItems(
-          $node->getClasses(), $template, $methodItemTemplate
+            $node->getClasses(),
+            $template,
+            $methodItemTemplate
         );
 
         return $items;
@@ -170,6 +173,7 @@ protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
     /**
      * @param  array         $items
      * @param  Text_Template $template
+     * @param  Text_Template $methodItemTemplate
      * @return string
      */
     protected function renderTraitOrClassItems(array $items, Text_Template $template, Text_Template $methodItemTemplate)
@@ -191,52 +195,52 @@ protected function renderTraitOrClassItems(array $items, Text_Template $template
             }
 
             $buffer .= $this->renderItemTemplate(
-              $template,
-              array(
-                'name'                         => $name,
-                'numClasses'                   => 1,
-                'numTestedClasses'             => $numTestedMethods == $numMethods ? 1 : 0,
-                'numMethods'                   => $numMethods,
-                'numTestedMethods'             => $numTestedMethods,
-                'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
-                                                    $item['executedLines'],
-                                                    $item['executableLines'],
-                                                    FALSE
-                                                  ),
-                'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                    $item['executedLines'],
-                                                    $item['executableLines'],
-                                                    TRUE
-                                                  ),
-                'numExecutedLines'             => $item['executedLines'],
-                'numExecutableLines'           => $item['executableLines'],
-                'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
-                                                    $numTestedMethods,
-                                                    $numMethods,
-                                                    FALSE
-                                                  ),
-                'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                    $numTestedMethods,
-                                                    $numMethods,
-                                                    TRUE
-                                                  ),
-                'testedClassesPercent'         => PHP_CodeCoverage_Util::percent(
-                                                    $numTestedMethods == $numMethods ? 1 : 0,
-                                                    1,
-                                                    FALSE
-                                                  ),
-                'testedClassesPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                    $numTestedMethods == $numMethods ? 1 : 0,
-                                                    1,
-                                                    TRUE
-                                                  ),
-                'crap'                         => $item['crap']
-              )
+                $template,
+                array(
+                    'name'                         => $name,
+                    'numClasses'                   => 1,
+                    'numTestedClasses'             => $numTestedMethods == $numMethods ? 1 : 0,
+                    'numMethods'                   => $numMethods,
+                    'numTestedMethods'             => $numTestedMethods,
+                    'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
+                            $item['executedLines'],
+                            $item['executableLines'],
+                            false
+                        ),
+                    'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
+                            $item['executedLines'],
+                            $item['executableLines'],
+                            true
+                        ),
+                    'numExecutedLines'             => $item['executedLines'],
+                    'numExecutableLines'           => $item['executableLines'],
+                    'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
+                            $numTestedMethods,
+                            $numMethods,
+                            false
+                        ),
+                    'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
+                            $numTestedMethods,
+                            $numMethods,
+                            true
+                        ),
+                    'testedClassesPercent'         => PHP_CodeCoverage_Util::percent(
+                            $numTestedMethods == $numMethods ? 1 : 0,
+                            1,
+                            false
+                        ),
+                    'testedClassesPercentAsString' => PHP_CodeCoverage_Util::percent(
+                            $numTestedMethods == $numMethods ? 1 : 0,
+                            1,
+                            true
+                        ),
+                    'crap'                         => $item['crap']
+                )
             );
 
             foreach ($item['methods'] as $method) {
                 $buffer .= $this->renderFunctionOrMethodItem(
-                  $methodItemTemplate, $method, '&nbsp;'
+                    $methodItemTemplate, $method, '&nbsp;'
                 );
             }
         }
@@ -259,7 +263,7 @@ protected function renderFunctionItems(array $functions, Text_Template $template
 
         foreach ($functions as $function) {
             $buffer .= $this->renderFunctionOrMethodItem(
-              $template, $function
+                $template, $function
             );
         }
 
@@ -275,40 +279,40 @@ protected function renderFunctionOrMethodItem(Text_Template $template, array $it
         $numTestedItems = $item['executedLines'] == $item['executableLines'] ? 1 : 0;
 
         return $this->renderItemTemplate(
-          $template,
-          array(
-            'name'                         => sprintf(
-                                                '%s<a href="#%d">%s</a>',
-                                                $indent,
-                                                $item['startLine'],
-                                                htmlspecialchars($item['signature'])
-                                              ),
-            'numMethods'                   => 1,
-            'numTestedMethods'             => $numTestedItems,
-            'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
-                                                $item['executedLines'],
-                                                $item['executableLines'],
-                                                FALSE
-                                              ),
-            'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                $item['executedLines'],
-                                                $item['executableLines'],
-                                                TRUE
-                                              ),
-            'numExecutedLines'             => $item['executedLines'],
-            'numExecutableLines'           => $item['executableLines'],
-            'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
-                                                $numTestedItems,
-                                                1,
-                                                FALSE
-                                              ),
-            'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                $numTestedItems,
-                                                1,
-                                                TRUE
-                                              ),
-            'crap'                         => $item['crap']
-          )
+            $template,
+            array(
+                'name'                         => sprintf(
+                    '%s<a href="#%d">%s</a>',
+                    $indent,
+                    $item['startLine'],
+                    htmlspecialchars($item['signature'])
+                ),
+                'numMethods'                   => 1,
+                'numTestedMethods'             => $numTestedItems,
+                'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
+                        $item['executedLines'],
+                        $item['executableLines'],
+                        false
+                    ),
+                'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
+                        $item['executedLines'],
+                        $item['executableLines'],
+                        true
+                    ),
+                'numExecutedLines'             => $item['executedLines'],
+                'numExecutableLines'           => $item['executableLines'],
+                'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
+                        $numTestedItems,
+                        1,
+                        false
+                    ),
+                'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
+                        $numTestedItems,
+                        1,
+                        true
+                    ),
+                'crap'                         => $item['crap']
+            )
         );
     }
 
@@ -319,7 +323,6 @@ protected function renderFunctionOrMethodItem(Text_Template $template, array $it
     protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
     {
         $coverageData = $node->getCoverageData();
-        $ignoredLines = $node->getIgnoredLines();
         $testData     = $node->getTestData();
         $codeLines    = $this->loadFile($node->getPath());
         $lines        = '';
@@ -331,18 +334,14 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
             $popoverContent = '';
             $popoverTitle   = '';
 
-            if (!isset($ignoredLines[$i]) && isset($coverageData[$i])) {
+            if (array_key_exists($i, $coverageData)) {
                 $numTests = count($coverageData[$i]);
 
-                if ($coverageData[$i] === NULL) {
+                if ($coverageData[$i] === null) {
                     $trClass = ' class="warning"';
-                }
-
-                else if ($numTests == 0) {
+                } elseif ($numTests == 0) {
                     $trClass = ' class="danger"';
-                }
-
-                else {
+                } else {
                     $trClass        = ' class="success popin"';
                     $popoverContent = '<ul>';
 
@@ -357,34 +356,34 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
                             case 0: {
                                 $testCSS = ' class="success"';
                             }
-                            break;
+                                break;
 
                             case 1:
                             case 2: {
                                 $testCSS = ' class="warning"';
                             }
-                            break;
+                                break;
 
                             case 3: {
                                 $testCSS = ' class="danger"';
                             }
-                            break;
+                                break;
 
                             case 4: {
                                 $testCSS = ' class="danger"';
                             }
-                            break;
+                                break;
 
                             default: {
-                                $testCSS = '';
+                            $testCSS = '';
                             }
                         }
 
                         $popoverContent .= sprintf(
-                          '<li%s>%s</li>',
+                            '<li%s>%s</li>',
 
-                          $testCSS,
-                          htmlspecialchars($test)
+                            $testCSS,
+                            htmlspecialchars($test)
                         );
                     }
 
@@ -394,22 +393,22 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
 
             if (!empty($popoverTitle)) {
                 $popover = sprintf(
-                  ' data-title="%s" data-content="%s" data-placement="bottom" data-html="true"',
-                  $popoverTitle,
-                  htmlspecialchars($popoverContent)
+                    ' data-title="%s" data-content="%s" data-placement="bottom" data-html="true"',
+                    $popoverTitle,
+                    htmlspecialchars($popoverContent)
                 );
             } else {
                 $popover = '';
             }
 
             $lines .= sprintf(
-              '     <tr%s%s><td><div align="right"><a name="%d"></a><a href="#%d">%d</a></div></td><td class="codeLine">%s</td></tr>' . "\n",
-              $trClass,
-              $popover,
-              $i,
-              $i,
-              $i,
-              !$this->highlight ? htmlspecialchars($line) : $line
+                '     <tr%s%s><td><div align="right"><a name="%d"></a><a href="#%d">%d</a></div></td><td class="codeLine">%s</td></tr>' . "\n",
+                $trClass,
+                $popover,
+                $i,
+                $i,
+                $i,
+                $line
             );
 
             $i++;
@@ -424,41 +423,30 @@ protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
      */
     protected function loadFile($file)
     {
-        $buffer = file_get_contents($file);
-        $lines  = explode("\n", str_replace("\t", '    ', $buffer));
-        $result = array();
-
-        if (count($lines) == 0) {
-            return $result;
-        }
-
-        $lines = array_map('rtrim', $lines);
-
-        if (!$this->highlight) {
-            unset($lines[count($lines)-1]);
-            return $lines;
-        }
+        $buffer              = file_get_contents($file);
+        $tokens              = token_get_all($buffer);
+        $result              = array('');
+        $i                   = 0;
+        $stringFlag          = false;
+        $fileEndsWithNewLine = substr($buffer, -1) == "\n";
 
-        $tokens     = token_get_all($buffer);
-        $stringFlag = FALSE;
-        $i          = 0;
-        $result[$i] = '';
+        unset($buffer);
 
         foreach ($tokens as $j => $token) {
             if (is_string($token)) {
                 if ($token === '"' && $tokens[$j - 1] !== '\\') {
                     $result[$i] .= sprintf(
-                      '<span class="string">%s</span>',
+                        '<span class="string">%s</span>',
 
-                      htmlspecialchars($token)
+                        htmlspecialchars($token)
                     );
 
                     $stringFlag = !$stringFlag;
                 } else {
                     $result[$i] .= sprintf(
-                      '<span class="keyword">%s</span>',
+                        '<span class="keyword">%s</span>',
 
-                      htmlspecialchars($token)
+                        htmlspecialchars($token)
                     );
                 }
 
@@ -468,9 +456,9 @@ protected function loadFile($file)
             list ($token, $value) = $token;
 
             $value = str_replace(
-              array("\t", ' '),
-              array('&nbsp;&nbsp;&nbsp;&nbsp;', '&nbsp;'),
-              htmlspecialchars($value)
+                array("\t", ' '),
+                array('&nbsp;&nbsp;&nbsp;&nbsp;', '&nbsp;'),
+                htmlspecialchars($value)
             );
 
             if ($value === "\n") {
@@ -489,13 +477,13 @@ protected function loadFile($file)
                                 case T_INLINE_HTML: {
                                     $colour = 'html';
                                 }
-                                break;
+                                    break;
 
                                 case T_COMMENT:
                                 case T_DOC_COMMENT: {
                                     $colour = 'comment';
                                 }
-                                break;
+                                    break;
 
                                 case T_ABSTRACT:
                                 case T_ARRAY:
@@ -521,6 +509,7 @@ protected function loadFile($file)
                                 case T_EXIT:
                                 case T_EXTENDS:
                                 case T_FINAL:
+                                case T_FINALLY:
                                 case T_FOREACH:
                                 case T_FUNCTION:
                                 case T_GLOBAL:
@@ -550,22 +539,23 @@ protected function loadFile($file)
                                 case T_UNSET:
                                 case T_USE:
                                 case T_VAR:
-                                case T_WHILE: {
+                                case T_WHILE:
+                                case T_YIELD: {
                                     $colour = 'keyword';
                                 }
-                                break;
+                                    break;
 
                                 default: {
-                                    $colour = 'default';
+                                $colour = 'default';
                                 }
                             }
                         }
 
                         $result[$i] .= sprintf(
-                          '<span class="%s">%s</span>',
+                            '<span class="%s">%s</span>',
 
-                          $colour,
-                          $line
+                            $colour,
+                            $line
                         );
                     }
 
@@ -576,7 +566,9 @@ protected function loadFile($file)
             }
         }
 
-        unset($result[count($result)-1]);
+        if ($fileEndsWithNewLine) {
+            unset($result[count($result)-1]);
+        }
 
         return $result;
     }
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
new file mode 100644
index 0000000000000000000000000000000000000000..5a09c354dcb52c30af19e4d85044ea99513854ad
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist
@@ -0,0 +1,5 @@
+       <div class="progress">
+         <div class="progress-bar progress-bar-{{level}}" role="progressbar" aria-valuenow="{{percent}}" aria-valuemin="0" aria-valuemax="100" style="width: {{percent}}%">
+           <span class="sr-only">{{percent}}% covered ({{level}})</span>
+         </div>
+       </div>
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..679272d25859d55e9931101ef56656e2c50e5ea5
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/bootstrap.min.css
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*{text-shadow:none!important;color:#000!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:before,:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive,.thumbnail>img,.thumbnail a>img,.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:400;line-height:1;color:#999}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-muted{color:#999}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*=col-]{position:static;float:none;display:table-column}table td[class*=col-],table th[class*=col-]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover,.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=radio],input[type=checkbox]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}input[type=date]{line-height:34px}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}.radio label,.checkbox label{display:inline;font-weight:400;cursor:pointer}.radio input[type=radio],.radio-inline input[type=radio],.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:400;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type=radio][disabled],input[type=checkbox][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type=radio],fieldset[disabled] input[type=checkbox],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:34px;height:34px;line-height:34px;text-align:center}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.form-inline .radio input[type=radio],.form-inline .checkbox input[type=checkbox]{float:none;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-control-static{padding-top:7px}@media (min-width:768px){.form-horizontal .control-label{text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#428bca;font-weight:400;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0}.btn-block+.btn-block{margin-top:5px}input[type=submit].btn-block,input[type=reset].btn-block,input[type=button].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#999}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle=buttons]>.btn>input[type=radio],[data-toggle=buttons]>.btn>input[type=checkbox]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=radio],.input-group-addon input[type=checkbox]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.navbar-form .radio input[type=radio],.navbar-form .checkbox input[type=checkbox]{float:none;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{content:"/\00a0";padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#428bca;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:gray}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.container .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-left:60px;padding-right:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img,.thumbnail a>img{margin-left:auto;margin-right:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:hover,a.list-group-item-warning:focus{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px;overflow:hidden}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);background-clip:padding-box;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:20px}.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0)}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;right:5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);white-space:normal}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{border-width:10px;content:""}.popover.top>.arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0,0,0,.25);bottom:-11px}.popover.top>.arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#fff}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0,0,0,.25)}.popover.right>.arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#fff}.popover.bottom>.arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25);top:-11px}.popover.bottom>.arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#fff;bottom:-10px}.carousel{position:relative}.carousel-inner{position:relative;overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-control.left{background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,.5) 0),color-stop(rgba(0,0,0,.0001) 100%));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1)}.carousel-control.right{left:auto;right:0;background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,.0001) 0),color-stop(rgba(0,0,0,.5) 100%));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1)}.carousel-control:hover,.carousel-control:focus{outline:0;color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;margin-left:-30%;padding-left:0;list-style:none;text-align:center}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;border:1px solid #fff;border-radius:10px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0)}.carousel-indicators .active{margin:0;width:12px;height:12px;background-color:#fff}.carousel-caption{position:absolute;left:15%;right:15%;bottom:20px;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{left:20%;right:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.panel-body:before,.panel-body:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.panel-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.css b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.css
new file mode 100644
index 0000000000000000000000000000000000000000..cae834827cc5b2ac2a81857ae016d073ed38c137
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.css
@@ -0,0 +1,769 @@
+
+/********************
+ * HTML CSS
+ */
+
+
+.chartWrap {
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+}
+
+/********************
+  Box shadow and border radius styling
+*/
+.nvtooltip.with-3d-shadow, .with-3d-shadow .nvtooltip {
+  -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+  box-shadow: 0 5px 10px rgba(0,0,0,.2);
+
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+
+/********************
+ * TOOLTIP CSS
+ */
+
+.nvtooltip {
+  position: absolute;
+  background-color: rgba(255,255,255,1.0);
+  padding: 1px;
+  border: 1px solid rgba(0,0,0,.2);
+  z-index: 10000;
+
+  font-family: Arial;
+  font-size: 13px;
+  text-align: left;
+  pointer-events: none;
+
+  white-space: nowrap;
+
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+/*Give tooltips that old fade in transition by
+    putting a "with-transitions" class on the container div.
+*/
+.nvtooltip.with-transitions, .with-transitions .nvtooltip {
+  transition: opacity 250ms linear;
+  -moz-transition: opacity 250ms linear;
+  -webkit-transition: opacity 250ms linear;
+
+  transition-delay: 250ms;
+  -moz-transition-delay: 250ms;
+  -webkit-transition-delay: 250ms;
+}
+
+.nvtooltip.x-nvtooltip,
+.nvtooltip.y-nvtooltip {
+  padding: 8px;
+}
+
+.nvtooltip h3 {
+  margin: 0;
+  padding: 4px 14px;
+  line-height: 18px;
+  font-weight: normal;
+  background-color: rgba(247,247,247,0.75);
+  text-align: center;
+
+  border-bottom: 1px solid #ebebeb;
+
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
+.nvtooltip p {
+  margin: 0;
+  padding: 5px 14px;
+  text-align: center;
+}
+
+.nvtooltip span {
+  display: inline-block;
+  margin: 2px 0;
+}
+
+.nvtooltip table {
+  margin: 6px;
+  border-spacing:0;
+}
+
+
+.nvtooltip table td {
+  padding: 2px 9px 2px 0;
+  vertical-align: middle;
+}
+
+.nvtooltip table td.key {
+  font-weight:normal;
+}
+.nvtooltip table td.value {
+  text-align: right;
+  font-weight: bold;
+}
+
+.nvtooltip table tr.highlight td {
+  padding: 1px 9px 1px 0;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  border-top-style: solid;
+  border-top-width: 1px;
+}
+
+.nvtooltip table td.legend-color-guide div {
+  width: 8px;
+  height: 8px;
+  vertical-align: middle;
+}
+
+.nvtooltip .footer {
+  padding: 3px;
+  text-align: center;
+}
+
+
+.nvtooltip-pending-removal {
+  position: absolute;
+  pointer-events: none;
+}
+
+
+/********************
+ * SVG CSS
+ */
+
+
+svg {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  /* Trying to get SVG to act like a greedy block in all browsers */
+  display: block;
+  width:100%;
+  height:100%;
+}
+
+
+svg text {
+  font: normal 12px Arial;
+}
+
+svg .title {
+ font: bold 14px Arial;
+}
+
+.nvd3 .nv-background {
+  fill: white;
+  fill-opacity: 0;
+  /*
+  pointer-events: none;
+  */
+}
+
+.nvd3.nv-noData {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+
+/**********
+*  Brush
+*/
+
+.nv-brush .extent {
+  fill-opacity: .125;
+  shape-rendering: crispEdges;
+}
+
+
+
+/**********
+*  Legend
+*/
+
+.nvd3 .nv-legend .nv-series {
+  cursor: pointer;
+}
+
+.nvd3 .nv-legend .disabled circle {
+  fill-opacity: 0;
+}
+
+
+
+/**********
+*  Axes
+*/
+.nvd3 .nv-axis {
+  pointer-events:none;
+}
+
+.nvd3 .nv-axis path {
+  fill: none;
+  stroke: #000;
+  stroke-opacity: .75;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .nv-axis path.domain {
+  stroke-opacity: .75;
+}
+
+.nvd3 .nv-axis.nv-x path.domain {
+  stroke-opacity: 0;
+}
+
+.nvd3 .nv-axis line {
+  fill: none;
+  stroke: #e5e5e5;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .nv-axis .zero line,
+/*this selector may not be necessary*/ .nvd3 .nv-axis line.zero {
+  stroke-opacity: .75;
+}
+
+.nvd3 .nv-axis .nv-axisMaxMin text {
+  font-weight: bold;
+}
+
+.nvd3 .x  .nv-axis .nv-axisMaxMin text,
+.nvd3 .x2 .nv-axis .nv-axisMaxMin text,
+.nvd3 .x3 .nv-axis .nv-axisMaxMin text {
+  text-anchor: middle
+}
+
+
+
+/**********
+*  Brush
+*/
+
+.nv-brush .resize path {
+  fill: #eee;
+  stroke: #666;
+}
+
+
+
+/**********
+*  Bars
+*/
+
+.nvd3 .nv-bars .negative rect {
+    zfill: brown;
+}
+
+.nvd3 .nv-bars rect {
+  zfill: steelblue;
+  fill-opacity: .75;
+
+  transition: fill-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear;
+}
+
+.nvd3 .nv-bars rect.hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-bars .hover rect {
+  fill: lightblue;
+}
+
+.nvd3 .nv-bars text {
+  fill: rgba(0,0,0,0);
+}
+
+.nvd3 .nv-bars .hover text {
+  fill: rgba(0,0,0,1);
+}
+
+
+/**********
+*  Bars
+*/
+
+.nvd3 .nv-multibar .nv-groups rect,
+.nvd3 .nv-multibarHorizontal .nv-groups rect,
+.nvd3 .nv-discretebar .nv-groups rect {
+  stroke-opacity: 0;
+
+  transition: fill-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear;
+}
+
+.nvd3 .nv-multibar .nv-groups rect:hover,
+.nvd3 .nv-multibarHorizontal .nv-groups rect:hover,
+.nvd3 .nv-discretebar .nv-groups rect:hover {
+  fill-opacity: 1;
+}
+
+.nvd3 .nv-discretebar .nv-groups text,
+.nvd3 .nv-multibarHorizontal .nv-groups text {
+  font-weight: bold;
+  fill: rgba(0,0,0,1);
+  stroke: rgba(0,0,0,0);
+}
+
+/***********
+*  Pie Chart
+*/
+
+.nvd3.nv-pie path {
+  stroke-opacity: 0;
+  transition: fill-opacity 250ms linear, stroke-width 250ms linear, stroke-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear, stroke-width 250ms linear, stroke-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear, stroke-width 250ms linear, stroke-opacity 250ms linear;
+
+}
+
+.nvd3.nv-pie .nv-slice text {
+  stroke: #000;
+  stroke-width: 0;
+}
+
+.nvd3.nv-pie path {
+  stroke: #fff;
+  stroke-width: 1px;
+  stroke-opacity: 1;
+}
+
+.nvd3.nv-pie .hover path {
+  fill-opacity: .7;
+}
+.nvd3.nv-pie .nv-label {
+  pointer-events: none;
+}
+.nvd3.nv-pie .nv-label rect {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+/**********
+* Lines
+*/
+
+.nvd3 .nv-groups path.nv-line {
+  fill: none;
+  stroke-width: 1.5px;
+  /*
+  stroke-linecap: round;
+  shape-rendering: geometricPrecision;
+
+  transition: stroke-width 250ms linear;
+  -moz-transition: stroke-width 250ms linear;
+  -webkit-transition: stroke-width 250ms linear;
+
+  transition-delay: 250ms
+  -moz-transition-delay: 250ms;
+  -webkit-transition-delay: 250ms;
+  */
+}
+
+.nvd3 .nv-groups path.nv-line.nv-thin-line {
+  stroke-width: 1px;
+}
+
+
+.nvd3 .nv-groups path.nv-area {
+  stroke: none;
+  /*
+  stroke-linecap: round;
+  shape-rendering: geometricPrecision;
+
+  stroke-width: 2.5px;
+  transition: stroke-width 250ms linear;
+  -moz-transition: stroke-width 250ms linear;
+  -webkit-transition: stroke-width 250ms linear;
+
+  transition-delay: 250ms
+  -moz-transition-delay: 250ms;
+  -webkit-transition-delay: 250ms;
+  */
+}
+
+.nvd3 .nv-line.hover path {
+  stroke-width: 6px;
+}
+
+/*
+.nvd3.scatter .groups .point {
+  fill-opacity: 0.1;
+  stroke-opacity: 0.1;
+}
+  */
+
+.nvd3.nv-line .nvd3.nv-scatter .nv-groups .nv-point {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+.nvd3.nv-scatter.nv-single-point .nv-groups .nv-point {
+  fill-opacity: .5 !important;
+  stroke-opacity: .5 !important;
+}
+
+
+.with-transitions .nvd3 .nv-groups .nv-point {
+  transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+  -moz-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+  -webkit-transition: stroke-width 250ms linear, stroke-opacity 250ms linear;
+
+}
+
+.nvd3.nv-scatter .nv-groups .nv-point.hover,
+.nvd3 .nv-groups .nv-point.hover {
+  stroke-width: 7px;
+  fill-opacity: .95 !important;
+  stroke-opacity: .95 !important;
+}
+
+
+.nvd3 .nv-point-paths path {
+  stroke: #aaa;
+  stroke-opacity: 0;
+  fill: #eee;
+  fill-opacity: 0;
+}
+
+
+
+.nvd3 .nv-indexLine {
+  cursor: ew-resize;
+}
+
+
+/**********
+* Distribution
+*/
+
+.nvd3 .nv-distribution {
+  pointer-events: none;
+}
+
+
+
+/**********
+*  Scatter
+*/
+
+/* **Attempting to remove this for useVoronoi(false), need to see if it's required anywhere
+.nvd3 .nv-groups .nv-point {
+  pointer-events: none;
+}
+*/
+
+.nvd3 .nv-groups .nv-point.hover {
+  stroke-width: 20px;
+  stroke-opacity: .5;
+}
+
+.nvd3 .nv-scatter .nv-point.hover {
+  fill-opacity: 1;
+}
+
+/*
+.nv-group.hover .nv-point {
+  fill-opacity: 1;
+}
+*/
+
+
+/**********
+*  Stacked Area
+*/
+
+.nvd3.nv-stackedarea path.nv-area {
+  fill-opacity: .7;
+  /*
+  stroke-opacity: .65;
+  fill-opacity: 1;
+  */
+  stroke-opacity: 0;
+
+  transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
+  -moz-transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
+  -webkit-transition: fill-opacity 250ms linear, stroke-opacity 250ms linear;
+
+  /*
+  transition-delay: 500ms;
+  -moz-transition-delay: 500ms;
+  -webkit-transition-delay: 500ms;
+  */
+
+}
+
+.nvd3.nv-stackedarea path.nv-area.hover {
+  fill-opacity: .9;
+  /*
+  stroke-opacity: .85;
+  */
+}
+/*
+.d3stackedarea .groups path {
+  stroke-opacity: 0;
+}
+  */
+
+
+
+.nvd3.nv-stackedarea .nv-groups .nv-point {
+  stroke-opacity: 0;
+  fill-opacity: 0;
+}
+
+/*
+.nvd3.nv-stackedarea .nv-groups .nv-point.hover {
+  stroke-width: 20px;
+  stroke-opacity: .75;
+  fill-opacity: 1;
+}*/
+
+
+
+/**********
+*  Line Plus Bar
+*/
+
+.nvd3.nv-linePlusBar .nv-bar rect {
+  fill-opacity: .75;
+}
+
+.nvd3.nv-linePlusBar .nv-bar rect:hover {
+  fill-opacity: 1;
+}
+
+
+/**********
+*  Bullet
+*/
+
+.nvd3.nv-bullet { font: 10px sans-serif; }
+.nvd3.nv-bullet .nv-measure { fill-opacity: .8; }
+.nvd3.nv-bullet .nv-measure:hover { fill-opacity: 1; }
+.nvd3.nv-bullet .nv-marker { stroke: #000; stroke-width: 2px; }
+.nvd3.nv-bullet .nv-markerTriangle { stroke: #000; fill: #fff; stroke-width: 1.5px; }
+.nvd3.nv-bullet .nv-tick line { stroke: #666; stroke-width: .5px; }
+.nvd3.nv-bullet .nv-range.nv-s0 { fill: #eee; }
+.nvd3.nv-bullet .nv-range.nv-s1 { fill: #ddd; }
+.nvd3.nv-bullet .nv-range.nv-s2 { fill: #ccc; }
+.nvd3.nv-bullet .nv-title { font-size: 14px; font-weight: bold; }
+.nvd3.nv-bullet .nv-subtitle { fill: #999; }
+
+
+.nvd3.nv-bullet .nv-range {
+  fill: #bababa;
+  fill-opacity: .4;
+}
+.nvd3.nv-bullet .nv-range:hover {
+  fill-opacity: .7;
+}
+
+
+
+/**********
+* Sparkline
+*/
+
+.nvd3.nv-sparkline path {
+  fill: none;
+}
+
+.nvd3.nv-sparklineplus g.nv-hoverValue {
+  pointer-events: none;
+}
+
+.nvd3.nv-sparklineplus .nv-hoverValue line {
+  stroke: #333;
+  stroke-width: 1.5px;
+ }
+
+.nvd3.nv-sparklineplus,
+.nvd3.nv-sparklineplus g {
+  pointer-events: all;
+}
+
+.nvd3 .nv-hoverArea {
+  fill-opacity: 0;
+  stroke-opacity: 0;
+}
+
+.nvd3.nv-sparklineplus .nv-xValue,
+.nvd3.nv-sparklineplus .nv-yValue {
+  /*
+  stroke: #666;
+  */
+  stroke-width: 0;
+  font-size: .9em;
+  font-weight: normal;
+}
+
+.nvd3.nv-sparklineplus .nv-yValue {
+  stroke: #f66;
+}
+
+.nvd3.nv-sparklineplus .nv-maxValue {
+  stroke: #2ca02c;
+  fill: #2ca02c;
+}
+
+.nvd3.nv-sparklineplus .nv-minValue {
+  stroke: #d62728;
+  fill: #d62728;
+}
+
+.nvd3.nv-sparklineplus .nv-currentValue {
+  /*
+  stroke: #444;
+  fill: #000;
+  */
+  font-weight: bold;
+  font-size: 1.1em;
+}
+
+/**********
+* historical stock
+*/
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick {
+  stroke-width: 2px;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.hover {
+  stroke-width: 4px;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.positive {
+ stroke: #2ca02c;
+}
+
+.nvd3.nv-ohlcBar .nv-ticks .nv-tick.negative {
+ stroke: #d62728;
+}
+
+.nvd3.nv-historicalStockChart .nv-axis .nv-axislabel {
+  font-weight: bold;
+}
+
+.nvd3.nv-historicalStockChart .nv-dragTarget {
+  fill-opacity: 0;
+  stroke: none;
+  cursor: move;
+}
+
+.nvd3 .nv-brush .extent {
+  /*
+  cursor: ew-resize !important;
+  */
+  fill-opacity: 0 !important;
+}
+
+.nvd3 .nv-brushBackground rect {
+  stroke: #000;
+  stroke-width: .4;
+  fill: #fff;
+  fill-opacity: .7;
+}
+
+
+
+/**********
+* Indented Tree
+*/
+
+
+/**
+ * TODO: the following 3 selectors are based on classes used in the example.  I should either make them standard and leave them here, or move to a CSS file not included in the library
+ */
+.nvd3.nv-indentedtree .name {
+  margin-left: 5px;
+}
+
+.nvd3.nv-indentedtree .clickable {
+  color: #08C;
+  cursor: pointer;
+}
+
+.nvd3.nv-indentedtree span.clickable:hover {
+  color: #005580;
+  text-decoration: underline;
+}
+
+
+.nvd3.nv-indentedtree .nv-childrenCount {
+  display: inline-block;
+  margin-left: 5px;
+}
+
+.nvd3.nv-indentedtree .nv-treeicon {
+  cursor: pointer;
+  /*
+  cursor: n-resize;
+  */
+}
+
+.nvd3.nv-indentedtree .nv-treeicon.nv-folded {
+  cursor: pointer;
+  /*
+  cursor: s-resize;
+  */
+}
+
+/**********
+* Parallel Coordinates
+*/
+
+.nvd3 .background path {
+  fill: none;
+  stroke: #ccc;
+  stroke-opacity: .4;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .foreground path {
+  fill: none;
+  stroke: steelblue;
+  stroke-opacity: .7;
+}
+
+.nvd3 .brush .extent {
+  fill-opacity: .3;
+  stroke: #fff;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .axis line, .axis path {
+  fill: none;
+  stroke: #000;
+  shape-rendering: crispEdges;
+}
+
+.nvd3 .axis text {
+  text-shadow: 0 1px 0 #fff;
+}
+
+/****
+Interactive Layer
+*/
+.nvd3 .nv-interactiveGuideLine {
+  pointer-events:none;
+}
+.nvd3 line.nv-guideline {
+  stroke: #ccc;
+}
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/style.css b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
similarity index 68%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
index 2ef16289413d8d765c5ebe26b9665a543ee92ad5..ff146a585a2132d97401728a64edb0f11cf907a2 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/css/style.css
@@ -3,15 +3,23 @@ body {
 }
 
 .popover {
- width: 600px;
+ max-width: none;
 }
 
-.table td {
+.glyphicon {
+ margin-right:.25em;
+}
+
+.table-bordered>thead>tr>td {
+ border-bottom-width: 1px;
+}
+
+.table tbody>tr>td, .table thead>tr>td {
  padding-top: 3px;
  padding-bottom: 3px;
 }
 
-.table-condensed td {
+.table-condensed tbody>tr>td {
  padding-top: 0;
  padding-bottom: 0;
 }
@@ -41,7 +49,7 @@ body {
 }
 
 td.big {
- width: 100px;
+ width: 117px;
 }
 
 td.small {
@@ -84,3 +92,23 @@ span.success, span.warning, span.danger {
  height: 200px;
  width: 475px;
 }
+
+#toplink {
+ position: fixed;
+ left: 5px;
+ bottom: 5px;
+ outline: 0;
+}
+
+svg text {
+ font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #666;
+ fill: #666;
+}
+
+.scrollbox {
+ height:245px;
+ overflow-x:hidden;
+ overflow-y:scroll;
+}
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
new file mode 100644
index 0000000000000000000000000000000000000000..0c22f37dda00794d2b9f36d90f8d0106f3a41269
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
@@ -0,0 +1,286 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Dashboard for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
+  <link href="{{path_to_root}}css/nv.d3.css" rel="stylesheet">
+  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
+  <!--[if lt IE 9]>
+  <script src="{{path_to_root}}js/html5shiv.js"></script>
+  <script src="{{path_to_root}}js/respond.min.js"></script>
+  <![endif]-->
+ </head>
+ <body>
+  <header>
+   <div class="container">
+    <div class="row">
+     <div class="col-md-12">
+      <ol class="breadcrumb">
+{{breadcrumbs}}
+      </ol>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container">
+   <div class="row">
+    <div class="col-md-12">
+     <h2>Classes</h2>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Coverage Distribution</h3>
+     <div id="classCoverageDistribution" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Complexity</h3>
+     <div id="classComplexity" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Insufficient Coverage</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Class</th>
+         <th class="text-right">Coverage</th>
+        </tr>
+       </thead>
+       <tbody>
+{{insufficient_coverage_classes}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Project Risks</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Class</th>
+         <th class="text-right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></th>
+        </tr>
+       </thead>
+       <tbody>
+{{project_risks_classes}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-12">
+     <h2>Methods</h2>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Coverage Distribution</h3>
+     <div id="methodCoverageDistribution" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Complexity</h3>
+     <div id="methodComplexity" style="height: 300px;">
+       <svg></svg>
+     </div>
+    </div>
+   </div>
+   <div class="row">
+    <div class="col-md-6">
+     <h3>Insufficient Coverage</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Method</th>
+         <th class="text-right">Coverage</th>
+        </tr>
+       </thead>
+       <tbody>
+{{insufficient_coverage_methods}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+    <div class="col-md-6">
+     <h3>Project Risks</h3>
+     <div class="scrollbox">
+      <table class="table">
+       <thead>
+        <tr>
+         <th>Method</th>
+         <th class="text-right"><abbr title="Change Risk Anti-Patterns (CRAP) Index">CRAP</abbr></th>
+        </tr>
+       </thead>
+       <tbody>
+{{project_risks_methods}}
+       </tbody>
+      </table>
+     </div>
+    </div>
+   </div>
+   <footer>
+    <hr/>
+    <p>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
+    </p>
+   </footer>
+  </div>
+  <script src="{{path_to_root}}js/jquery.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/holder.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/d3.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/nv.d3.min.js" type="text/javascript"></script>
+  <script type="text/javascript">
+$(document).ready(function() {
+  nv.addGraph(function() {
+    var chart = nv.models.multiBarChart();
+    chart.tooltips(false)
+      .showControls(false)
+      .showLegend(false)
+      .reduceXTicks(false)
+      .staggerLabels(true)
+      .yAxis.tickFormat(d3.format('d'));
+
+    d3.select('#classCoverageDistribution svg')
+      .datum(getCoverageDistributionData({{class_coverage_distribution}}, "Class Coverage"))
+      .transition().duration(500).call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  nv.addGraph(function() {
+    var chart = nv.models.multiBarChart();
+    chart.tooltips(false)
+      .showControls(false)
+      .showLegend(false)
+      .reduceXTicks(false)
+      .staggerLabels(true)
+      .yAxis.tickFormat(d3.format('d'));
+
+    d3.select('#methodCoverageDistribution svg')
+      .datum(getCoverageDistributionData({{method_coverage_distribution}}, "Method Coverage"))
+      .transition().duration(500).call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  function getCoverageDistributionData(data, label) {
+    var labels = [
+      '0%',
+      '0-10%',
+      '10-20%',
+      '20-30%',
+      '30-40%',
+      '40-50%',
+      '50-60%',
+      '60-70%',
+      '70-80%',
+      '80-90%',
+      '90-100%',
+      '100%'
+    ];
+    var values = [];
+    $.each(labels, function(key) {
+      values.push({x: labels[key], y: data[key]});
+    });
+
+    return [
+      {
+        key: label,
+        values: values,
+        color: "#4572A7"
+      }
+    ];
+  }
+  nv.addGraph(function() {
+    var chart = nv.models.scatterChart()
+      .showDistX(true)
+      .showDistY(true)
+      .showLegend(false)
+      .forceX([0, 100]);
+    chart.scatter.onlyCircles(false);
+    chart.tooltipContent(function(key, y, e, graph) {
+      return '<p>' + graph.point.class + '</p>';
+    });
+
+    chart.xAxis.axisLabel('Code Coverage (in percent)');
+    chart.yAxis.axisLabel('Cyclomatic Complexity');
+
+    d3.select('#classComplexity svg')
+      .datum(getComplexityData({{complexity_class}}, 'Class Complexity'))
+      .transition()
+      .duration(500)
+      .call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  nv.addGraph(function() {
+    var chart = nv.models.scatterChart()
+      .showDistX(true)
+      .showDistY(true)
+      .showLegend(false)
+      .forceX([0, 100]);
+    chart.scatter.onlyCircles(false);
+    chart.tooltipContent(function(key, y, e, graph) {
+      return '<p>' + graph.point.class + '</p>';
+    });
+
+    chart.xAxis.axisLabel('Code Coverage (in percent)');
+    chart.yAxis.axisLabel('Method Complexity');
+
+    d3.select('#methodComplexity svg')
+      .datum(getComplexityData({{complexity_method}}, 'Method Complexity'))
+      .transition()
+      .duration(500)
+      .call(chart);
+
+    nv.utils.windowResize(chart.update);
+
+    return chart;
+  });
+
+  function getComplexityData(data, label) {
+    var values = [];
+    $.each(data, function(key) {
+      var value = Math.round(data[key][0]*100) / 100;
+      values.push({
+        x: value,
+        y: data[key][1],
+        class: data[key][2],
+        size: 0.05,
+        shape: 'diamond'
+      });
+    });
+
+    return [
+      {
+        key: label,
+        values: values,
+        color: "#4572A7"
+      }
+    ];
+  }
+});
+  </script>
+ </body>
+</html>
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
new file mode 100644
index 0000000000000000000000000000000000000000..388593091336d00613c5ed76a42e5c5c13bb14d1
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Code Coverage for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
+  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
+  <!--[if lt IE 9]>
+  <script src="{{path_to_root}}js/html5shiv.js"></script>
+  <script src="{{path_to_root}}js/respond.min.js"></script>
+  <![endif]-->
+ </head>
+ <body>
+  <header>
+   <div class="container">
+    <div class="row">
+     <div class="col-md-12">
+      <ol class="breadcrumb">
+{{breadcrumbs}}
+      </ol>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container">
+   <table class="table table-bordered">
+    <thead>
+     <tr>
+      <td>&nbsp;</td>
+      <td colspan="9"><div align="center"><strong>Code Coverage</strong></div></td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+      <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+      <td colspan="3"><div align="center"><strong>Functions and Methods</strong></div></td>
+      <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
+     </tr>
+    </thead>
+    <tbody>
+{{items}}
+    </tbody>
+   </table>
+   <footer>
+    <hr/>
+    <h4>Legend</h4>
+    <p>
+     <span class="danger"><strong>Low</strong>: 0% to {{low_upper_bound}}%</span>
+     <span class="warning"><strong>Medium</strong>: {{low_upper_bound}}% to {{high_lower_bound}}%</span>
+     <span class="success"><strong>High</strong>: {{high_lower_bound}}% to 100%</span>
+    </p>
+    <p>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
+    </p>
+   </footer>
+  </div>
+  <script src="{{path_to_root}}js/jquery.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/holder.js" type="text/javascript"></script>
+ </body>
+</html>
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
new file mode 100644
index 0000000000000000000000000000000000000000..78dbb3565ce8608af07993c313816b1ab6dca0e4
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
@@ -0,0 +1,13 @@
+     <tr>
+      <td class="{{lines_level}}">{{icon}}{{name}}</td>
+      <td class="{{lines_level}} big">{{lines_bar}}</td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+      <td class="{{methods_level}} big">{{methods_bar}}</td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+      <td class="{{classes_level}} big">{{classes_bar}}</td>
+      <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
+      <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
+     </tr>
+
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
new file mode 100644
index 0000000000000000000000000000000000000000..14f11dec0fc317a9720d90060c691a50b3814fd1
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+  <meta charset="UTF-8">
+  <title>Code Coverage for {{full_path}}</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link href="{{path_to_root}}css/bootstrap.min.css" rel="stylesheet">
+  <link href="{{path_to_root}}css/style.css" rel="stylesheet">
+  <!--[if lt IE 9]>
+  <script src="{{path_to_root}}js/html5shiv.js"></script>
+  <script src="{{path_to_root}}js/respond.min.js"></script>
+  <![endif]-->
+ </head>
+ <body>
+  <header>
+   <div class="container">
+    <div class="row">
+     <div class="col-md-12">
+      <ol class="breadcrumb">
+{{breadcrumbs}}
+      </ol>
+     </div>
+    </div>
+   </div>
+  </header>
+  <div class="container">
+   <table class="table table-bordered">
+    <thead>
+     <tr>
+      <td>&nbsp;</td>
+      <td colspan="10"><div align="center"><strong>Code Coverage</strong></div></td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+      <td colspan="3"><div align="center"><strong>Classes and Traits</strong></div></td>
+      <td colspan="4"><div align="center"><strong>Functions and Methods</strong></div></td>
+      <td colspan="3"><div align="center"><strong>Lines</strong></div></td>
+     </tr>
+    </thead>
+    <tbody>
+{{items}}
+    </tbody>
+   </table>
+   <table id="code" class="table table-borderless table-condensed">
+    <tbody>
+{{lines}}
+    </tbody>
+   </table>
+   <footer>
+    <hr/>
+    <h4>Legend</h4>
+    <p>
+     <span class="success"><strong>Executed</strong></span>
+     <span class="danger"><strong>Not Executed</strong></span>
+     <span class="warning"><strong>Dead Code</strong></span>
+    </p>
+    <p>
+     <small>Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {{version}}</a> using <a href="{{runtime_link}}" target="_top">{{runtime_name}} {{runtime_version}}</a>{{generator}} at {{date}}.</small>
+    </p>
+    <a title="Back to the top" id="toplink" href="#"><span class="glyphicon glyphicon-arrow-up"></span></a>
+   </footer>
+  </div>
+  <script src="{{path_to_root}}js/jquery.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/bootstrap.min.js" type="text/javascript"></script>
+  <script src="{{path_to_root}}js/holder.js" type="text/javascript"></script>
+  <script type="text/javascript">
+  $(function() {
+   var $window   = $(window)
+     , $top_link = $('#toplink')
+     , $body     = $('body, html')
+     , offset    = $('#code').offset().top;
+
+   $top_link.hide().click(function(event) {
+    event.preventDefault();
+    $body.animate({scrollTop:0}, 800);
+   });
+
+   $window.scroll(function() {
+    if($window.scrollTop() > offset) {
+     $top_link.fadeIn();
+    } else {
+     $top_link.fadeOut();
+    }
+   }).scroll();
+
+   $('.popin').popover({trigger: 'hover'});
+  });
+  </script>
+ </body>
+</html>
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
new file mode 100644
index 0000000000000000000000000000000000000000..756fdd69b1b3af315b4df12c89b9129d5da794c4
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
@@ -0,0 +1,14 @@
+     <tr>
+      <td class="{{classes_level}}">{{name}}</td>
+      <td class="{{classes_level}} big">{{classes_bar}}</td>
+      <td class="{{classes_level}} small"><div align="right">{{classes_tested_percent}}</div></td>
+      <td class="{{classes_level}} small"><div align="right">{{classes_number}}</div></td>
+      <td class="{{methods_level}} big">{{methods_bar}}</td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+      <td class="{{methods_level}} small">{{crap}}</td>
+      <td class="{{lines_level}} big">{{lines_bar}}</td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+     </tr>
+
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000000000000000000000000000000000000..4a4ca865d67e86f961bc6e2ef00bffa4e34bb9ed
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.eot
@@ -0,0 +1,109 @@
+oO��N����������������
�
���LP����������������
�������Œòÿ¥������������������(�G�L�Y�P�H�I�C�O�N�S� �H�a�l�f�l�i�n�g�s����R�e�g�u�l�a�r���x�V�e�r�s�i�o�n� �1�.�0�0�1�;�P�S� �0�0�1�.�0�0�1�;�h�o�t�c�o�n�v� �1�.�0�.�7�0�;�m�a�k�e�o�t�f�.�l�i�b�2�.�5�.�5�8�3�2�9���8�G�L�Y�P�H�I�C�O�N�S� �H�a�l�f�l�i�n�g�s� �R�e�g�u�l�a�r�����BSGP�����������������v¸�5v�5|�-\ÍéŠÈ`ØWÉhKqJx"U:r,/–4\›ÜliÒÛÓñˆÊšEÇLFM´Æ€çV(gÔW\Óò+rK0
+QÁ¯È3-O>‚CÇdŠg¤e}\ø4–ã[Dd…‹pÇWQ õ@ÚõJ[¨M’¦†º¥UAƒÐÇjù­.pÂå`k‰*CñI4Ø«Ÿo\ö	•Àw›âÀfvÅÅXDöµlB‹g1‰[/a¸“2Àlõ–Eÿ±ŸÊ2äóø�g2µ9¬MÊ»
‡‘zGDUB¯µæA¦$L¹‘}XÊ•füz;N2Þ_¿žà“;(Žk¤¼@B[º!˜6P§3»G
+‡E]{ÈõÀJW/s’«4ª%êŠÛß™£è„Â_Û}}cðO-4lPÑaDXÈ[ÂÊq¤v�›*ÛX,Áu
*
+†ÖÀ·îz 3JLÚ}ò
+0åƒÕÑVjUyjn¾)¡†äÓO0;ù0!ä-!r�"&b�
bl,-`ãQ”œ|/^Ý
L¸þ¨ðVßRªuzüÔªëI°Ö÷Ъå¡!ãìkŠ&)J{.tS?™«iS½€¤ÌdiVDö1w b•œ]”­Dê*‹%qsËPD¿¢«Òẍ�Ôp
+EG`˜üé+öw: V¸Ø*X<[Þlñ‚M©à
+ö.ßÐΡSh¢®Ïqk™½"½
+ÂJ ¢¡MT6Ó c´ýk‰aúzÔª´nq¹ïm0ãàpDJÅÌvú咽ÎÁÿÒØFçv(‚S¿Ž(âÔMI†Ó¶F•™áK»Ím<H´Å÷Ðq~|M²X`~Is€"’ÐÁ;Œ#‚8³ËxƘ†+†ÚÊÞÛíîm`ÅÈ-I`ó>ç"Ëå=Ú-…‹B(>óQe²YegŠäœŠ7¦.û_ªj‚&LKß	9zR¼uC£Î
+é”Rȍ&B™0
’
è‡â”ÒÝ_C_§ƒˆœ¬{4µW?š„Nè„Í"$ø#äýD“¹	:J4À/¨›ôƒíš¶GÜJ;]ÄwèìÛd´:˜H9€´Â®î[Ô¨* KÍ
+™#û8A$a`]Úž-TE7$:¥sp†f	L$}Z––­b]ãbî6Ôç¾Hýôƒrx-t
ƒšjViMj‘N^[£³8 >Cn7L
œ&+3W6G<ÝB¬O«‚õÙ2A:ªå³Š’K†='’=ùJ¿þBƃh2´Ê"d†²×ïý	Ê	Î ÛO<iÜŠÛ¢Åà¥ÈKpi,µ
¬VíýNª^ 4Rhx-Š BSÙ’”êß[9U› "An¤	èäoh+�†F«ùÛÞ1£«—°r<~{N¦Ä9
ó—4rI–˜ÌېUý`póztÉÁËÙmÃñgu’¨;¾ŒZ²Õ|8DŸSM×K;™È©¦üË«@~%
+úxv@A†iI•&ÓÀûڊˆ4‚¶ùc±Q2}0¹.—G²~ž˜ãy ÍÂ#  ¥ÿZ-¿—¥Î-¡�«Êž Œ%jÔ)u/­œv†a™¤I,g҂àÖ�Ç"¯l&â8Ü@±Q'“
?±ÎáqO8lG‡OeÆ”œjjKj &¨ÑÖûÿÿ¸
+‰í£ÓcÎ
¢FëÏG[x±Hç™M}
Ȑ]8¢yÀ¢eñˆØ6°[=3
[þ‚ÒšFøÑVèH]êpó&YÈ\Wó¯VÕY	_ÊPètP[„ ßýPuÞ>8Õ×6¯áâÀX‚nf¦Çÿîiø?4	õ¹Ì}Ôé<€4	 ãζfVá‘ìGeb}‘š£ó¿†siÒ
ª’{OEôÌn#…&QP6D*BLB�„­1…SRk÷D÷µ‚¸XX³><|0;•´ëÚˆ€5í5ÙC~øÔ4¤úóºËÉ?ìÈ:P¹}"´Û%ÙÕut5—¼ŠIè!´…œ9¾lÃþ$! ²ŽyMÅTÔ>€ñ'·	OÞtqa?^âøŸEm› ß²²CÚ”sêS|-nH¶ºøq”·#Yt€
äì…k	“ñ¹ðŽ¢ÜÇ®Ÿs¥%}ÇŠ™bCW/|©`F•\²b,‰‰É2H¢õ2ª/ö94#~Ýe¸à‡ý†Êcˆ±Ä©"ÝQãâÀà‰7ä:ÒZ¤IÖ‹]%¢ÜàY›*ÌB;8aFxŠÊ©bã_ÍŸ²ß-
*·ì)”4Û?Âj£@—•5Q'ªìP8ôÂíGr´£Ë)ŸÐ<GˆF”4¶ÍG{÷µ6‹òè—;ã£ÞÔ‰sžŠ$z%öq¹É[­
+BŸ‰ONDM#ü<0*0‘.3.ñùNÁÉ6FQg,ö4VÕÖ¹ßÀ¹¶'ñ,Íʲ²G�¹�U
XüÔÑ�BiUèë=M	ÉK¸õ@óü¸Øb�oB<ô’”ƒ‚º€@Í]è̈„�¬†½aéÐæè7î`<ÐÇT²&r1=Õìîœû„V¤Ãþ4DaD 2ƒÃxù¼u‰×)Ÿ ÚŽ‘ši…ÑOv”—
+dbHöié—ÅΓ"ñ F]@¦ÙÀÀºÄ„ê­!6&á
+G-‹°’¿Ì踃/tè€C°ïÇxÈ4;œDí¡ ëÛ§SUS–[˜O/¨²½›'ºuKR-lûkÖƯ'^[€BV½„©,ˆRáJKØ°T^Eg Ò\�Š2Ú˜,ïU&Ñ™+u ÷¶wííõ•„bªº„èrK‹HñËÄrµû }F‡Ý*‘èw÷ð¾"æÁžŠ½R9DµA¿¡Y	
+¨=7G ÚP*=+Ù;N+�P
+>Õ ¸²xìl֏¸("ºc{ã‡G݇û_ÁxۢƴHE-Bᔡ`\_«`úT‘X‹ißCõOÏèëñ!;ŽÊý³ëäàÖ#›’è$ŽQC”Už(áº75D´
+
Ѥƒâd´„=Ê´>dZ¾0tïàj¥¡gÈv2»-Ä“xU	ô3,7tÂÎð¡aï,(â5ò¶ˆ„ˆœ�ŽYÐùÀEÁ†Ã$—6ÖsÌâòŠB܉O°µÇ	cª:
+¸ˆõ:Ç ÒÚ×R.yaHXì%¯1yL7ÐAÑáýz5Œ³ oè*�”±n5óe¯˜)oFÆ·¼aDe`hp"Q›·”ÃÙYo¦˜O‚ç ¢4o¡¾”p§s0‘¥OE
+Y)b¯8xÈ.�¯kÓ+8U)+­6-]K9ŒïpQt&´äž}¿‘Snmb²tºø¢°LM¢Úwõ÷ÉXsSIj·>õI¦Sj
2`%ËŠáÞ9ì4‘Ÿ™}éà=J½A…v×D
jŠ—Ò踠‚Ø“ÕàààTÂ[��P½#™ça¬W­0Tt-~z©¯I„,‘6›‘U2ü)—'ô\‚œ”vºý
+ðüS•‘RŠïPæ Znqç"abE´érwL1õˆU[Ôn@G[9y3s¹É;!r퐽"04{™…2
faJ
ÊÜ)„"P:€¿6™©3'Z7\‘H5à9»þNT¿t
+ù®}‚ü 損;wLœ.´¹tdÉúqî‚wŽ
’„o
+ŠÎ‰µ)ì×"f
.dúxìCz
+KFNÇ¢hœF“™@�Êá¡°)1V´ìa·ãPžJV
‹Û,ºB{&Žîƒýñ®f¡p¤ËphóÆx¡O2È�%8ºÃQ´ÀPL:eэ’‚ϨiNâÒ`ߟñ§—ÔÒ’Ä]ŽQ$ý{3›qNÊôâ%‚–šOtˆƒ=jxgPô܍ΰ FKüäè^{²¥f…’£?^Ù/¢ OŒ\è“:„JD;™³Q`cÙž^!ÓÎdvèk€“¿	åe½3庑’aêICö †d6 ʐÃûIÈš#\},Ú?HüÄf3ØcéU¬áw²³+ôÍ$ŒU[":ˆ¨Â’}]j•
±b(Es�)‡`»%\Â¥þÍU˜.#]v/)ûáÔ¡K:I×ðc´4¡Ã³.c$þCðÞ?fî `+È6ùcx$#[ߺŒ	f&h,ÈA4Ó-Ág`É?Ý$±ñ11ÒbB5‹Ñ}ËŸ
+X`h‚¼^ÏÎø2·*•ÒÂä"º¥`§P°¡ùRºoµžoë¯פ)jk½7šL"¶3Þ|{y@ªÕºi²û¬w@&º}g$Æs’uÙñÃ"ò©„•_†õ›††[n
+7(¯Ãå)ÅD`´æQ¸éò´Å”ôm>·@òÙcgDD~xp™ë’ ¶}`‰tð‚oÖHªT«u¼õ˜Ò)ÔÏÉÄm7$'ý,h¹XNârl’uÿ5_<ƒgßÀªLÌ,Ô¢¨ÿ+Í^àðˆÓā-,å,ééii΃Ċ°ÜÙB¨2Š´øÓ�.¼ ¬éD¬š!^ò	ÿB*Î&h“£®‘¶z€[s¬–בrIXe·>@>[ƍäÁ<h³Bܧp¶n¸[*²´áÕdƒ¦Îp,Ö‹èÜç¾ö@K\Æ
’D$SLÁ)¨ÅBËÖD®‡º/ÜoW T»fŽ²á“„"@õFT‚ŠP¯QA*Ù/‰Ր‘›¼ZK¥3A_šÉ^+¶µ²[9	ì×°ÊßßCf¿í›µ Á¡ÍÕB¡PxT
´ˆÒ="0èÒjýìU£aàÑJ½é²ÖSUž§•i܆ì°màÒ¿DÙ䦏{-Š sçi
+“õåcÖ· KÁÞ-ލsø˜eDxÌ·ƒz€D–•
D„̶ÑBÁ‹pÙ…­
Ë
A=%aâ, 	ÅTÎ$Öl9±"ºÒêÂŒ~3mîòP„›h¹m6¸ʈR:ˆÖÂý¥ak¥: õmà”0‹ŸÿúQ,±ÊeÍ•ùÕŠy
¼¦FR<ôbˆ‘ái¿ ?áiƒÔTϐ“ñƒ–Dz%i8›‹}ÁÆíòà.s·Æ™®Ä3L]ðGvœÇ4c¬qÚêu<($)¥`U¤ŸÙxêÛ¿&¶„ß®À1 &ÝÆp<>ÍĬ]6”Éݏ ÂS@Ý&®Æ›2 ©@‡Ò4·Ùôw|{‡ˆߤ9°.ÎFí¶d°…éÏæœq¬r€(…AÖ1Æ´¾#ADp#6ËÁÕí=rRï
+{�úxêP»(­ìQ@"œÕÿ×Þ¥&Ï ]<‰­p3{ô>ôaºy[µ¹J(‡”%;MAÔç~NdR;ÇÇ>4hàYôjçQœ=¥yæ[´`\Žh:L]²í }‚~0MŠ”ºÖÃl<»T¤·+L(XBE‚šWrKü´äKòۦ@ßm±ÍHSJ&€9¨)1_zD¸¦	OùMK‚ÂGC� ¹&N!€Ö¶e|ɹl^„‡º‡›8$5Ë,» ,¢k²À<Á0‰Øæ	Ù
+‘nË+šYxÊ2ãOcÛZ#VÆ–‹žæ*‡—öù°Ï¦Â0¡¨lYúôaÈñÐCBÈ~PœÌ8LÅ5a6Ä´ûYù‘º*˜Ö\ëz…lqzŒ¾ýÿÇhR„o³ š›)(]ðtÍh¿±Fê(ÝY¼TûÅ/h¥bâ5´¶/O]³`ОVÌZ5ëšFs
+bªÅºŠþKÈaiâieúÐùåéÅJÌ€O/L¢sWP•yC·€¢ìÑüþ”XXŽn
$ûNŸC›®mF*wgFž¿øÅ
Ó;†uìiyÆ(Šá¡?èN«_ÀZh13Á´Àá¸ÄžyX`]#§œ¡¸+àX•†ÖÏH
­#zn‡ÅçþP)zÚun„“ØZ­ÈL%4ºnÕAzž�Žü3y˜VÌa÷}£/V'¶ð Ï2ÞGEœÌ©t'ˆ<ÆèêžK:Éi`8MÙȇ>0FÈ#’µ—©„ë—¸S±Ó2•zB! °TCµl-Ëc:Tl占b”äPÞáðIÙS;¥¢¡K×ÎœïêNW pw}’ÍR#Õä;À~ºÀ-b;§§}¥3@Â=6]¯Ó¦Ø’Ayà0¦h½)º?›Ï(o^é2ÚRi}l[È=ÏqÄ´ãP41”¨ÐÇ8ó…·žÐé8‡@B‰BÂ8¿Rjp>ÐÞŠÎvÂïPÁ-'•KUþ”ÇL–´Rå€Còa=¤ú¬ËÈr'}ݨkœ§·áŒFp÷Ð6”H‹b
I
,FÈo¦1‰¼Ærú'"¬Õ¹¸&þ&lI{&Qfú
†2a”\L)AÉRہÁQùDX‘‘Û:Ûõv¯ÎaiGGwÞ¶
+öâ/˜ò0$×O0&›#ôH9¦±o(ÐïòäsQƬ÷"šÆòÿMðøþLj¿¬Lêú›Ç7ÐL5
+žy—¼€*Éšâ¿	ÁYºƒ%Çw¾t+55Z·(“)ØÍŠÓBvM»õKâ¸0:$ÕË»Ñ8!0áAbñ°šJÃ#9pB́²½Êü@E(ïC¢u…OØP<|hœ
œ	™sïRùyén’x@¨Šž“fr:„iˆ1—ZÇ®BLnÑ«Âä°rtI-1äxê,ýFÞ 1Sœb'öç1CþòîI¶	YÅå^Â\©UÈüõF;
üŒ¿òÂÎâ•=òã6-Tè-½HÀ2G'Í8™’•H¨9­&$+dk?K¬(ˆJ'Êqæj	ÿs`â¸Ôñ£*L9y‚2@�º™¡a•-¾ó*Pýk‹úþvWèú2–Fã·ª§ìŸ¿”0(ÙÚÅû¡è™Øåö—ètTülh‹Ñˆ%q †¤A.§[±ÅÌ_g>9dàêêMõxî,mw•¹첌-{
+磯
3tûw¾á61}­ßLÈð¼w¡f±é¦µîÝÚêGƒé‡ìˆ,h•<?ã‘"@9“?Õê(>ŽÔjZÚZ8‡H¿5¨tó…éãÇÁ”Ùæ‘ɇø@wƒºiª„ôýã
Ku|”AÔIÍgµnûô«)€•
´”¥.}88F@Ê*­ÿÊ øtxV«~JêÆÿœUw6A.„‰Œ¸‹0n*‘"è�1-ü¢­5’9•dqüÖ°?�ï5î˜LžôðÎ8«vº&
+ã€|¤ûÉÖ“I4è©$Hã«Ê]Ž¬ëZÝMUj/R-l\w×­OëŒ�åU LQÏ*µ`¤r	}krmVÓ›èk^vÕJÃø¹ÂSÚ''Ãx¯ÙQi_Üá­’d©4(QnËá¼\T½–-œ‹†­VBÒ+
u×xd±FȘW‡¬€`¾q¸¢	ŠNB
+\Øä5ª#3v±Á$ŽO#¾ȧ,Á’”*(w\©¿üÁh;^Ê»ð©ÆªŒš'’NYmLÊ¿ìí”"ÃóêTúRº
Š£C
yÕÇ.³è åê>f
®DˆüªkÒ²DÙè‰o—ÐÖ9ð¶øÎ/ã†Îމ׮—=4fQ•Ø€‰ä'k5B$rL•“줁tÐïä‚éI§L½éõÿ?P„!>Mf0¤+‘^˪!Ñ µ�>5Ĩ&y˜¹í_’d‘A”+ÚÕÂ1žœf+Ð#¨X@Ö×—‰ÜÖč´‘㍊Å»S.r;0~RP72Å™|$˜ÿøoªÀ‘V³X§BaÌ?¸²^	b~šþô¡*<…ÈL~»0˜ª$è)ú¡Ý 	Êè„yÐdȼJƒU_ÍÓ$DEËÃË2c±{A!;’öZO	5eþû6¬åÏ	ãîZeéUÿC¾-Z¥Í¢³‹žÖ˜kô\f3\üeî%Jµå3œ+	KEöÀVä”�äÆ“ÉAøp4bsÅœwIï=?…’"ñx¸Ó –×úÑ„-EëÉÆçÿ³Á
+ã
+8Ybß$êߣ:å‰êê‚e)
yYPë‹;¡Ì°ã�bŠédáO)ówûBAe777|ý­*ÿbÔ<AÔê[ùü€ß˜�%	O–þWk^—T+µ±†¦5ß‹„	M,!çܪ…Ïâ õí‚懽è»)ÔÁÄñ5“‰9¶Eÿ¡œÒŠ$1]ú²(Ô¬�
­±Ä–õPÚ²©jc3yC¡F¤Q?esîÀŸft¾:×, a¡lGØlÑ:ÍŸkÆ×þÞ`¼õ—˜£ºfÞÕÚîÁ¡Í6c·~ŸºZe£»aÇéq_ý’µ‰A4Âa5õå«ò1à3Ue‘§¾¦ÖÉ«6ž’£‡ƒðjoßVçús¸Xo΃ð{Ž’7y’÷Ã×0ζ_2fÔJNNˆ]ÐǶÐbôV…@ýÇš›5lCAM*�šVÂvøˆSŒØsÀÿ5ŠUg‡VȺMõw¾ÖDŠü¯Ì`è{¼†»‚†¬ÂˆzÞ†ÍÜZsç96’ô*Œ>FT@€áJ‰•ô…ƪ3¡„ææ¤}/ÃËS®a‚ó…èUÕȪŒj1SaB7~Ð&FMs§¯Ïœƒ¬[¹>…
+¹ {ø1¿Ys‰Âêý‚È @¼óz(¾¼=!؆Ý73ðÞ‰�Çf‹zŠeÆ(Ã<;oeÁ3_'DÙøZÞóͼs5"b4gèdHC„²™oL†5.þ6Ö:ª5è}9$M‡Q——'$ÂÂ¥9DÛscM	Æ|èõ)lIšE9€Ð…Ÿ#C¾½5LÉJ½`¸ýfK¯ˆ¯%ò<¶G�
ì'¹š…ªÙPO®y�‘`¤5
¦5:„×k¨¼Ÿ¥'‰äúÜqg÷uuq˜ˆ[,ˆ)µ¿Zb†q|+	×<ÂØo[˜È!Î'´™ƒ„NÒ¨K¥HX…¸Á®™‘Éœ"r
ÔþÈ„	fŽŽl¿eh¬)(à˜î>{P,e&
×'Á°S7aŽ¡Ê:˜nœpé-Ä…Kzµ Hhw%ɹmÝ|lߝʍȝt»€Že£ãã0q9S_z/L[×P{)ž…x·�¾ì.Æê£{h´õŒLƒÙ·V)kŠÙ®˜Êq€™Êó‘ÁÞ;jz¨@bÒ2ˆQ€`”9~'3ãÈ2¢jõ‰FØÖ
+v“QÓÑèTdMñ@
>ܹ÷ PÄNüq‰ ÓÞº¥¥°HÑ–ï³ÖJ‰M¨ÔrN2åQ�9}lÌ€
+’(6’,ÔA–Ú; +Ö"øÚ:«(‰-$VñÙ3x6²ATÂ\™"ªãzœ¨n Ú÷%Ø*bo™„@oÌÇJLB ³qÿIziœTÄN›ó
ê²9Xåæj’º<Š39‰»ò'‘�“›LüR»°B$eY¢ÒÄža€‚+ŽÁ(õŒ©n2uÃCc<bMlò‰!K¢Áê瑽I–zÁÊVøvJJ;,'t3ÖÐFIt$KYéè^VGÜ.Œ¾<ˬAàΘìS'_·öØž…æ˜T­–
ÅUÅRà½ë†—ª¨SåÅü]¦oæsy5;m*2ãD.Lå#-T¡eX¹‰bL
±a’îåŽ×›çzÉ9^ÈçÏ
+�"É—VÖȆP¹¬.VåîGÀÊ÷iV$:Í­±m5°£æÄÓÞÙfôS'mmŸô	"ìéÕ!F{p7xÍ9Ø{œjfš¯Blµ¸¶Ÿ2›kÊ3Çží)‘.�¾ÎqòIÔ‘|\O’¬Ü@ÙI¹_‡q•xH\§ÆÃ( 2¡*4¬î$$ÞÛÕ4_O¼GJàŽïfº¥*6Â?ipf(l[`\rsÅñ£óê!…¾Ü‰l¿ÅÈ{1ÅË`,•)¢ƒ_Ï’Ø*f£l(àÓä ^}áû‚Ñ%"³ªnçM©O2Ë'°U™Þ){³9°”ÅN[ÚלM®ÉŸ´„éIR`Ää1ð¬ÝßT&ª+™:¥ÿöÁoÿ¢Â	·²E

òoë�‹0×2Ž'!;—%ä‘ÈÞt&
ëÔZL™¤R_iÍ2Ÿ#n/K——ÿ"X”ÅK/^èš(hùû~+†á
,q à	škkÎr•$‰ËW ·×†%ѶP¾ª–6õA]Y†³\ç,Ò=ªo˜/¡Îé‡A€B\ß/*Šd$)'­¡ÖúQÇ~ É9ò6×FòÅtöÜ™PT„
+Ĺ2î{Ј%yòÉßGV™P-Çmï i…ìÞš¹SieDÙ€”h#5ëyÖV‰€´¥örÄ*/
+iEè„©ÐÕ&…AÓå­vý‘%<NTï@Vr©iíÃæYU½p+AH{„ðÅ<_ÒÃÎt#ziXŒ#r«õRÂÉ£MÑÒ
+Õ8th€¢aZÊþ¡A>a«%Ë‚¾ƒÄ*wõ¹ `‰‹õBƒ=óUÇf{¬(…IãNq_zh.3fKHÚüf]§NÉòLÔ©éXʍ‘Ÿ=¦zRÛg}퇍�áZéUÛÖŸJˆ"yˆxÁqŠEøSZDºÃX´åú´¦J’N4¸HÖO§V_²X/óbñãÒÅèYmOt)î®rî!)ÌçÚmFL.œP@0ªcàù³grT‡Ãxgƒ�ç=±˜]
+°3A?)zõUaµ0‘@µ z×Åd0Ïw"ŸjZpL_äT_CÅÄ e)~óo�Á«¯Q¢RÈÓN½ü¿x3ÃŽ§ò€|˜T"b, ‰Ð2&
+ßcTš6²ù@1# ˆ,@€-ŠãÜ™#¼’çzÂ| VcXœ“­ðk5ž8ÊW¨ŽúYP!„ž¼ÙàÌ\-û`ñÁ¥ »|˜)<SNæ ßÎd8,Nð) ²Kð,é^n HtžÜì¾µ„N4ùE$	¶è<F1çÆâ~¤ò\·ÐY/©Uqbæ›:I$pªdI{*p­Ýï6rÁ™*®˜Êð÷?ø€1Ý}Ć:ÿÌ’P¯»o䇍 œˆo$6_
+"’áðî"Fë"¹­ÊÒz× ¯AA…˜,DX‘•	¤7œ+T¹1Ü%+”1·�µâRì£+#öØý2iQ½í
+úpðLûY½´•òr¯úÀaH¬ Î;M,¨	 «ÃÇdM[˜ÂìXZêý3Ö£æ~¤3)o¢ö
$Iiõ½ªhœšLû†²p&Ú>2oo¬®ÙD�ù4}„ئ–´=Lg}˜‡š÷ãëÆPiÊ9І«.ˆïx¸×ÓÏpT†sqþõúÕÿÖ2†âyÇ¿a-GuNŽhXH›8uüçO­­i%œ(Ck¶%Ë‹·b9Ïî†÷|©ìB½ˆ(#©½U€ íYt=â¸'`Òƒ ÆÒ>÷»NÔ-£‰'­׿²]ï69A¥0&!Ge!Ê	mÜ¥#<*Lð£U.Ž1à¨=RIª‡2'½)<W1OÕÂ<¼¼mt;Çß›Ìȸ™I
+µTªVmd{Ô£·ÙZ9.ØõŠ”‘y]¥ (¡ò¦PÛ1Ð>Þ`·>²›
+lîõ©Ù¦hh%�˜èâHú^YÈY-aA“‘øx‹ðq¶…ì[Ð'±@L^ q=BÅQ¾ÜGͱ2•Ðï‰ï\¬™KˆÓõo»ŸD9xõxÛ³I
‰¡8,
ÐOäºÈ‰¹Cé¬;¥'–å…˜2o™ÁuéPÝp«¸CRÔÌÔËô
+ÉÌéûÄ{œ|®“ë…´pó`¸4…štãvƒÿ–Xªˆ	@Xþ+ŠŽ¬µ6zP?,ãÁœJú®À*´ÄlKh:›M�Ñ°§ÝdCù^Þfh³·DÒ¿á]wÄJ¦
ã´ÙãÒ¯ƒ²¦!£÷}7?fYÙƉAº”Ç"SûEîëµ´ièÙÒD2#Õ¥Ñ$=¹³ðçòØä4ˆ:{ÿpÛ¿sšðÇë>
+ÎÅ�ÑirræT׎­;›	�õq³!÷u_ðé¤n&5ҁW×%å7
+ÄÁÄ_´cÄ5ÑâðË÷9ôf5‹£r¯~J­°D¥RÑ5Â甿eƒ„?[™T6Ÿ²Çmf8Oªrž“ô*¹~$QcᆍڏƁ;B¿Ð=®E_MŠ®ÂèhhR¤` >~»<@34®TG™’aì8´Î°vfÔÿö&ÞG[º®Uú”%Hú-XP@ ˜K/ÓÒ›ýÍ@^0í›Ý©Œ'Øfã܍kl—ÊØ´–\™ŽBç ûG]ùüW?s´ÄÌXé(V
×…zÁ$Fþ;ž§]ÌHP½{*6ËDècb-7|ŠX€|Žo~mŠôÐÁ¼sÚásiBôÕJ[0{Vµ’Ñå©\=T%ΤCJ͵m9<é?ÇfKþ]ÔÉ’Cy‰“ñ{ö‹®
Püˆ±ÅâƏ뇰G¶^JH ¢@
+\ì“šcå~RôbÊ‚î@mhµVSœè#4œ£xSkÐÈ—ÐÊ~”y‡*æƒqõ6ÿá&g——YÏÁ?“Ågð‹bÜ	Xn!ç$Ÿ8
[‘E'(´)‰ýøC7"ÃONh§C3üVÐ
,•‘%âÇëä(eR39Iç†H©C̼_YDb‚;s~“L¹¸\úÏedê5èièÎ3þƒÀ”±¥s§•Ñ’9I§’tÐÔrÒôÏô‹‹‚ikX‚Ñó®JÎÁBŸ¢5Fò“Þ¾UÖ°Öu\Þ-öñ*/
Usw×üÞ
+¥ìÆb OÄ¿¥mûOÙéÿ¨ƒn<Vøý¢ÓlÀ~ð©=‰—#™� 0~÷î=Š&•²¸ó'€_©Äˆ“‰ec½ÜyO¹4w
c‚2ë-Y¶òo×,×ã‘#³’ˆw…©àÅã¿Õ’Å€q#Ö¤ø;+U3À”Å™³“…»±vE£
+Ñ°´~Íi™ l_®
b�®¸L-–1´	�Q\‹E=$Pó£­R¹ÏHààDOኖ�påXòÔ£ÔFé¡Ü²S„çhsSëI$¬×E!ÍTͧÆe
ß|€X Œøã
äéðÎï
›�L&qT Ôq†!c`gp$=c @3Ê%K•5ù!–¹›%°›…#ÐfSËN³	8ÎyY	)œê“IÄãíÑšX’p(é|HAûÄÐ+´zN"/ù3O3Z¨é^
+X_Ì5
+oŠ–Ià¦_ȯÄ%òŠp×£c0?¤‚×Üò‘©²7nåúå·:8Î
+y]K§8ÀaÐh‡vôÊæ$.>Üê,1GÓG[ՁxeXŽö“ujÚßz
z¾Ò³Ý˜-6â`¦9Íe„¹º$v
ñ:ŸÐ]]@—âÂ/yB
(zå©ÃŽ
+ôí½ò/	oZÀm'N;=3Ü%)y»ºÎ19¢ðFÞL(»gÔRÀK@; È\'Ç'ó]ç̱…2i¬e‚vu•#qΗ³Zë~1àËÛ5I]9,¶°í† 7J·i)ˆH)j§ý-j´–uô·
Õ˜ 	ëO¯Oõ¾Óà/±pŒæ:“±/º‡ç(‹;ÞRBUš7e™dÂIèÔNþRH£?�>X0y8P¿Ær#çb_®®·8i؍Cf`È‘Öai«2Uºy±d= Ã2¬_ÆDb…9±Ê@ê…:q “"ÚŒSp…F¸~«ÚÛ"6TDgªtÓ†Á
+´¸+t‡òÐöHh7>ÒT ´LÒŒ	Ò$ýAÇQ+’ Š@;;¢×÷M°½´ò~o ¤S<:.¥gÀù&Œ`$¶"C¸PbQ,`¾$ä`™½Þ|ʛٹ·W×18õÖ<à…~ü$Ãì+òtÉ
+ƒ>Nø–Û]-m‰­�£e	±B5ñÉPü¿ÇßÚNcxÑq‘E}nÛ›ýñÿðB68¢È5	‹É}‰ŠUfâ<±)ùSbãQ°¦‡¾R¢­±Ukö)LGS*²’F:”Hpƒ%xسRÅ)ÝÂæs¨Äò.Í€ÆRqÁÉWjÊÐG“éãõýiÕËÓ<š5)æ
+/òˆˆ³2`¨Þ²©»æîßìh‘ò§¿6«`눯LüT ¦ÁõŒÅÉ–ªn•Q�üÐYë\„Î;uthšÏ2Ð6WZa²fQ¥°¨r`¹dÚ­1t°Ç-1Ž‘­a§·ì|Ò°¥ÿŸ g0ñÛCüÆðùi‘[[ü^;Ø`FOpb^Å«¡—^nÌÃÅçPmJSr4K*X³‹Ë“	.cönÀnm¸âEõ€ñPéçüŽ‹h”šJ­ëülÕ|–®£˜cšû!	!áZœ–çI>NbáºT†¡pùŠáPÐíu$k[C®%û-QÕ»ªÒQLã¹Ø&Ûìô×ÃB88÷öJòt¨çí¦qÇiÛá¥c™2HŽÅ¡E/'W«^Ÿyñö©RrnÕ¦*p¡aK€#51å=û̺6Ùõj‘Cæ¥#Ü<È
/IÍ‘2 ;Ä‹ `SXèÇÔ™”®$jîïªØjÛgóI\d¯å¥OÚÀ�¢Ý‹Ì<g³¯HEƪê(1HHx¿’u1À¿ä-ÛÐÈ!ôœ1´L¬/<J·/ÄÄÂÐ?»¶p{@Ôeˆh–—CnVrc´ÁþSÙ`Á_O>X°Üú%´›=‚gr�½jž°É{yV¨ËÔ¾PßsJIfõMõ!à<a••~4v,”Ÿ©}h¿‡Û
+LëÂD(þxR½Eèlì€Æ±å„¡F„è°ÖüŠR#L€ÝäôÚ5õD¥
ß™ZcS–_K¾ýÀq
+½¢”ðÑËh°bÀ‰v~á³â®ý£GâT‡i�TíÉÆÖ1-HL.=ÿ’@…üs¡)©2‰ÁBÒ5Šþ'Ó½!ÜÒú¸—ÈL”ÖþŠ}Á€X&ªþ9‰‘ë	ÚÕJè«iOÕË#o‘B¸‡°y:�ådÏ!$AÜ	ñˆ[uæE{DÞPcgCš{LÕ_E<
‘ùqu˜}–ÌFÅ¿¾˜v–ÇÝÜR*eU±¹Y[l]¼ìjH„*owèa$¨D-¨”Á·-
+‡SÞùcÇ€Ipµõ¡(r$[áëÁLS”q1Ãll	nPîÔ˜øp3°9t]tø:;š4	¢
„J•Áèà\zÖ¿-#”ɇ]·8Yã=ù)¾ÄgÂÓ3"
+�5xü/Ÿ+/í\
+?8Q¤9È1-”Þ¬<ÊZãmF~âð›Ð.¥Ð¬h³46Û¶•JGª—Þ>]IˆN§F¨Øân
˜1D“aâ6-4¹™KXÕ8)©¼„Û>8	¯„)qô@ŒÞ™ˆçÀPÈ’R—2¸GÑ”´I8C@ó¸hW	ˆÒT¾Q];K<E§’v“’Çørž#˜NÁ*…ÒÙµeRˆ:„@Îì²8¢¿¤]1:ÌÚ85G™"”´~ÐòU8_Û4#´¸÷ã¡jŽj Õq¼A% ,ñ}!¦8ö?,5'\2ÒañS׍MdK)´\\µ2.¾å:Gÿý‘¨ÐAë¨aûtI¬#è�ÑEé|ÜÏИ+Ûh\þˆ•1Q†á¡ï=Û‡ù«<èD
|vL «%nÛŸ´ë²L Z"úR_ D Šâ„“0¤sC@ªµ_À7
Íy¯€P:úYdœ%¬ÑLj%Eâéòô<°[súž†RNèÃ94ÂóùŸÄï¯
¨ Ê/©co<[)ÉÔ$ö*¯~£ªá•JQjÛ"Æœ&>«Ã=_õ1a²À¾Åð•—ñ–	ü‰È±@ÚÎx¢ZçƒÒu rd¶`_1±T¨*†KêbÕãÕò{

+–p-n—•+êµØW9?¢ä×é.¡W*mŸ*n„Í÷Ô¤'Ó‘Ô.CAèCd’­Ã½D€C1‡n*’k]F‚•
Ü´Ol7iò
�ê% cXkÔº%i(¯ÎµÚ=Är$DyãU6òʉ;Ñc†aŽþ
k|¨Gr:âž9£mm•ÒWš‘´^ސÙX¹Æe¤UAíŽDžQ·_«èt¢ýj´¹$Uh½¢‘”å›4’èañ¸»|	a
üeB´„¾óêð¡ ÓC
UMÒµñh¨Þƒ8—û­wÇƤiiâÆp­`¤Œêgî‘6ρÝ#‘Mtʍ”?<×8W€Üê¦^ê%xpf1ìSq
iX¥YÈZðKT6
/5Qt‡ŸšÎ¦£ÕhEzp)HçJè äXC‘ˆΐR[S}
qœT/ùE†:E,´2P!äZÓN€Ä‚–Táý¶sÕÓ=4Ì阃RNðÁÒÈS ‹wÐèy#dïý8G6<`ì
3Ã…YˤM�‹Ä=9fts4¬qÎ9 xì…þ�0Å¡ÃaEÐgŒE7ˆ½Ó [ëÃ3
‰n(™)* œlŸ<–Á`öT±&v­¹}™ÀÚåOu™×(ªÄ
!`™4ðHA”XOÁþ„’еƒŠ¨>!ð	ð+Ò†€5!¼
+´0`!WB4€—�â
`1@à
�¹X�€Ì@Ð( à8
	 L@M@÷æ9zîOk¿Uð¯áý;<÷?¹^¯ñLJ¿ÏïœæìóòÝÃÏœrãî s_¶üJä×B¼<ñû΍Iì͵}Àès´ÿ­4yÜWMmQjݯ6®Àç%¸ÃŒ¸ÎŒñЈýýc¶¹FÝ(6nÆñ]:œ
—?w¢ r4'}p$¦ã«j.¶cb%¦,·¶ü«Ù[P!C‡Î´ˆLDî$¨WÉÈrbG|TX!ÕbFT#åVL.4ƒ
Cp<$Ä*YÁ& ¶"¥Ä˜ªÐˆªT€©¤€©@€ªHÑS±‚¦"ÅJEŠ”#*F Tl8¨ÀaQ ¡` À¢¿azÁŠî‚Ó+f�V³ñZoÅf¿†x*èìUØª¿±TçB§ÎEJ|
+’7ê*%ÔT‰¨¨ãQ6¡ËEA¶Š€­ò°W²º¹Õº®¨Êª¢z¾‡jú§èŸ¾4}ãŸîLßnfû:—ëþ?®xê´¢ª¶Šª>¦Xj•!ªI‚¨Ö
+¬X*¬^ªžv©éÚ¥Wj’ª:v¨¥Ú¡çjƒÜªìn«5º«†ª¦Zªgj©Yš¤¶jØ‘V->ø"^Ì¡²Öĵ²+J£�!:¸¾<T4»âõEkÕ¯T"µPÕ|Ö«Ôµ\¥*â)TAJ¢
+UN¨Ju@Òª_hUô…_ÕäuX“jÃUäÚ¯Ur2«I•XKªº]URꨗT ]PAu~
+«ÎU\²ªÝ•VЪµ¤ýŸ'íYjû$GØÁþõè¯#ýoë`ÕX†«X5ZQªÉ‹V,Z±Õ{«Ðµ]ªÖ%V1*Œª*¨`J q*û‰W¸:¹ÁÕ­¨ukƒ«î^ªæ…W¶ÀÕ¯­5g
«
XpjŒ€ª+ýPïê„¿Tú¾Ÿ«Áÿ¹ûoñúÕl’™Ùà”Äp¾ý‹ˆ+£M* 2$ä;‚pú·@&–¬8A2$J"0$N���

`�’-3a…ÝÍÖp8Ì‚¡àÐYú‚¢Šˆ#Uâ@X'`°lŽÚP)û¥âªo‘üùº»n‚+�¸lñxÑЇP;ÝXxtm?49@«R;ðS›pèŽÊÛxêêBkqÂ’¯L«^s;˜$<æË71^Ó·%’�Øí'U7—ZHíê叆”�b»¬Ãá÷õÌšÖë-`mußǯȜè}…ËÇÀF,
+Ž¾½\šW‹×G®GveFoB^qezñ‡‰.¥J¸Ì-?7øÞÑg¤.ôgÑ2áù“3VãŒç.‡¿Ã„ˆÎ �L®Ú¯ ˜JåÑ*�ÊñßÒŽK‘”JAD
!¸$<ßÀbÞftÙÄ!ŠÏ”&¢é
ßñ“%^º>ʯ�ù	€�£dId‡×rúRZZë$=†	èbtÒóÅȨÔ΋\rCA¼t_X¼Ö'.Äz´bf0^ûf¥¦ „£žDVè¯7‚6Ž7f/¦>/ˆI¬“ÃW+ü	A¾˜'6•N¡Aڹ‚²g"˜•	täêT¨úÒ¹DLêød@C[1ÉåÎMÌ.yæžXÁ-'G<­côŠØGìʶ°Dѐ٠aÍÀe+º€¿‚“‚„ûGGN{^lY³—§35;!kv0å¸j=Óô˜f±ãðBæ¼ïwóf$îŠüAMûB=>LïB_‰|Ö¾Eúäg\«MÆ—üMù¾ï!P×S–¶ˆ=*÷yˆU؆û<úf…¯)¡¸kuTf
+W,þPG»”y½fSýÕ•?wYV¹åk^æÝšæ†jåæºÒáö®k¥xÿ·ˆü¥¼AŠÌÀ=•pTµÇR{(Ìá×&®
{A½—�·„KšåÇn›Á¯Ôë î­
Ñ¢¿LDz30 ü¹XèÌßGÁ£Ì|á³M÷còùèàL
ª_Kÿ
–VMe2jÏí$än$$y’=™Fó·	–?Ù!e!•t•t(œ¯@ÑC[Ra£l‚¡nž’O\؁úBxnЙKÜh…™·:¤Á¼›0I²„b×=ÙäÔÌÑýgt1cr&”B«
ƒ«ªÝø¼tU�Xä³UWñxKkézcáœ[	àBiåófÉBÊŸaðý4ñéÉÐÒÄÒ¹‹ãHFãÒþš»7F€¸‚ƒŠ2@µÚWÆHÒ±WXƒ-Ú–êÞ¸¼P™”͵zè…Qæ�P¡$p+A)+‘K>\Ï	
ü;”9BâGºDx•jØ*–º˜eË™ÂäƒÂN-ÈbË
„^€I®âêÕÂNÛ¶gW`À®“Ž—)˜N
+\Ú$¯x+ç.¥ÁŒ0Ñ›¤¢«2ˆ‚Q[ÌS†Cû[gX
%ŒàÍ|ž;›dD
sƒ­j¸|[!Ò8d·”„…&ù§y~ï:¡<ðÎÅÄ9ý\H¼Þ�—@0wßAT)C|%33¢H>0ræÐ=è161•P.*¿y©4[Ŧkñ¿D˜4>‰0ؘ¥ùB‘láåab
ƒÁ"8>ÚOƒˆ'ò'FdAŠ­7ÅbÁ²ÃmInv>„Ãä¬Ï)FZS2y‘bçÉ2j/3Ö(ùæ¢Ñ7¾FĬ$GÑ52	¼f›·(ŒÎŽ94ÊIµ%*2˲"vÎX-B¬xp:íÊkԝò™¬Ú\”„Ò ¾Ñ%²(Œ±ºÒ"@x—/gžF	»§ÅŽT‘ì3
+ñ³¤)¤|;oXïï9�R(o°ágŽœP©¨Q*:¬î™ •©p•æJfuvXص©!œRzϵ™Q#A–™C•q‰i¼­!P¤aY¡2]b3ÃÍE<y Ø•BP¨3&Q‡6Fꓵ÷‹B':q™âb8*�^`šJ¦ãbZ+�ÏE4
Ò‘û‡ÞnÉ™4ƒ`¾Ô{²ÖV"$©½4ŒÂ°N"APšÇO*DÐ5VÍ°ˆ½ˆÉ©Ÿ
+˜>•œ¼ê6°PÜHu~¥sFxRÈô÷§È§$ÜHìT¶Š“•`w,ò^[4‡:)6l~s þ9_†„2¿¤ÿÃ!Œí‰.¯¨ÃÀ	g ?i)ehÎ|Ga
#‹iÝejDñš¨dAo`–…	9$÷S©æ)LE¨v�òƒ“B‰²ú‚±,/
µèÏeò·PÊa
+Ì窀J‚ÊëIØÍ??Qg*’[9ÆÄ9îêÿ‚®{	¢²•Ó¦3Ê{ƒC×Kñ%:ÃàGíJÙõù…xI|ѳ`©ˆNŒe
L輺œt½r¨6ÓºÛ-í«�\¤¤jpþ¹þú-ãQ áƬSŽl|Àȃ·6³š2˜Ê«™Öy¢8£�ù_$*(Ÿ#€œÐ+[Œ£6ðí V#ëi²S7Œ…²u>Äz&¦Îšq¶™…%]üPÑ€6ö`žØFþób"2'©-‡H‡ú¶Q{
+¨¿/ÏWkïîcð$ëú¬‡/sت°yçn
ˆŠÈúüâ[@ÆÖ7 w„î 0µa×ÀV˜GΙ٠·ƒëÖ}¯'	ÒC)Ñ
-à�xÃU"!9¤¾[ßϳëˆàP(pæ—±ˆæòCZ,*ÌBFÏ‚È!ns#P—�À©#È¢Þ¨>|Eˆ+ßëZÞSn¦ËdMOH2ÀƒµËLÏ•ú7æZCCˆßS_#¬N‰K¦2Ûæò èD›<sT)Ĩ
+xy
+ëYD–ÅÕ«ÔKùÃjzoý‘ZÝQö$Š¹:°¶À<X:deþA"¾Hؐc£Á&¸äæÿÏá#¦ÁA9FÜUÈznØi#|ìF	$?à la_¸X.-´H-ï‹ÀÖh¦“dwqVbGÿJA‘:×Ë]­åO%<åxÖÂŒ[œ´çè†x2«…ÚÕO³ŒæWf¥hÖ3’øöõŠ’HvÕÂtB×äxÞä%
+%d"»ê)i;oîåñ!“µ`]1É#E,"¤¢˜¡÷­‚°ºÐYxÁú…°)f¦¾‘”'Â4R2|›‰#*6„‘.i‘TGh—Z€Ð£†Ã—Ýg+vrî*•zSÿø=Ž^fà5XNv‰8
+*ï8Þd3<‘œ8Å(m�'&Òæpwº‘R�€
+–
+¼�Ù;‚yþ•±›a#y—¦‹H€rY;fÍö,ˆéeœGâyÒ¥ƒD¬À¢;IÇÍô˜Gêq*‡D´FII©"HX
ðW„½áç@²#çΞB™ZïIØ)MÄ9ƒRb5G˜33,¡1ñú,Š;ò¶Òðz
+\פ+@½1¸˜ô•´«s`Kø*}?t¢ŒêŸ›��ÀÙšš7QJ¾¶‚�„°ŠÓ-&©[TÏÀwzDÞµ7Ü +i½
+ÞÁS+{\=™í靻­Õp&õ«|o°V&Á°/‘ʉÔ'Àë
*ÜĸúgÇu~BÅMäBÄóOûyŠ@…Gߧ`n‰…

+߈…J	s5…BÜ›ôóù87Jš„i@v¹ˆ¯Œ}uí\Ô&ý‡r<\XX†‚†äº2×®o›'±Íï
+7XäèŒv/.Y@~´Â⯈u³aKÉ5¤´€mÓú= Ò=æÓ{¢ÎñÜÎñÕÎh|/#<M–ÈÌX†ÄÃEmŒ´-1²¨S&ŽÁ“AÐG€k*ÖÎPÌ…¬ÐÇÁ‚Ï—dŽ²B¡Xg7PÞóÖc´X,K7'Èèq¥7ålídý%‰,ŒµdôPÆþ¨Câžc!Äl2§ËXº¦F*K±Èò7͹ŠtÄÌ#Å{Úý™CÄu¥˜â¨çtBDI4Eš‹À:Å9&ú‚@§çú·ÑgìÛ´55}ÏP±Y
+⵺‚]ƒ‰.üÅø
+w¢Ë´VâQ¦çŒIMãIùXr^û˜AåÔBÊ+ ±é€DÔòÂRJ&^ºŽ@‰èNdêê0Š3U‚ !
¬Z7ØJå¶g9¢“fÐ ™ÎÊ5ùsÌÝ?ä!ÌÉÑÂ"X·Ûl1¯ÔfÍŽ[VÊ]"^”¦"£g{®=eè•9æ²ëh*Xpd' ð¥"Ž1®Ñø!~”3~Ø@Ãׇ¤/–™<ox!V�Þ,'Bü.뚢å	2lzp#/CÐì½O‹Èf—N¨â^VŽÄ³ÎuÍâÁ„ëLùf_­¶kSd–W>^ôH1‹´°©d)ýº‚&II]£uÛ2æ0è‘.ŸPU¹V£Yžzs¦F;·&np*Z—í­8PN`DœÉ@Ü?#x…ç"pLÙB^Ã{¨ÜëýZ-‚ED]†vÕ¢ƒ¾(Ðœ<dÞÕœ
%X%Vy<;r\¹a½Á®DºZ½ÔØ*©ž@ãÀ¦O‹çH7,C¬Hx0¤oם¬ÈtJvŸÑÄ¡Ìâ	v,afÏxÌÓDf,p_YZ4‰ue\s‚Hænu<n}ÁUÐìtE„Qœl¼ö¢9¢H&N›RÖ`ï'在†Ò[­œúâd(èÑ9J„pþ2é`ÎLRÅ	+îÁK¸fo$üXÃﳉ-n@f�ocÞ‹ÆÍN-´AWK]™,È‚]ßÒe*#ºd­Ñ=“3˜·Kg/‰4-™2³�P|@G‘š¸bbL5`´´)¬ß·æ¾±ð5	iQÞGê<v6H\†Ê¢¢KŸ–¿š1ñ&�äk'áµðpÝhèžAF¡¶
+tÆQæÄŽ,ØaÁRg*eD·éêS{Ï›�1…qøõ¥U„ŒÈi£sQ°¬�Á,Ä’¡zŠ^é›#¢Œ)ăÒ˜j­º×t242X€Ì™ŸªH»0Æ„@‚]¼^,[cEœpª™h<ª<HgJ(=@ï$r¹.�!­zGTú@s¶‚é/F3j{Ô-ëlã@bröÈÁåçÍ"=ÿÊý«ë?’3üîMkÜ'~îÚ·˳úJõ™¨+„$«oŒjµÀs#FµN–°ô;
Ø âR+íÂh#åObœ¹ø.¨¾¢4xTìáýðِ ³–ÄÜ	ˆü0–wõ@
-¨	¸bèaGe¨CŸÄD=âá{‰²&Ä£z•Ç…Ÿ“@Jh~³#f4’v!D¿|Y
+DÙôpKÒŠŽž“³†ìeŒ[ê6^ŒH&;
+{¶ƒä�B"2‚±i˜<‰qQÕC?úQ
g
+‡ËØʈ(÷¯"ÖŽÑ¥`7^Á0,Oü­€æJ n£
ÿÔÌOƒ
+düü|÷R‰ï
Ù§s†kðøÂÁùÖ NÓÏ•¡ávN–ƒ
+ X‰±}$&ùóÙ)r`º2¨�­
ÁÈþœk½…ˆì‡È‰€ô!8r\»¾;n§E6ejO/,uqÊ4-Iථ¥Fd¬ŽgÔ8E
+€ŠZè/c¶jÝcG©â­›8úý
+¡ÛCb=B­›(tD1Ù;¤SoÌòr>ä`
 ¼Ò1ú îCm+KJÈ]ð
Í5í«ØÕ]½’ÒMýi¹
ãÓhõ0jxy¾Û›HyºÔ:ÂT…ò¡AåãßïãuacÆ)y´Ž‘€ìs’ãoܘ¼aËSG)$Ùõ­uxù·÷º½"³«mTq�v’³ÏâŽN@[U·j4è3ùÔY
+n1i
+{N/ÊTj5ÍfÏø
–§c絋Xµ£̽å99@06Œ¡¼—|æñ=¿RâˆùðŸ	¸Ø<É
vælbÒ2ä8Ýo†à
ßæQþ…@»F;Dû:løýÛ�’,ecd·-¬ÀB™lÀ
+ò‰üÌômåñ—çˆX´LL=#¹…žˆÀ+ÞY€$Â}²n£®{éñ¨¸)pñBSБå4¥†ïJw.d«DÛÔPÝï#Ô|”%ã�JÛp+ÂTøí UYïï4°6?Ÿô…qj,ä¹s噦JT`Jb L(7ºq‰ yùKÁ®&M³¹¬Â~
+é]g7óÆW§Õà<„U‚y3ÃKC
m±¢'�*àª	ÐãÃQøÆŒdkFÙý‚Dvö™JtÁ¾S„¨0L…þ‹di²SÀB:Ag£Çïå‡RXY–»Â¢µ^ƒ‚¼@™K
+	S$jˆ-ƒW'¿9ƒ#Z¹K¢¼ÌÔç…I •eh6§Gt™ƒAq§~Þ3ùÍ9•¶/BH!Óþ¡
©I[ňcã$q·†àÔõgFd…è “§ÐuMc÷‹¡âHç·æÉ´»0™ïT2Fm„Œ¬ž¼¨õ`ß6k{ùºÑ:<šnã¯kÄdDÃÍdâFÞ
qKMCOídFß…>ê–E8E¥²r®Ýtšy.¼G„çx¡ù›B5Cf§‡¦øír!ù»h{øêb#ÊzpZÓِzNd²,ŠgMYýŠ••­–}—)í$¨O;ú¼¶-À µyq}fq7¡³šÖµHS¬„öÍ1ý™R‘&ñ~ZïõO(劼à]4žfœFN¢ƒØHPg6µyºúÎ�þ1Õà–”’K¬½*†R
[A•1¤à““¥„APÈ”«ñSçæ$Ã,	A'£bCp´³¡	éPæ4‘>Y!OvË^\s(r¿ÂЊˆÛ¨n™
p)
+pi”5€UÀY¨ZÍDótYˆ:è1èŽìQ«–šq7/Rk
+æ@"B¥?А†ïÓo¬êx4	Ùs(Jî(qoc^EcÑ¢4,ˆœ˜Ð“mXh¸®íˆ(ób‡Ø Éiåm“E
±e& 5C‰–1©Ây¡™vÎI
 ZÃ&°y
e‚‘Q`oôvYÔÝIHÞ¸XùBë{Π	0ª\Ï#A§4$æÿÄ8ЃΨÍã¥µZh²N}hØ©ì%P»}@ï
à
+¥?ú5dŠ‰1¦9ˆ.PÅ jcoìÀŽÌÅWHÂW	G‘°˜Ç!N¤4K�©š
èñ)fÓ>¿-÷tìnôY¸4Ë*Ùãc¨NÃ	ØaöÖ‡D'à¹&_0éM& ^Ú˜Äb-Â9€¨?e±½n¦×‘Þ·
„ïò‚‡¥E,¯d!™E|KOPÐ œæ:êY‚jÙ­O{¬Cfm!X„í
w¼º2\~•€¶h&Þ;ꍝgPÒ²x¡z»_™9Óu
Dy¹
"ÄÆÌH„Ê
+ey|Ê '°Ä[qªr|#äšRr²_šüŠ•¶ª¦ÍkðR=y8˜íX]°8w鎷¨=Q-Ó×Í^fê6,J”E’C•0 GÔ/I�”Ñ‚0–4åØÄ€úöc�9]�‘“"…9ÄPŽ*ÂðR#ˆLÉ»Xz¢À43„8É/´ß¹zeF$1ª_ÀùIVÄÿFÖ2QÉX).˜TäcfgWÒóùU½†
êøv!²¸!ÍÀ
Ëí6ÈB"&àÅžgt…9êœh£ ´¶dEpj-ہʁ+ ~™^FãìsR%a4í/}0�𤛡–ˆQ'”`áEæµÁ
nɸÛÙ•tÕ±€ÌW}9
Õ_¤2PS0ÔžÇä¤ì!%RpýBñ	©q	<—$ ‰Âñ¨«"ñÑŠm|¸ªBpZ*d£õÄŸ_~Ö/à“â`
+ä»è%¤7y+M"úòªó¨ŽfflÝn©¹“Y½lÞ SyaÆUä¹’Í+NPZ¿@_ہŸ£«;¨ê÷úDT¤ù�ÌYG:I•ÝòD"i¡	žæ+Ø9À·IL{Ћ>ò“Aô
°D½4EøÇE“q	W’J“eÑE|¤96p¿â¤X"HËMI'$Û|°K'<¸®t†N{I7i`…¥«<Jøo‘-¶ Ÿ 1"nHà‡Æ=CaùiéÇ/
	ƒhƒš2mÞÊÄšP8½¬S-'¼¥»lý˜£p{ávàu˜63Hß:}{rN˜ˆ2,3/Åú}?�Ä_x‡žŸðqKx?¡ONr##œäl@Ûµ`>¯ÍöìFqÖB?ÓÀY‰fš"%0q?F=ÈÌO*
„‡Ã¦:Cx*㺌hXÔ ™~Uó„»ÄŒ>žà‚
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e3e2dc739dd851f2d7d291be032e30b909e3e95f
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph />
+<glyph />
+<glyph unicode="&#xd;" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
+<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#x2000;" horiz-adv-x="652" />
+<glyph unicode="&#x2001;" horiz-adv-x="1304" />
+<glyph unicode="&#x2002;" horiz-adv-x="652" />
+<glyph unicode="&#x2003;" horiz-adv-x="1304" />
+<glyph unicode="&#x2004;" horiz-adv-x="434" />
+<glyph unicode="&#x2005;" horiz-adv-x="326" />
+<glyph unicode="&#x2006;" horiz-adv-x="217" />
+<glyph unicode="&#x2007;" horiz-adv-x="217" />
+<glyph unicode="&#x2008;" horiz-adv-x="163" />
+<glyph unicode="&#x2009;" horiz-adv-x="260" />
+<glyph unicode="&#x200a;" horiz-adv-x="72" />
+<glyph unicode="&#x202f;" horiz-adv-x="260" />
+<glyph unicode="&#x205f;" horiz-adv-x="326" />
+<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
+<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
+<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
+<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
+<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
+<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
+<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
+<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
+<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
+<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
+<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
+<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
+<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
+<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
+<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
+<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
+<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
+<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
+<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
+<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
+<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
+<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
+<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
+<glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
+<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
+<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
+<glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
+<glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
+<glyph unicode="&#xe028;" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
+<glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
+<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
+<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
+<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
+<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
+<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
+<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
+<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
+<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
+<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
+<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
+<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
+<glyph unicode="&#xe041;" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
+<glyph unicode="&#xe042;" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
+<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
+<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
+<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
+<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
+<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
+<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
+<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
+<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
+<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
+<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
+<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
+<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
+<glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
+<glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
+<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
+<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
+<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
+<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
+<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
+<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
+<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
+<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
+<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
+<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
+<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
+<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
+<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
+<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
+<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
+<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
+<glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
+<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
+<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
+<glyph unicode="&#xe087;" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
+<glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
+<glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
+<glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
+<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
+<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
+<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
+<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
+<glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
+<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
+<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
+<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
+<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
+<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
+<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
+<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
+<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
+<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
+<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
+<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
+<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
+<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
+<glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
+<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
+<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
+<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
+<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
+<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
+<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
+<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
+<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
+<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
+<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
+<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
+<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
+<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
+<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
+<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
+<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
+<glyph unicode="&#xe130;" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
+<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
+<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
+<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
+<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
+<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
+<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
+<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
+<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
+<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
+<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
+<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
+<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
+<glyph unicode="&#xe143;" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
+<glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
+<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
+<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
+<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
+<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
+<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
+<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
+<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
+<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
+<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
+<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
+<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
+<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
+<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
+<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
+<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
+<glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
+<glyph unicode="&#xe162;" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
+<glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
+<glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
+<glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
+<glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
+<glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
+<glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
+<glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
+<glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
+<glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
+<glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
+<glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
+<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
+<glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
+<glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
+<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
+<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
+<glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
+<glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
+<glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+<glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+<glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
+<glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
+<glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
+<glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+<glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+<glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
+<glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
+<glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
+<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
+<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
+<glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
+<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..67fa00bf83801d2fa568546b982c80d27f6ef74e
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.ttf
@@ -0,0 +1,268 @@
+�
���
���FFTMjUÂð��
���GDEF
���
8��� OS/2g§K„��
X���`cmapJð	š��
¸��rcvt �(‡��,���fpgmS´/§��4��egasp�����œ���glyf3!��¤��‰<headbXþ��à���6hhea
+2�����$hmtxÁÁŽ��<��ôloca4VN��“0��
¸maxp
 ��”è��� nameÔ¯™í��•��|post¹F¦i��˜„��„prep°ò+��¡���.webfX¯Ræ��¡8������
����Ì=¢Ï����Ïò����Ï	.�
������������
�
�Ú�
�������
��Ð���ZÐ��
¤�2¸���������������������������UKWN�@�
â�Àÿ���|���
����������� �
����������
����
l��
����
P���P�@�����
� �+�  
+ / _ ¬"%ü&
'	'àà	àà)à9àIàYà`àiàyà‰à—á	áá)á9áFáIáYáiáyá‰á•á™â�ÿÿ�����
� �*�  � / _ ¬"%ü&
'	'à
ààà à0à@àPà`àbàpà€àá
áá á0á@áHáPá`ápá€áá—â�ÿÿ�
ÿõÿãÿÚÿfàßãß´ßhÞÚÚÙÙ
+      �úôóíçáxrlf`_YSMGA@Ú�
����������������������������������������������������������������������������������
��
�������
������������������
�����������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������������(ø°�,°�K°LPX°JvY°�#?°+X=YK°LPX}Y Ô°
.-°
, Ú°+-°,KRXE#Y!-°,i °@PX!°@Y-°,°+X!#!zXÝÍYKRXXýíY#!°+X°FvYXÝÍYYY-°,
\Z-°,±"
ˆPX° ˆ\\°�Y-°,±$
ˆPX°@ˆ\\°�Y-°, 9/-°	, }°+XÄÍY °%I# °&J°�PXŠeŠa °�PX8!!YŠŠa °�RX8!!YY-°
+,°+X!!Y-°, Ò°+-°, /°+\X  G#Faj X db8!!Y!Y-°
,  9/ Š GŠFa#Š Š#J°�PX#°�RX°@8!Y#°�PX°@e8!YY-°,°+X=Ö!! ÖŠKRX Š#I °�UX8!!Y!!YY-°,# Ö /°+\X# XKS!°
YXŠ°&I#Š# ŠIŠ#a8!!!!Y!!!!!Y-°, Ú°+-°, Ò°+-°, /°+\X  G#FajŠ G#F#aj` X db8!!Y!!Y-°, Š Š‡ °%Jd#Š° PX<ÀY-°,³�@
@BB
K¸�c�K¸�c Š ŠUX Š ŠRX#b °�#Bb °
#BY °@RX²� �CcB²
 
CcB° c°e!Y!!Y-°,°
Cc#°�Cc#-����
�
ÿÿ���(��
h ���.±
�/<²í2±Ü<²í2�±�/<²í2²ü<²
í23!%3#(
@þèðð üà(Ð�
�d�dLL��$�°�/°
3°
Í°2
°/°Ö°2°Í°2±
+�015!'737!!'#'7d
··È··
þý··È··
ôÈ··
þý··È··þý
··��
����LL��J�²
+��+°�/°3°
Í°2²
�
++³@
	+
°/°
+Ö°2°	Í°2²	
+
++³@		+²
+	
++³@
+�	+±

+�01
!!!!!

,
þpþÔ

,
þpþÔþp
�
�d�Œ®�7�v�°2/°(Ͳ(2
++³@(.	+°�/°!3°
Í°2°/°3°Í°2°/°Ͳ
++³@	+
°8/°7Ö°2°"ͱ22°"±-
+°2°.Í°2±9
+±"7°9°-² 2999�017347#7367632#4.#"!!!!32>53#"'.
'ddqÚd‡%Ku´òp<µ3LJ9D?
{dþÔ
–dþÔ	09C3JL3®ak§Íw$B
ôd/5d§Z½gj7X0,Z>d.6dJtB+0W5¬juž.«x���
�È
L¼���°�/°Í
°/±
+�01!!È„ü|

,����
������������1��
ÿò
,ÂA���°/°Í°	Í
°/±
+�±	±99013!264&#".
#"
qOîxªªx.,,µn˜ØBU
îPr­ò¬aw×™k������d°L���
+�
��5
7
%	
ÈÈ
ûP
,þÔXXþÔ
,d
ÈÈþpÈXþÔ
ôý¥[þ
,ý¨���ÿóÿó½½�����%'7
'7764/
&"

MßZÖfÖVÖc

™$
pßQÖfÖVÖ\
'™

���
����°°�	�3�²��+°Í°2
°
+/°Ö°Ͳ
++³@	+²
++³@	+±
+�01!
!!5!°þ
,üà
,°ýÚýÚdd&��
��L¯� ��&
7>
5%&

7>
54&
&$ˆOAXX@JOWˆOFS
+ý
+@JO‹n)`*^›ý÷r67)Q7q
+Á
+ýO���ÿìÄ™���Y�²��+°/°Í°/°Í
°/°
Ö°Í°±
+°ͱ
+±³$9°°9�±°	9°°9°³
�$901� �

"'
#" 6& 


N
,mþÔwŽÈƒÂ
ÁÁþî
í

þäÈŽwþÔm
,NlþðÂÁ
Á����
�d�X¯D���
°/°�Ö°Í°ͱ
+�014>
>.d8Zwwy,0{xuX6Cy„¨>>§„yC@vS-IDEH-Sv@9y€²UU²€y��ÿ¸�G•°�
+���!3!
	
7H
ß’’
Øþ‚‘þ€þ‚’” 
þpþêþ?
þí
¿þ?
���ÿ¸�G•°�
+����°
/°3°
Í°2
°/±
+�01!3!
	
77'7#'H
ß’’
Øþ‚‘þ€þ‚’”CÄIÀÃJÁëMN 
þpþêþ?
þí
¿þ?
tŽâŒåŒÓÓ���
����°°���15
5"&=
462
#

%?°ø°?%


d•3È|°°|È3•dþÿ��
����°L���������#�'�+�/�3�°�²���+°ͱ 22°/°"3°Í°$2°/°&3°Í°(2°/°*3°Í°,2°/°.3°Í°02°/±233°
Í
°4/°�Ö°ͳ$2°±
+³	
$2°Í°2°±
+°2° ͳ$(,0$2° ±!
+³%)-1$2°ͱ5
+�±±99°±99011!%35#535#535#535#535#!!5!!
35#535#535#535#535#°û´ddddddddddÈXý¨Xý¨¼ddddddddddLû´ddddddddddü|
d
ü|ddddddddd��������LL���/�?�B�²
��+°,3°Í°$2°/°<3°Í°42
°@/°�Ö°2°	Í°2°	± 
+°02°)Í°82±A
+�015463!2#!"&
463!2#!"&
463!2#!"&
463!2#!"&
þp
þpX
þp
þp2
þpm
þpý½
þpm
þp��	����LL���/�?�O�_�o���v�²
��+±<l33°ͱ4d22°/±L|33°ͱDt22°-/±\Œ33°$ͱT„22
°/°�Ö± 22°	ͱ(22°	±0
+±@P22°9ͱHX22°9±`
+±p€22°iͱxˆ22±‘
+�01=
46;
2
+
"&546;
2
+
"&546;
2
+
"&
546;
2
+
"&546;
2
+
"&546;
2
+
"&
546;
2
+
"&546;
2
+
"&546;
2
+
"&ÈÈÈÈÈÈ
ÈÈÈÈÈÈ
ÈÈÈÈÈÈ2ÈÈ
¥ÈÈ
¥ÈÈüõÈÈ
¥ÈÈ
¥ÈÈüõÈÈ
¥ÈÈ
¥ÈÈ�����°L���/�?�O�_�V�²
��+°<3°Í°42°/°L3°Í°D2°-/°\3°$Í°T2
°`/°�Ö± 22°	ͱ(22°	±0
+±@P22°9ͱHX22±a
+�01=
46;
2
+
"&;
26=
4&+
"=
46;
2
+
"&
5463!2
#!"&5463!2
#!"&5463!2
#!"&ÈÈÈÈÈÈ
¼ýD¼ýD¼ýD2ÈÈ
¥ÈÈÈÈüõÈÈ
¥ÈÈ
¥ÈÈ���
��"ò*���	
'
'
£2Ôý¡Î
Æþ\4Ôý¡Ï��
�j�jFF���	
7	
	
	
j
þæÔ

Ôþæ
Ôþæþæ
>

Ôþæ
ÔþæþæÔ
þæ���ÿìÄ™���'�·�²��+°/°Í°/°#3°Í°!2²
++³@&	+²
++³@	+°/°Í
°(/°
Ö°Í°±&
+°2°%Í° 2²%&
++³@%#	+²&%
++³@&	+°%±
+°ͱ)
+±&²999°%°9°³$9°°9�±°9±³�$9°²
99901� �

"'
#" 6& 53533##5


N
,mþÔwŽÈƒÂ
ÁÁþîFdÈddÈ
í

þäÈŽwþÔm
,NlþðÂÁ
ÁþYÈddÈdd���ÿìÄš����]�²��+°/°Í°/°Í
° /°
Ö°Í°±
+°ͱ!
+±µ$9°°9�±°	9°°9°µ
�$901� �

"'
#" 6& !5!


N
,mþÔwŽÈƒÂ
ÁÁþîF
þp
î

þäȍyþÕm
,NlþðÂÂ
ÂþYÈ����™°��+�E�°/°
+Í
°,/°�Ö°Ͳ�
++³@	+°±
+°Ͳ
++³@	+±-
+±³#$9�0147
 654&'5".
;
2654&+
"Ò§g|ú
bú|g§Ò[›ÕìÕ›[
ÝddX·
(>¦7Èx±úú±xÈ7¦>þØ·vÕ›[[›Õ

��d�
°±�����0�²��+±33
°/°Ö°Í°±
+°Í°±
+°ͱ
+�0173#
33333dÈÈ
,ÈdÈdÈ

,þÔ
ôþ üà°ûP����––�G�Q�b�°/°PÍ°K/°6Í
°R/°�Ö°HÍ°H±M
+°$ͱS
+±H�±=99°M³39$9°$±/99�±P±99°K³!'E$9°6±+A9901
732?6?
67'76?654/&/
7&''&/&#"
'462"&—P-<…-1&("/&./†80P
˜˜
P,<†-0&("/&2,…;.P
—
g~²~~²~Y!)&1,†;.Q
——
Q,=†,1&("-&3*†:/Q
˜˜
Q/:†/.&0X~~XY~~����dÿÿ°��#�'�+�/�3�7�‰�²!��+°$Ͳ(04222°'/²*26333°Í°/°ͱ,22°//°	Í
°8/°Ö°$Í°$±%
+°2°(Í°,2²%(
++³@%�	+°(±)
+°0Í°0±1
+°-2°4Í°
2²41
++³@4	+°4±5
+°ͱ9
+�015463!5463!2
!2
#!"&!#!"&73#3#!5!3#3#d
+
;)
,);

+ûæd„;)ýD);dddÈdd
,þÔÈddÈdd
2
+d);;)d
+2ün üà)<<)¼ýD¼
,dû´¼ýD¼����
�
�
�
+�,�²	��+°3
°/°	Ö°Í°±
+°ͱ
+±°
9�01	
#!!!
„ÈþÔþÔþÔY„ý|ý¨
þpX���d��è°���"�²��+
°/°
ְͲ

++³@	+±
+�017463!!#!"&

d
Û
ü®X
,~þý]
,þÔ����¬¬����‚�°
+/°Í°/°Ͳ
++³@	+°/°Í
°/°
Ö°
Í°
±
+°Ͳ
++³@	+°±
+°ͱ
+±
³
+$9±³	$9�±³�
$9±³
$901$  $ 6& 33 

D
  þîþ¼þîó
VóóþªGdÈ
¶
D
  þîþ¼þî  _þªóó
Vóýþ
þÔd����ÿœ��°���.�²���+°3°
+/°Í°/°Ͳ
++³@
	+°2
°/±
+�01#
333
!#3#d
¯Ñ¢Ð
¯ýæ)ò(1રþÔ
,ûP
þp
ô
,��������L°���J�²��+°Í°/°	Í°
2
°/°Ö°Ͳ
++³@�	+°±

+°
+ͱ
+±±	99°
±99�011!
3!3
!%35#
êþÞÈ
,ÈþÞ
êþᯯ

,
ôþþÔþpÈd��
�
¯¯����c�²
��+°Í°/°Í
°/°
Ö°Í°±
+°Í°±
+°	ͱ 
+±´
$9°°9°´$9�±µ
	�$9014>2".
 6& 333
_ ÞôÞ __ ÞôÞ \ò
Tòòþ¬P–È–ú
ÞôÞ __ ÞôÞ __ þ¬òò
Tòþd
,þÔþÔ���¬¬����a�°
+/°Í°/°Í
°/°
Ö°
Í°
±
+°Í°±
+°ͱ
+±
´
+$9°°9°´	$9�±µ
�$901$  $ 6& 
## 

D
  þîþ¼þîó
VóóþªOúú–È
¶
D
  þîþ¼þî  _þªóó
Vóþb
,þÔþÔ
,�������°°���)�²	��+°Í°2°/°Í
°/±
+�±	²
999015!
#!"&3!73!È Ç
û‚ÈÈ2
,2Èaý¢
Û¼ýDþ%
æÈÈ
ô���¬¬����F�°
+/°Í°/°Í
°/°
Ö°Í°±
+°ͱ
+±µ	
+$9�±µ
�$901$  $ 654& 
 

D
  þîþ¼þîó
Vóóþªó
:
)
¶
D
  þîþ¼þî  
´¬òò¬«óóþŠ
‘È�
��™°��S�°/°
Í°/°Í
°/°
Ö°Í°±
+
+°	ͱ
+±
+µ$9°	±99�±
´
�	$9°°9012>5# &632!&#"
[›ÕìÕ›[–úþžúú±ˆn’
‘ÆvÕ›ÎìÕ›[[›Õv±úú
búQ’
‘z[›������™°��!�z�²��+°/°Ͳ
++³@	+°
/°Ͳ

++³@
�	+
°"/°�Ö°Í°±
+°ͱ#
+±�±99°·
+!$9°±	99�±°!9°
±	99°°9014>327!7&#"!32653#"'[›ÕvƝ‘þp“p‡±úI
“p‡±ú–[›ÕvƝXvÕ›[z‘þp“Pú±ý¨
“Pú±vÕ›[z��
+�d��°°���������#�'�P�°/°3°	Í°2°/°3°
Í°2°/° 3°Í°!2°/°$3°Í°%2
°(/°Ö²222°Ͳ222±)
+�013!!!%53'53'53'53!5!=
!%5!%5!dLû´d„üàdddddddd
ôþ
ôþ
ôþ
ô°û´„ü|dddÈddÈddÈddý¨ddddÈddÈdd�����L°��#�J�²��+° /°	Í
°$/°Ö°Ͳ
++³@�	+°±
+°Ͳ
++³@	+±%
+�± ³$901546;
5463!2
32#!"&
!54&+
";)dvR
,Rvd);;)ü|);

,ÈdX);ÈRvvRÈ;)ý¨);;å–����d��LL����²���+
°/°�Ö°ͱ
+�0133>
>
7
.ddd<‡x|rjd)({„‡tZLû´
<0
!OQ
ôQE
+((
+EQ��������°—�!�1�A�g�²/��+°>3°&Í°62°/°Í
°B/°�Ö°Í°±"
+°+Í°+±2
+°;Í°;±
+°ͱC
+±2+³$9�±&/´$9°±9901;
2654>
 
;
2654."46;
2+
"&%46;
2+
"&2ä
ä2c£ÞèÞ£cÈ  X  

,ÑrrÑþÔ
,tÞ£cc£ÞtýÕ
Ìþ4
Ìþ4������ÈXè����!!
7'77'
,
,þÔþÔ°GGG
È Èþ«GGG������Èpè����
°/°Ö°	ͱ
+�01!!%7'654
,
,þÔþÔ¼EojCV
È È95‡¯©…6nŠ’�������ºb÷����<�°�/°
Í
°/°Ö°	Í°	±
+°ͱ
+±	³$9�±
�³	$901
!%%
7'6547
7654/

,
,þÔ
’EojCV^{wQŽ
‘
ÈüàÈ
É5‡¯ª…7nŠ‘Í—Á½–B²ãæ²�
����°°������!�/�3�?�C�G�K�O

�²���+±0D33°Ͳ)1E222°/²'+L333°Ͳ%-M222°"/±33°#Í°2°/±H33°!ͱ4I22
°P/°Ö±22°ͱ22°±0
+±
,22°3Í°52°3±.+°*2°%Í°@2².%
++³@."	+²
222°%±7
+±DH22°;ͱ&J22°;±L
+°B2°OͲ9=F222±Q
+±0µ4?$9±7%²()8999�±"³89$9°#²:;999°@	67<=@C$9011!#5##535!535#!!
!5335#
5!3##5#5355333!5#53!!5!
5353
ôÈdÈd
ddþd
,þÔ
,Èdddd
,
,ÈdÈddddddÈ
,ÈÈý¨È
,È
,þÔddd
ôdddddd
,û´
,þÔ¼
,þÔý¨dd¼dþdþÔddddÈþddèþÔþÔÈd
ôþp
,þÔüàdd„ddýDdd����	����°°���������#�p�²��+²333°
ͱ22²��+°Í
°$/°Ö°Í°±
+°2°Í°Í°±+°Í°±+°Í°± 
+°#ͱ%
+±±99±±99�0153#5!'353'3535353'3ddd
,ÈdÈddÈddÈdÈÈèûPddÈèüÈ[[ÈèüÈ[[ÈèüÈ[[Èèü�������°°���)�²��+°/°Í
°/°
ְ	ͱ
+�±²�99901463!	
�2764'&"

+
Ú¼þýØSS¼
Û
+ýDþãTT����
��Ý°����1�²��+°3°/°Í°2
°/°
ְ	ͱ
+�±´�$901
463!	
�2764'&"%3	
'



Ú¼þý×TTd¼þ2
¼
ÛýDþãTT°ýDþ2
����
�d��°°�
+�?�²���+°/°Í
°/°�Ö°
+Í°
+±
+°ͱ
+±
+�²999�±�²
9990137!!!d¯dýdî
¯üdèdü����
�È��L±�
+��3	
4&#!"È
Â
Âüà
¼þE~�������°°���'�Y�²%��+°Í°
+/°Ͳ
+
++³@
+�	+°2²
+
++³@
	+°2
°(/°�Ö°Í°2°±
+°2°ͱ)
+±³'"$9�0153!73#5!!7.
#!"7>
3!2
#!"&ÈdXdÈÈüà5(P>^
+þ>
+B&
+
ô
+&
+ý¨
+d¼ÈÈýDÈÈÙ||
Zû˜
+
+˜
+������d°L��%�-�1�o�°/°%Í°)/°-Í°!/°Í
°2/°�Ö°Ͳ�
++³@/	+°±'
+°+ͱ3
+±�°9±+'³!$% $9�±-)³"#$9°!±.199°´/0$90153!2654&+
.+
"
#"�462"264&"%53;)è);;)–37S*È)R:.–);
dÈÈ>X>>X
XdÈ);;)X);E5+);;;)þpȐÈ
 X>>X>^dd��5��°¯��"��²���+°
3°Ͳ222
°#/±$
+�013!5".
?
!#!5&'.
/

#



5
m)>$\
‡R+5
¡"(þ]þq*
k².tB6,êÞ-WBB
*.
æü0
Ç
ÉŒþÃ��d��ð� �)�1�e�² ��+°!Ͳ ��+°
Í°)/°*Í°1/°
Í°
°Í
°2/°Ö°!Í°*2°!±.
+°Í°% Ö°ͱ3
+±%.°9�±)!°9°*°9°1°90135>
54.'52

#'32654&+
532654&#d);	$
×xº!"E4+v¦OÈ¡Y€}^Ÿ‹Ll¨›Y3(;
G
°Œ7]7(3AvFT‘MÈaTZd{MRa����
�È��o°�� �²���+°
Í°2°/°3°Í
°/±
+�0135>
76&'.
'5!
ÈMs­
+(G	
©!:"€
+0G9C/Q8$

99#'%üÇ4<9�ÿµ��°�	�%�~�²��+°/²333°Ͳ
++³@	+°
+2
°&/°
Ö°Í°±
+
+°%Í°%±
+°Ͳ
++³@	+²
++³@	+°±
+°ͱ'
+±
+±99�±°	9°°901'3#7#33!3#4.+
!57#"KKK}}KK}ú–¼–2.!"ÈdþpdÈ"!/È §§üà§c
,þÔ'	ü®2dd2R	'����!ÿ¶±�	�%�‰�²��+°Í°/°3°Ͳ
++³@
+	+°2
°&/°
+Ö°%Í°%±
+°Ͳ
++³@	+²
++³@	+°±
+°ͱ'
+±%³	
$9±³$9�±±�99°²
99901?
!55!3!3#4.+
!57#"!§ §§üàd–¼–2/!"ÈdþpdÈ"!.3}KK}}KKÏ
,þÔ'	ýv2dd2Š	'��������°L���/�?��53!26=
4&#!"53!26=
4&#!"53!26=
4&#!"53!26=
4&#!"Lû´ üàèüXý¨2dÈdÈdÈd�����°L���/�?��53!26=
4&#!"3!26=
4&#!"3!26=
4&#!"3!26=
4&#!"Lû´Lû´È¼ýD¼ýD2d
ôdþpd
ôd�����°L���/�?�&�²
��+°Í°-/°$Í°/°Í°=/°4Í
°@/±A
+�01=
463!2
#!"&5463!2
#!"&5463!2
#!"&5463!2
#!"&Lû´dèüÈ üàÈXý¨2ddlddþèddldd�����°L���/�?�&�²
��+°Í°/°Í°-/°$Í°=/°4Í
°@/±A
+�01=
463!2
#!"&5463!2
#!"&5463!2
#!"&5463!2
#!"&Lû´Lû´Lû´Lû´2dd
@dd
@dd
@dd��������°L���/�?�O�_�o��R�²
��+°L3°Í°D2°/°\3°Í°T2°-/°l3°$Í°d2°=/°|3°4Í°t2
°€/°�Ö² 0222°	Ͳ(8222±
+�01=
46;
2
+
"&546;
2
+
"&546;
2
+
"&546;
2
+
"&
5463!2
#!"&5463!2
#!"&5463!2
#!"&5463!2
#!"&dddddddd
, üà üà üà üà2dd
@dd
@dd
@ddüdd
@dd
@dd
@dd��ÿ›��°L��
+��*�:�J� �°�/°&3°
Í°.2
°K/±L
+�±
�°90153553#3!26=
4&#!"53!26=
4&#!"53!26=
4&#!"5;
26=
4&+
"eɦ¦ÈddÈXý¨
,þÔ
ôþdd
ôdK}}KþLûædÈdÈdÈd�����
��L���/�?�C�J��²@��+
°K/°@Ö°CͱL
+�0173!26=
4&#!"53!26=
4&#!"53!26=
4&#!"5;
26=
4&+
"
3535#5
Xý¨
,þÔ
ôþdd d!§ÈÈ2dÈdÈdÈdûæLû´&}KdK����È°è���-�°
/°Í°Í
°/°�Ö°	ͱ
+±	�°9�±
±9901
463!2#!"&	
,î,,ý,„
,
Š,,ýv,,
d
,ý¨������°L����Y�²
��+°/°Í°/°Í
° /°�Ö°Í°±
+°Í°±
+°	ͱ!
+±°9°±99�±
²999°°9015463!2#!"&?
'
!462"Xû¨d÷
*J
%ìülNpNNp,ôüí¶ƒœ
>þà
ôþÎpNNpN��”ÿó½���=�²
��+°/°Í
°/°�Ö°Í°±
+°ͱ 
+±±
99�±
²�999014>
32


.'&73264&"”yÑz{ÐyII»99
+"c]s+?—jk——Ö–é|ׁ~Õö•röBB	"ko K‹–k——Ö–—���
�
¯¯���I�²
��+°Í°/°Í
°/°
Ö°Í°±
+°	ͱ
+±±
99°	±99�±³
	�$9014>2".
3"
_ ÞôÞ __ ÞôÞ Mû°°
ÞôÞ __ ÞôÞ __ 	þžúV��u�ß��%��4>7.7
7.'&6?

uDmssIOWM?%N~šOrÀ~[[.
+		\7
–^¸¡Å`Gvwsu†EY™d;^¸~RlbJ(I43n–�������Åh��!�&�W�²��+°Í°/°Í
°'/°�Ö°Í°±
+°ͱ(
+±³ $9°±"99�±³!$9°³ "#%$901
463!"3!26=
7#!"&%7
'	
7/
ë¥
nºþÉ);;)
ô);Èë¥þÔ¥ë
´¡
œrþk
ùqq\

,¥ëº;)þ);;)}Èá¥ëëj2
œqþk
øqqU��������•L��.�H�²��+°Í°"/°'Í°	/°Í°°Í
°//°�Ö°
ͱ0
+�±"²$999±	°%9±°&901
463!#"3!2657#!"&
>
	
"ë¥
…U‘);;)
ô);Èë¥þÔ¥ë
§gg_
hþ™HCVC9

,¥ëP X;)þ);;)™5¥ëë
!&4	

Ñ
D
>Ø3Cm��������¨L��#�R�²��+°Í°	/°Í
°$/°�Ö°
Í°
±
+°ͱ%
+±
³"$9°°!9�±	³"#$9°± !9901
463!2!"3!26=
7#!"&	'
'ë¥
,=B²þ£);;)
ô);Èë¥þÔ¥ë
V
7‰þR’

,¥ë±;)þ);;)EÈ©¥ëë
þä7‰þQ“��
���
°±��E�²��+°/°3°Í°	2
°/°Ö°2°Í°2±
+±±99�±±
99°±�9901
35#	
#35	
5#3	
35#
,ÈÈ
,
'ÃÈ
,þÔÈÃþÙþÔÈÈ[
(ÆÈ
,þÔÈÆþØþÔÆÈþÔ
,ÈÆ����
�È��„L���²��+°3
°/°�Ö°
Í°2±
+�01746;
2

+
"&Èd
ôþd2èþK
çû´
èþJ���
����°L���²��+±
33
°/°�Ö°Í°2±
+�01546;
2



+
"&d
ô
ôþþd2èþK
çþ
çû´
èþ
èþJ��
�ˆ��°L���²��+°3
°/±
+�01


ˆ4
ôþ&&þ
çû´
èþ���
���LL���3	
È„ü|&&����È�d„è����7;
2654&+
"
;
2654&+
"ÈÈÈ
ÈÈ– üà ���
�È�dLè���73!2654&#!"È üà– ���
����(L���²���+°3
°/±
+�011
	

ô4ýÌLþ
çýÚýÚ
�
����°L���²���+±33
°/°Ö°2°
ͱ
+�011

46;
2+
"&5

ô
ôddþLþ
çþ
µü
¶þ
�

,��èL���²���+°3
°/°Ö°2°ͱ
+�01!
46;
2+
"&5
,
ôddLþ
µü
¶���d�È°(����°
/°Í
°/±
+�0175463!2
#!"&!
dèüLýÚúdd
4�
�¹�ù©���
7	
'¹PðþŸ
aðWý°ð
a
að��

ÿÒRt���%	
7



aþŸñ<
ý°Â
a
aðýÅ

ý±������­­���B�°
+/°Í°/°Í
°/°
Ö°Í°±
+°ͱ
+±³	
+$9�±³
�$901$  $33535#5## 

D
  þíþ¼þí‰ÈÈÈÈÈÈ
¶
D
  þíþ¼þí  
QÈÈÈÈÈ���­­���I�°
+/°Í°/°Í
°/°
Ö°Í°±

+°ͱ
+±
³	
+$9�±
+±�99±±
9901$  $!5! 

D
  þíþ¼þí‰Xý¨
¶
D
  þíþ¼þí  
QÈ������­­���2�°
+/°Í°Í
°/°
ְͰͱ
+±
±99�±
+±
9901$  $77'7'' 

D
  þíþ¼þíSՍÕŽŽÕÔ
¶
D
  þíþ¼þí  
(ÕŽŽÕÔŽÕ����­­���2�°
+/°Í°Í
°/°
ְͰͱ
+±
±99�±
+±
9901$  $	
'' 

D
  þíþ¼þík

›¯ìf
¶
D
  þíþ¼þí  
„þë
›®ìf������­­��8�<�l�°
+/°9Í°</°'Í°!/°Í°4/°Í
°=/°Ö°Í°±.
+°ͱ>
+±±!499°.´	(:;$9�±'<±�99°!°*9°².999°4±
9901$  $32264>:
323>54.#"35# 

D
  þíþ¼þíɏ	'
È-"#1D12QE&ˆÈÈ
¶
D
  þíþ¼þí  
+

=&
+)2X23L(5`þ.d���­­����;�°
+/°Í°/°3°Í°/°Í°/°Í
°/±
+�±±�99±±
9901$  $7!5#!3#35# 

D
  þíþ¼þíí
dþÔdddÈÈ
¶
D
  þíþ¼þí  ‰d
,dÈ
d������°°��/�i�²��+°/°Í°2°�/²!333°
Ͳ#-222
°0/°Ö²)222°Ͳ'222±1
+±³"#./$9�±°9±�°9°
²()9990153>
7533#
#5.
'3
5367#53.
'#5
3Ç‹È6vkËË·YÈŒˆ`oKÈ•4ÉÈeJÈKnÑ
ôÈ}•ÈÈPƒEÈf¨!ÅÅ—}ImÎÎ0žÈJjÌËlHÈ������¬¬����F�°
+/°Í°/°Í
° /°
Ö°
Í°
±
+°ͱ!
+±
µ	
+$9�±µ
�$901$  $ 6& 7'77' 

D
  þîþ¼þîó
VóóþªI‡‡m‡‡m‡‡m‡‡
¶
D
  þîþ¼þî  _þªóó
VóýÛ‡‡m‡‡m‡‡m‡‡�����¬¬����F�°
+/°Í°/°Í
°/°
Ö°
Í°
±
+°ͱ
+±
µ	
+$9�±µ
�$901$  $ 6& 77
 

D
  þîþ¼þîó
VóóþªkWÌŽþ¦
¶
D
  þîþ¼þî  _þªóó
Vóþ#WÍŽþ§�����¬¬����F�°
+/°Í°/°Í
°/°
Ö°Í°±
+°ͱ
+±µ	
+$9�±µ
�$901$  $
&#"32654' 

D
  þîþ¼þî>8dt«óÍap«ó;
¶
D
  þîþ¼þî  
´sd7>óýò;ó«pa����
���c°è���°/°Í
°/±
+�±°�901
!!XXý¨#
ÅþÔþÔþÓ��
���c°è���°�/°
Í
°/±
+�±
�°901
!	
XXý¨

,
,þ;þ@
-����
�Ì��J°���²��+
°/°Ö°ͱ
+±°
9�01	
!!Ì
Â
¼þÖþÔXXý¨ý¨X��
�h��æ°���²��+
°/°
ְͱ
+±
°9�01!!!
h
(
,
*þ?XXý¨ý¨����
���ǰL�
��5>7	
F‰çœXý¨_°¤‚È„Õ­g
þ;þ@
-$Du������°°��
��²���+
°/±
+�011


!
&ŽþځëŽ
&þp

&Žþځ	Ž
&
��"�#ŽŽ��
��7
'!'	


"
'
þÙ
¨
'Žþف°
'þp‚þÙ5

'þÙ‚���™™���#�O�°
/° Í°#/°Í°/°Í
°$/°
Ö°Í°±
+°	ͱ%
+±µ
!#$9�±#±	�99°±
99014>2".


;
2676&+
"35#[›ÕìÕ›[[›ÕìÕ›
V:#6#:Ï0ÈÈ
âìÕ›[[›ÕìÕ›[[›FþÒ
.ýÅd������°°�&�*�0�4�;�4�²'��+°13°*Í°22
°</°1Ö°2°4Í°2±=
+±41´5:$9�013!3!535#64&/
.
#"
&/
&#"

#!!"6?
!
7#d
È
do
"=' ïî!'=
+#od
þpd"ÕÛ
þÊ  È
,þÔÈd
¬'0
.&±
+
ü|

ô`0/¿ü|
þp„Å)W9���ÿ꯰��2��²���+
°3/°'Ö°ͱ4
+�0157.>
7>7.#676%>7>
'&"

Ø	8./ieš‰èh,Jhqƒx{\Sc'C7
8Fak[)!#==þYÁ5<€b‚;<U3-9½þÌЛU3	7
SB¨&?_€T2	3s  ÅÌ��
�o�Dç�H�#�
°I/°
Ö°EÍ°E±<
+±J
+±<E±:699�01
>7>
'


>
7>76''&'.7.7
o	FFB:8( OV
+	$9DkC@&¥¤'GOS3
*gJ.

&:4?
¹B8-
+%>=Bí'P¨d!I, 
=CnC¬
Sm,UŸ!†Ù•fm§S;4(
+.MV .n��ÿÃ�}í3�!�?�G�C�°/°)Í°:/°	Í
°H/°<Ö°7ͱI
+±7<@
+	)(5>@C$9�±	:·�$.5>BG$9017>2
".'72>7.'"&5477.
/
=FOsv““vsOFFOsv““vsOF›C-[Tz€wRY,H
7:91°ø°.f…1ii%LX(
+(WT`G//G`TW(
+((
+(WT`G//G`TW(
+(
+`=^8+(3\;h
I%E:JY|°°|UIWs|Ci`$$���ÿÃ��í°�� �)�A�¡�²��+°3
°B/±C
+°6º=ïïÝ�+
+°.°À±
ù°
À°³+³+³+³+³$+³%+² Š Š#9°9°9°$9°%9°9�·
$%........
@
+
$%..........°@
�017>3273
#7.'77.
547?
.
/

7>7&'7
=FOsv“H=<%”þÆ”%R¦ri'
+›Ò·%k.f…1i/:
(&-/"0/
a+'C.
%Ze“X(
+(WT`G/ŽûPegy8(þæ6§nUIWs|C/WRý§‘&2&?@0’6@((4kbf���ÿž��¬�����&3!26'
.

7	
!5#
5#o%%ý~8ý~õ
½
½þ§ÈddÈDDG  " ûÖdÓý-dd
þÔ
,d����
�d�°°�)�H�°/°	Í
°*/°%Ö°2°Í°2²%
++³@	+²%
++³@%#	+±+
+±%±99�±	±%99015467
462


'%
/
#&=
47&d
kX|X
kþ™d^Þ^dþ™
)1
E
S>XX>þ­þ»1)
ùþù[@	NN	@[
ù
�����L°�	���#�'�+�/�3�7�;�?�C�G�K�O�S�W��53!265!5!54&+
5#!5##"53'53'5353'53'5353'53'5353'53'5353'53'53èû´L–dþd–dddddddddddddddddddddddddddddd2îd–ddddüJddÈddÈddþpddÈddÈddþpddÈddÈddþpddÈddÈddþpddÈddÈdd�����x®�
+���A�°�/°3°
Í°2°/°3°Í°2
°/±
+�±
�±99°³
$9°±9901=
!
35	
5#	
!7'!
735	
5#
Xñ
,þÔŸý¨þ«
zµþ«¦zŸ
,þÔñÈÈXÆþÙþÔÅý¨XzŽ´ý•Ž{ÆþÙþÔÅ��
����°L���²��+°/°3°Í
°/±
+�01
463!2#!
#"&;)è);;)ý¬þÐd);
X);;)ý¨);þÔ
,;���d��L°�%�)�-�`�²��+°	Ͳ	
++³@	
	+°2°&/°*3°'Í°+2
°./°�Ö°&2°Í°(2°±
+°*2°Í°,2±/
+±�°$9°±99°°9�015!32>'4=
!".
!!!d
,U'5%;)

,'MeÀeM'
,

,XÈúq \#(,.úÈ*R~jqP33Pqj~R
V
,þÔ
,þÔ����
ÿâ�¸hÞ���	
7
ã
`
aâý¾
݋
aþŸãC��
�F�ÚÌ����	
'	
FDBâþŸþ ý½CãþŸ
a����ÿ:�dvè���(�°/°Í
°/°Ö°ͱ
+±°
9�±°901	
#!!
!#	
#Æ
+
,Ë
×üà
”×
}Æ
+
+ȼ
þåþpÈX
,Èþpþå
X���
���ª°�2�F�²"��+°3°,Í°,°&ͱ22°//°Í°/°	Í
°3/°$Ö°Í°±
+°ͱ4
+±°-9�01&763!7>
;
2+
+
"&=
!"&=
#"&5463!7!"&'€&^6É*þÔ*20ý‡ -«¢*ü?
2222È*��������°L��� �²���+°
Í°/°Í°
2°	Í
°/±
+�011!
53463!2!°ûPÈ;)
,);
ô üà„d);;)d�����
��ÝL���(�²���+°
Í°/°
Í°2°	Í
°/±
+�±
�°9013
!	
3463!2!!

,°þÔûPÈ;)
,);
ôü¼ýD
X);;)È���

.��‚°�	�!�²	��+
°
+/°
ְͱ
+±
±	99�01
3#	
#3

.ÆÆ
*
*ÆÆþÖ
,X
,þÔý¨þÔ����
��
/°‚�	��°/°Í
°
+/±
+�±±�9901
!5	
5!
,X
,þÔý¨X
*ÆÆþÖþ×ÅÅ�������°°����!�I�²��+°Í°2°/° 3°Í°/°Í
°"/°Ö°Í°±
+°	Ͳ	
++³@�	+±#
+±	°9�01=
463!2
#!"&
>
3!2
35#35#;)è);;)ü);¬$ %¬þddÈdddd);;)d);;
Uã'-ý$þÔddd���ÿ›�d°L��)�7�&�
°8/°�Ö°Í°±*
+°2ͱ9
+±*±99�01546?
.5<>;
%%#
#"+
"&'
4632#"&e2"É
È£ý]&/
+S7èX22

ú!Uú
+
úü®Èþì

QþâRü®���J��f°�+�3�5�²/��+°3Í°)/°3°Í°2²)
++³@)%	+
°4/±5
+�±)3±,1990146;
7>
7'&6;
2
32#"&/
.

267"Ju?zS^Sz?vdjŸO}ñ::
§8F80l
^­
GM~ $
Mþ¹­())Ü1==1��
��œœ���777'7'7'7'''éNà-››-àNê´´êNà-››-àNé³
½-àNé³³éNà-›œ,áNé´´éNá,œ�����d°°��"�.��
°//°(Ö°ͱ0
+±(°9�0153#
;
;
276=
4&#!6=
4&+
"?
3!#'ÈÈ
,d=|ú.%î='þ¸='20`‘d–d22
ÂúÖˆÈXýóKd9
X+d,Qv–,Q(ÆÄ%þ‰
wÕÔ¯á}þ‰d��������°L��"�.�p�²��+°%Í°/°�3°(Í°./°Í°
2°,/°
+Í
°//°�Ö°Í°±
+°#Í°#±&
+°Í°±)
+°ͱ0
+±&#²(,999°°9°)°+9�±.°*901
374;
6;
2
#!
+
"&/&7
35'!5##Èdd=|ú.%î='þ¸='20`‘d–d22
ÂúÖˆd
Xý¨}
Kd9þ¨+d,Qv–,Q(ÆÄ%ÔÕ¯á}
wd�����dU��"�A�y�° /°$Í°/°)Í°1/°Í°
2²1
++³@1�	+
°B/°�Ö°Í°±
+°#Í°#±-
+°Ͳ-
++³@-<	+±C
+±-#´?$9�±$°#9°)°9±1²<A9990173746?
%632

!2+

#!"&7!>
;
2654&#!*.'&54?
'Èd
jmU
.UkmTk‚þ«¦dd
%ƒËþ7
	
+“Vþ­ÈXý¨K
%
+	æpyLNþ­'¢Y
S(


·Sì���ÿ›�e°V��8�<�y�°/°$Í°/°Í°8/°Í°:2²8
++³@89	+
°=/°
ְͲ

++³@,	+°±&
+°Í°±9
+°<ͱ>
+±&´)$9�±$°&9°°�9±8²
',99901463'&54?
632#!"&'#"'32!7%*
#!
3elU
.Um

m!¬þ«‚kT
+Þƒ
%kþ©W‘
+
	
þ$éÈCL
y
qæ
'ýò
¡(
Sd)þ­Y
öíS¸	

þXý¨�����a��L��6�:�G�²7��+°8Í
°;/°Ö°72°)Ͳ)
++³@):	+°32°)±/
+°ͱ<
+±)±699±/°9�01
3!2654&'%54&"'&
77><
546
!5!aæ
'

¢(þ­NLy%p[S·

22(
SYþ	XÏþ•¦
VƒjTnkUþÒT

nV’

	

ÈÊ‚þÚdþpÈÈ������
+í��4�8�E�°5/°6Í
°9/°
+Ö°52°+Ͳ+
+
++³@+8	+°!2°+±'
+°ͱ:
+±+
+±99±'°
9�01

?
26=
%>
54&#!"
!

&5<
.
'&
5!p
&y
MN
S)¢
ýó%
+
+šì
÷Yþ¬(22¸’XIn

U3Í.TlnTjƒ
V¦þ‚
SdþÚ‚Ê
È
’qÈÈ������°«���:�²��+°Í°/°Í
°/°�Ö°ͱ
+�±±	99°±�99°±99014>32 $
!	
_ Ýz¢
  þíþ¼þì 
%
,
’þnUzÝ _ þìþ¼þí  


+ÉÂ
&
*Å�����««���8�²��+°Í°/°Í
°/°Ö°
+ͱ
+�±°9°²
+�999°°9014>32 $7
'!7!5_ ÝyzÝ _ þìþ¼þí È
’
,þÔUzÝ __ Ýz¢þí  
¥þÚÂÉÅ������°«���>�²��+°Í
°/°�Ö°Í°±
+°	ͱ
+±�±99°±99°	±99�014>32 $%333
_ Ýz¢
  þíþ¼þì 
'ÈÈÈþÔUzÝ _ þìþ¼þí  
¥þÔ
,
�����°«���M�²��+°/°Í
°/°�Ö°Í°±
+°	ͱ
+±�±99°±99°	±99�±²�999014>32 $%	
##_ Ýz¢
  þíþ¼þì 
'
,
,ÈÈUzÝ _ þìþ¼þí  
¥þp

,þÔ�������°«��ˆ�˜�š�|�²��+°*Í°O/°Œ/
°›/°�Ö°Í°±X
+°
+ͱœ
+±�°9°X@!#$<JUx„…‰”$9°
+@
+
"&0;Zgv™š$9�±O*·06<FHUW$9°Œ@	
+�Xl…Ž”$9014>32 $2
7
7>7.
'.
'"'&65.
'6.
'&767

46'&67>7&72267.'6'
?
6.
''&

%>
72>
7.73_ ÝzyÝ _ þíþ¼þì ù"
T>9.*-
hu"#.
F	= .2
)((%
+	
+)#?	6/R+>=>
1

+"	,$¢
UzÝ __ Ýz¢þí  

Y!w	F/JG	
+s$>	

#/
&


+%	I+
+*		' '
$#
+
'"qq$
+U
_����
���¯…���<
7
&6767'
"/
X!N`¤Žþý‘û
¤{‚ý¬+o+WeÉ6\eŠè~¯\F/ý¬n�����`°¬���/�3�7�;�P�°/°4Í°7/°Í°/°0Í°3/°Í°,/°8Í°;/°%Í
°</°5Ö±1922°	ͱ(22²5	
++³@5�	+± 22±=
+�01=
463!2
#!"&5463!2
#!"&5463!2
#!"&
!5!!5!35#;)è);;)ü);;)è);;)ü);;)è);;)ü);X
ôþÈ
,þÔdÈÈÄd);;)d);;
¹d);;)d);;
¹d);;)d);;þ™dþd¼d���d��L°��	�%�²��+°�/°
Í
°
+/°Ö°ͱ
+�±�°9015!!
dèüJ„þ¢ÈLdddþþÔÈ
ô�������d°°�	�!�%�`�°/°
Í°
+/°3°ͱ"22°%/°Í
°&/°Ö°"Í° 2²"
++³@	+°�2°"±#
+°2°Ͳ#
++³@	+°2±'
+�±
+°901=
!#!"&
463!546;
2
!2!5#35#°;)ü);;)
,;)È);
,);þÈÈÈÈÈÈ);;
U
);d);;)d;)þpdd
ôd��������°°��
����²���+°3
°/±
+�0117
77'7!
77!77'!'ÈŽÈþpÈŽÈþpَȁþpÈȁ
È
ÈŽÈ ÈŽÈü™ŽÈþpæȁþpÈ������¨¨����)�B�L�Ò�²
+��+°Í°/°J3°Í°E2°(/°93°#Í°42²(#
++³@(A	+°/°Í
°M/°
Ö°Í°±
+°Í°±!+°&Í°&±*
+°>Í°>±C
+°Hͳ7HC+°1Í°1/°7Í°H±
+°ͱN
+±&³
+$9±>*±-<99±71µ	/;$9�±³�$9°³*-<>$9°(±
99°#±/;9901
$  $ 654& 462#"64632#"46?&54632#"'"&%462#"& 

D
  þîþ¼þîó
Vóóþªóm.  M   R)z
	   73H3
 .  
²
D
  þîþ¼þî  
´¬òò¬«óó‡.  ä,! . º 1~
! . 
+‘$33R .  ���
ÿØ�;º°�O�:�°/°'Í° /°Í°6/°JÍ
°P/±Q
+�±'°?9° ´1$9°±239901
327>767
>
'&'&#"

67632
#"&'&>767
>32



>
'.
'&#"
0#vF?8!@)'(
Š#Z	.A#þ{E
y&$ýÝ4I7Z	0$&
\4=k6_v[üýEC8fOESkZ(Gþ�
Ö¾N9@1*+,
Š#b/W!#þtC
u$'$ýÝ4B?#>@$$
\475›be[ùÿ�<
ÿC´]W†$!7Gþ������P�6ÃX��5�=�°3/°-3°Í°2
°6/°�Ö°Í°±*
+°
+ͱ7
+±*³$9�±3°9014632632
'.'.7

6?
>54&#"
'&#"PÅ„bgÂ#WCGÅ`+rFBGCW#ª=>@]aRq@C>`9J:vr3H<cƒÅÅƒ.ZlGF¿ƒ:FAFGlZ.VA>Zo\o>FXGaS«®Pc�����9ÿòw¾��3��
327
64/
&'
'7'&'
7'
7>
54/
&#"
9BD[]B
BBiÔþ{÷_.7BÔBiÔ
…÷_/#7BB]_@þåB
a_@ŽBB
BºB	iÔþ{ø_-87B
]B
+iÔ
…÷`13#j+]BBBþå@�����È��è°����E�²��+°Í°/°Í°/°Í
°/°�Ö°Í°±
+°Í°°Í°/±
+±²999�0174>2#!"&7!!264&"È<fœªšd:;)ý¨);dXý¨Ä=V==Vd¹2..2üG);;ñ¼üÙV==V=���
����°°���²���+
°/±
+�011
7'!
'&4762
"/

'
/ÏÒ
,
#*
*$þéÔÐ
|ÐÔ
$*þæ*#þõþÔÒÏ�
'�	á�1�=�C�—�°-/°*3°Í°>2²-
++³@-,	+°;/°3°Ͳ;
++³@	+
°D/°Ö°�2°2Í°
Í°2±,
+²:222°+Ͳ>222°+±@
+°'Í° Ö°ͱE
+±2
°9°,°	9�±-°)9°;¶�':@C$9°°901
3
.
#.54>
753#.
'#5&'.

654&'
'‹WJ.BN/!X‚Od&ER<+Ÿ6J@"<P7(²›d˜U(¨*=IêªXR
±Mc
O
/9X7\‡CNO,?iBHK
þÍ,<e>‹ªMNW(k,

;ý+…@G���
�d�f”­�C��°1/°*Í°�/°3°
Í°2°/°Ͳ
++³@	+
°D/°Ö°92°Í°$2²
++³@	+²
++³@�	+°±
+°ͱE
+±³8BC$9°µ *13$9°°,9�±*1±-999°�±,<990153&'.
>
7632#4.
#"
3#>
36327#"&

'>7>
'd¦
+	/-a¦Ê™DP$%T)!ñÅ):#b!Œ!L<2)O'*Ò2'V7
+	0$Xd17;V^(X²w4K,9S*3d2‚;6
"“B‘

+7G����®°��
��²��+
°/°Ö°ͱ
+±°9�01	
##	##
*
*ÆÈ
’
*
*ÆÈ
,þÔ
,„ü|X
,þÔü|„�����è°�����"�¦�²��+°3°
+Ͳ��+°Í°/°ͱ�22°
/°Í°/°Ͳ
++³@	+°2°"/°Í°2
°#/°
Ö°Í°±
+±
22°
+ͱ22°
+±
+± 22°ͱ22³+°Í°/°ͱ$
+±
°9°°9�±°9°
°901333
!533
5!##535!#5#735#ÆÈÆþÖ
dÈþÔ
,cdcÈ
,dd
dd
,„ü|þÔÈdd
dÈddd
,
ôþddÈÈ����è°�����"� �²��+±
+33°
/°Í°"/°Í°/°Í°Í°/°Í°/°Í°2
°#/°
Ö°Í°±
+±22°ͱ22°±
+± 22°
+ͱ22³
++°Í°/°ͱ$
+±
°9°°9�±"³
�$9±°9°°901333
!!#5#533
5!##53535#ÆÈÆþÖ

,ddddÈþÔ
,cdccdd
,„ü|þÔ
ôþdd¼Èdd
dÈdddü|È�����L°�����k�²��+°/°Í°/°Í°
/°Ͳ

++³@
	+
°/°Ö°ͳ+°Í°/°
3°Í°±+°2°
+ͱ
+�±´�
$9±
±9901	
##!#553#35#
*
*ÆÈX
,dÈÈd
dd
,þÔ
,„ü|È
þdèdþ
ü|È������L°�����k�²��+°/°Í°/°Ͳ
++³@	+°/°Í
°/°Ö°
+ͳ
++°
Í°
/°3°Í°
+±+°2°ͱ
+�±´�
$9±±9901	
##%53#!#5'35#
*
*ÆÈXÈdd
,dcdd
,þÔ
,„ü|ddþ


þddÈ�������°°��
+����R�°/°Í°/°Í°/°Í°/°Í
°/°Ö²222°Í°Ͳ
++³@
+	+³@	+±
+�±³�$901	
##5!
5!
5!
53
*
*ÆÈ
ô
ôþ
þp
,þÔÈ
,þÔ
,„ü|ÈÈÈ
,ÈÈ
,ÈÈ
,ÈÈ������°°��
+����R�°/°Í°/°Í°/°Í°/°Í
°/°Ö²222°Í°
+Ͳ
+
++³@
+	+³@
+	+±
+�±³�$901	
##535!
5!
5!
*
*ÆÈ
ôÈÈ
,þÔ
þp
ô
,þÔ
,„ü|ÈÈÈ
,ÈÈ
,ÈÈ
,ÈÈ��������LL���*�²
��+°Í°/°Í
° /°�Ö°Í°±
+°	ͱ!
+�01
463!2#!"&73!2654&#!"ë¥
,¢îí£þÔ¥ëÈ;)
ô);;)þ);

,¥ëí£þÔ¥ëëA);;)
ô);;)������LL���"�>�²
��+°Í°/°Í
°#/°�Ö°Í°±
+°	ͱ$
+±± !99�±± "9901
463!2#!"&73!2654&#!"-
î¢
,¥ëë¥þÔ£íÈ;)
ô);;)þ);È
Mþ³

,£íë¥þÔ¥ëëA);;)
ô);;)þúú��������LL���"�>�²
��+°Í°/°Í
°#/°�Ö°Í°±
+°	ͱ$
+±± "99�±± !9901
463!2#!"&73!2654&#!"
ë¥
,£íë¥þÔ¥ëÈ;)
ô);;)þ);dúú

,£íî¢þÔ¥ëëA);;)
ô);;)dþ³
M�����LL���"�>�²
��+°Í°/°Í
°#/°�Ö°Í°±
+°	ͱ$
+±± !99�±± "9901
463!2#!"&73!2654&#!"!ë¥
,¥ëí£þÔ¥ëÈ;)
ô);;)þ);d
ôú

,¥ëë¥þÔ¢îí?);;)
ô);;)þp
M�����L���<�²��+°Í°�/°
Í°/°Í
°/°Ö°ͱ
+�±°9±
�°9°°901
!5	
55!2654&#!5!2#
,
þpÈ
ô);;)þ
¥ëë¥

,Èþ¢þ¢ÈþpÈ;)
ô);Èë¥þÔ¥ë���
�Ù�Öž�!�(�°/°Í
°"/°Ö°ͱ#
+±°9�±°9013!
3276�36'&#676/
#"
�Ù
.›			
	þÓ
š		
+¼þóKþJ
i

¯	ÓþÑV��������L���?�²��+°Í°°Í°/°Í°/°Í°Í
° /°�Ö°ͱ!
+�±±99°°9013!275!"&5463!5.
/
"
!5	
5ë¥
,/5þ);;)
ôÈ]]¥ëX
,
þp
¥ë¹;)
ô);¹ë¥þÔ
,Èþ¢þ¢È�����°°��$�T�²��+°Í°/°Í
°%/°�Ö°Í°±
+°ͱ&
+±µ $$9°°#9�±µ	"#$$9°°9013!26=
'#!"&546;
7'#"%
'!'
ë¥
,£íNz;)þ);;)œvJd¥ë
ð
a•
ô•þª
¥ëë¥bI{”);;)
ô);zNë¥	
V•þ•þŸ���¬¬����Z�°
+/°Í°/°Í°/°Í
°/°
Ö°
Í°
±
+°Í°±
+°ͱ
+±·	
+$9�±·

�$901$  $ 6& 462" 

D
  þîþ¼þîó
Vóóþªr rr 
¶
D
  þîþ¼þî  _þªóó
Vóþ rr r�������L°�	���.�²	��+°Í°/°Í°2
°/°Ö°Ͳ
++³@�	+±
+�011463!2	!!
35#ü
½
ÂþÙþÔ
ôdd

+þí þ
ô
þpýv2��������L°�	���+�²	��+°Í°/°Í
°/°Ö°Ͳ
++³@�	+±
+�011463!2
!!!	
35#ü
,
,
'þC
^dd

+þí¼þÔ
,
ôûæ2��������L�	���.�²	��+°Í°/°Í
°/°Ö°2°Ͳ
++³@�	+±
+�011463!2	'
'
35#ü
1TšþF–…dd

+þíÁþÏT›þF—ý:2�����L°�	�
���+�²	��+°Í°/°Í
°/°Ö°Ͳ
++³@�	+±
+�011463!2
7'%'
35#üaÔap¹ú•Ô•
Îdd

+þíÜbÕaüà
»ï•Ô•þ
2�����L°�	�
���.�²	��+°Í°/°Í
°/°Ö°2°Ͳ
++³@�	+±
+�011463!2
7'7
35#ü|ÔbÕï•Ô•ù
cdd

+þídÔaÔ
ëú•Ô”í¹ûé2�����ÿÿ°¯����²��+
°	/°Ö°ͱ
+
+�01
	
	
™þ%þÊO ý`
ŸûÉ
þw
 Íªý8�������dL°���M�°/°Ͳ
++³@	+°2²
++³@	+°2
°/°�Ö°Í°Í°±
+°ͱ
+±²	999�01546;
!3+
!#"&
35#ú
ôdÈ–ýD–Xdd–èþÔ
,Èü®
þpgÈ����>°����@�°/°Ͳ
++³@	+²
++³@	+°2
°/°�Ö°Í°ͱ
+�±²99901546;
!3
'!#"&%7

35#ú
ôdÈþìx~þ†–E{x
a{þ%ádd–èþÔ
,ÈÚþíxþp±{x
`{þ$ªÈ�������°���#��
°$/°�Ö°Í°ͱ%
+�01546;
!3'
!#"&
35#7'77'ú
ôdÈgªþÖþ·–Xdddªªªªªªªª–èþÔ
,ÈþógªþÖþpgÈûÕªªªª€©ªªª�������°°����l�°/°Ͳ
++³@	+°°Í°/°ͱ22
°/°�Ö°Ͳ�
++³@	+°�°Í°±
+°Í°2±
+±°9�±±99±°
+901546;
!3!!#"&%	
##53ú
ôdÈþpþ–X
,
,ÈÈÈd–èþÔ
,ÈþÔÈþp«þÔ
,
,þÔ¼ÈÈ��������°°����[�°/°Ͳ
++³@	+°/°ͱ22
°/°�Ö°Í°Í°±
+°ͱ
+±°9°°
9�±²999°°
+901546;
!3'
!#"&%333	
53ú
ôdÈÈþÖþn–XÈÈÈþÔþÔd–èþÔ
,ÈþnÈþÖþp«þÔ
,
,
ÈÈ�������È°L�	����53!265!5!54&#!"5!LûP°û´d
ú&d–ýÈÈ������f°®��
+������°/±33°ͱ22°/±33°ͱ22
°/°Ö°
+Í°
+±
+°Í°±
+°ͱ
+±
+³
$9±³$9°³$9�±°�9°±
99°°901
!!5335335!5	
553;
5#
,
þpÈdddd

,þÔddddd

*ÆÈƺÈÈÈÈÈÆþÖþÖÆþÈÈÈ����d��°°��/�:�²��+
°0/°�Ö°Í°±+°ͳ	+°Í°/°	Í°±
++°ͱ1
+�0173737+
"&5%
;
2654&
d22d22d22dÈX
+È$þì%¼
ddþÔ
,ddþÔ
,ddþpËþA
¿d5!þsRtE����
�d��°L�3�8�²���+°3°3Ͳ222°(/²%333°'Í°2
°4/±5
+�±(3± 99013!5"&5!#!5".546?
5!2!4635!2
d
K
ôK
"2þpKþKþp"28&
Šþv&88
	x
88&þv
Š&88
	üˆ
�����LL���� �*�.�2�²��+°Í°/°Ͳ
++³@	+
°//±0
+�±³$9013!2654&#!"!73%!!5!
5!
!%35!'!
5%;)
,);;)þÔ);d
Èi
'þWdþ‰d
,þÔ
,þÔ
È
'iþWdþ‰
ô

,);;)
ô);;)ýDÈbþÖd
,ÈÈ
,ÈÈ
ÈbbÈdýF£…£�
��ŸŸ� ��3?
6&/
&
.
'7>
/
.


>’fgÑ—{£À4vŽüev‹-¢ä+‰Ôfg’=!
¢.ˆveüŽv1¢��������°L��@�/�²��+°Í°(/°8Í
°A/±B
+�±± /99°(³&)2@$901=
467
54>2



#!"&?
>
=
6 
6=
.#"

m&RpR&


mû´Ê
>Êd|Ú~\¦ud?,		2Ô3
/2
 
+
+2þÑ3Ô«!"’’"!ÈA1)!((!
+��d��°L����²���+°
Í
°/±
+�0135!%!'57##5##5##5#dLûÿ¶}dddÈdÈdddddÈ–úd
ÈÈÈÈÈÈþpdú�����d��°L�	���$�²
+��+°3
°/°
+Ö°Í°±
+°ͱ
+�013!4&+
"
46;
2346;
2d
,;)d);
;)d);d;)d);
);;)þpè);;)ü¼);;)ýD����ÿœ��°L����'�+�H�²
��+°Í°/°Í
°,/°�Ö°Í°±
+°	ͱ-
+±µ #(*$9�±µ &()$901463!2#!"&7!!!#535!3#353#5#3d°|¼|°°|ýD|°È„ü|d
,ÈÈþÔÈÈ
ÈddÈdd
,
ô|°°|þ|°°¼ý¨
,ddþÔddd
,dþp
,þÔ����ÿœ��°L����'�+�H�²
��+°Í°/°Í
°,/°�Ö°Í°±
+°	ͱ-
+±µ #(*$9�±µ &()$901463!2#!"&7!!3533##5#
353#5#3d°|¼|°°|ýD|°È„ü|ddddddd
ÈddÈdd
,
ô|°°|þ|°°¼ý¨ÈÈ
ôÈÈþd
,dþp
,þÔ��ÿœ��°L����#�D�²
��+°Í°/°Í
°$/°�Ö°Í°±
+°	ͱ%
+±³$9�±³"$901463!2#!"&7!!!5#35!
!5#35!d°|¼|°°|ýD|°È„ü|d
,ÈÈþÔ

,ÈÈþÔ
,
ô|°°|þ|°°¼ý¨d
,dþd
,d����ÿœ��°L�����D�²
��+°Í°/°Í
°/°�Ö°Í°±
+°	ͱ
+±³$9�±³$901463!2#!"&7!!-
d°|¼|°°|ýD|°È„ü|d
,d
,þÔ
,
ô|°°|þ|°°¼þ¢–
,þÔ––����ÿœ��°L�����'�Z�²
��+°Í°/°Í°#2°/°%3°Í°/°Í
°(/°�Ö°Í°±
+°Í°±
+°!Í°!±$
+°Í°±
+°	ͱ)
+�01463!2#!"&7!!!%3264&+
;
#"d°|¼|°°|ýD|°È„ü|d¼ý¨‚)69&‚
6)‚‚&
,
ô|°°|þ|°°¼ý¨
ôþdT‚VV‚T
,��ÿœ��°L����#�)�H�²
��+°Í°/°Í
°*/°�Ö°Í°±
+°	ͱ+
+±µ !$'$9�±µ "&($901463!2#!"&7!!!#535!3#35#33#d°|¼|°°|ýD|°È„ü|d
,ÈÈþÔÈÈ
‘ddcddÈ
,
ô|°°|þ|°°¼ý¨
,ddþÔddd
,þp
ô�ÿœ��°L�����!�'�L�²
��+°Í°/°Í
°(/°�Ö°Í°±
+°	ͱ)
+±·"%$9�±· $&$901463!2#!"&7!!!#5#5335#33#d°|¼|°°|ýD|°È„ü|d
,ÈdedÈddcddÈ
,
ô|°°|þ|°°¼ý¨
dþpÈÈdd
,þp
ô����ÿœ��°L����!�%�+�›�²
��+°Í°/±")33°Í°#2°/°Í°/°&3°Í°'2°/°Í
°,/°�Ö°Í°±
+°2°!Í°!±
+°ͳ+°Í°/°Í°±"
+°%Í°%±*
+°)Í°)°&Í°&/°)±
+°	ͱ-
+�±°9°°901463!2#!"&7!!5!##53553!5353#d°|¼|°°|ýD|°È„ü|d
,cdcÇd
,d
Èd
,
ô|°°|þ|°°¼ÈdþÔddÈþpdddd
dþ
����¬¬����y�°
+/°Í°/°Í°/°Í°/°Í
°/°
Ö°
Í°
±
+°Í°±
+°ͱ
+±µ
+$9°µ	$9�±´
�$9°°9°³
$901$  $ 6& 57!!!! 

D
  þîþ¼þîó
Vóóþªd
,þÔ
,þÔ
¶
D
  þîþ¼þî  _þªóó
VóýþÈddÈd�����¨¬��� �$� �°
+/°Í°!/°3°"Í°/°Í°/°Í
°%/°
Ö°
Í°
±
+° Í°2² 
++³@ 	+° ±!
+°2°$Í°2°$±
+°ͱ&
+± ³
+$9°!°9°$³	$9�±"!´
�$9°²999°³
$901
$  $ 6& !#5#3#353 

D
  þîþ¼þîó
Vóóþª
,ddÈÈÈÈd
¶
D
  þîþ¼þî  _þªóó
Vóýš
dddddddd��ÿòÿœÂA�� �r�°/°Í°°
 Ö°Í°2
°!/°�Ö°Í°±
+°Í°±
+°ͱ"
+±�²999±± 99±±99�±³�
+$9°
³$901;
!3264&#".
#"

333
qOÞ
€xªªx.,,µn˜ØBU
:ÈÈÈþÔ
îPr
,þÔ­ò¬aw×™kþ•
,þÔþÔ��ÿòÿœÂA����
° /°Ö°ͱ!
+±²999�01;
	
>
54&#".
#"
	##qO
ž
“^yªx.,,µn˜ØBU
:
,
,ÈÈ
îPr
žþmdx­aw×™kþ•
,þÔþÔ
,��
�d��Lm���7!!'5!
3
3	
3
3d
K
^K
þòªþòªþÔþÔªþòªÈ›--›
,
,
Mþ³þÔ����
�y��7›�)��327!'32654'>
54&'.
#"&#"y9/iJ8,K
^K.6Ji	2;{Y“^t£	Ji¼5XJiþÎ--
2iJ f=ZƒYq£ti��
���
�A¥ÿòŒ_<õ�°����Ï	.����Ï	.ÿ:ÿœÝ�����������
��ÿ„��ÿ:þÓÝ�
���������������Ÿ
¸�(°��°��°��°�d°��°��Œ����Œ����
²��
F���Ù���Ù���£��
���H��
��
F��°�d°�È
ô��°ÿò°��°ÿó°��°�°�°�d°ÿ¸°ÿ¸°��°��°��°��°��°�°�j°�°�°�°�d°�°�d°�
°�d°�°ÿœ°��°�
°�°��°�°�°�°�d°��°�d°��°��°��°��°��°��°��°�
°�d°�È°��°��°�5°�d°�È°ÿµ°�!°��°��°��°��°��°ÿ›°�
°��°��°�”°�
°�u°��°��°��°��°�È°��°�ˆ°�È°�È°�È°��°��°
,°�d°�¹°
°�°�°�°�°�°�°��°�°�°�°��°��°�Ì°�h°��°��°�"°�°��°��°�o°ÿðÿðÿŸ°�d°��°��°��°�d°ÿâ°�F°ÿ:°�°��°�
°
.°��°��°ÿ›°�J°�°��°��°�°ÿ›°�a°�°�°��°�°�°�°��Ä��°�d������ÿØ�P�9�È��
'�d������������������Ù�������������������������������d�d������d�dÿœÿœÿœÿœÿœÿœÿœÿœ���ÿòÿò�d�y���*�*�*�*�f�¤�¤�¤�¤�¤�¤�¤�¤�¤�¤�¤�¤�¤�¤�¤
0
H
P
„
ª
Î
þ6˜Ìî,Lôrd"DâL°è”	0	`	”
+
+
+D
+ˆ
+îVæ>°

v
ª:`ŠÜØLˆÖ&”`ÚŽbº&’bÚL†è8‚¾,˜üJ|¶Öä0N†¶àôZ¤î2ŠìF Àâ  * F n  ò!j!Ä"B"È#~#®$$’$æ%%ˆ%œ%²%î&Z&ˆ&¾&è''j'Î(8(d(¸)6)Ô*n*ì+h+²+ú,D,˜-¾-æ.f.’.ú/:00¶1&1~1Ò22¸3`344¢55f5¾66\6´7
+7`7¬7ü8P8´99X9–9Ô::^:†:Ö;,;t;Þ<@<h<Ü=D=¨>>H>¼>î?0?š@@`@´A"AˆAðB‚BøCˆCöD<D`Dž�
���Û�›�������
����
�

��������º�
����������
	���j���
	�
�(�|��
	���¤��
	��L�²��
	��8�þ��
	��x
6��
	��6
®��
	��
�
	�	�
ú��
	��$��
	��$4��
	��$X��
	��|��
	�É�0’www.glyphicons.com�C�o�p�y�r�i�g�h�t� �©� �2�0�1�3� �b�y� �J�a�n� �K�o�v�a�r�i�k�.� �A�l�l� �r�i�g�h�t�s� �r�e�s�e�r�v�e�d�.�G�L�Y�P�H�I�C�O�N�S� �H�a�l�f�l�i�n�g�s�R�e�g�u�l�a�r�1�.�0�0�1�;�U�K�W�N�;�G�L�Y�P�H�I�C�O�N�S�H�a�l�f�l�i�n�g�s�-�R�e�g�u�l�a�r�G�L�Y�P�H�I�C�O�N�S� �H�a�l�f�l�i�n�g�s� �R�e�g�u�l�a�r�V�e�r�s�i�o�n� �1�.�0�0�1�;�P�S� �0�0�1�.�0�0�1�;�h�o�t�c�o�n�v� �1�.�0�.�7�0�;�m�a�k�e�o�t�f�.�l�i�b�2�.�5�.�5�8�3�2�9�G�L�Y�P�H�I�C�O�N�S�H�a�l�f�l�i�n�g�s�-�R�e�g�u�l�a�r�J�a�n� �K�o�v�a�r�i�k�J�a�n� �K�o�v�a�r�i�k�w�w�w�.�g�l�y�p�h�i�c�o�n�s�.�c�o�m�w�w�w�.�g�l�y�p�h�i�c�o�n�s�.�c�o�m�w�w�w�.�g�l�y�p�h�i�c�o�n�s�.�c�o�m�W�e�b�f�o�n�t� �1�.�0�M�o�n� �J�a�n� �2�7� �0�8�:�0�1�:�3�4� �2�0�1�4�������ÿµ�2���������������������Û��

��
�





	

+








�ï













 
!
"
#
$
%
&
'
(
)
*
+
,
-
.
/
0
1
2
3
4
5
6
7
8
9
:
;
<
=
>
?
@
A
B
C
D
E
F
G
H
I
J
K
L
M
N
O
P
Q
R
S
T
U
V
W
X
Y
Z
[
\
]
^
_
`
a
b
c
d
e
f
g
h
i
j
k
l
m
n
o
p
q
r
s
t
u
v
w
x
y
z
{
|
}
~

€

‚
ƒ
„
…
†
‡
ˆ
‰
Š
‹
Œ

Ž


‘
’
“
”
•
–
—
˜
™
š
›
œ

ž
Ÿ
 
¡
¢
£
¤
¥
¦
§
¨
©
ª
«
¬
­
®
¯
°
±
²
³
´
µ
¶
·
¸
¹
º
»
¼
½
¾
¿
À
Á
Â
Ã
Ä
Å
Æ
Ç
È
É
Ê
Ë
Ì
Í
Î
Ï
Ð
Ñ
Ò
Ó
Ô
Õ
Ö
×glyph1uni000Duni00A0uni2000uni2001uni2002uni2003uni2004uni2005uni2006uni2007uni2008uni2009uni200Auni202Funi205FEurouni25FCuni2601uni2709uni270FuniE001uniE002uniE003uniE005uniE006uniE007uniE008uniE009uniE010uniE011uniE012uniE013uniE014uniE015uniE016uniE017uniE018uniE019uniE020uniE021uniE022uniE023uniE024uniE025uniE026uniE027uniE028uniE029uniE030uniE031uniE032uniE033uniE034uniE035uniE036uniE037uniE038uniE039uniE040uniE041uniE042uniE043uniE044uniE045uniE046uniE047uniE048uniE049uniE050uniE051uniE052uniE053uniE054uniE055uniE056uniE057uniE058uniE059uniE060uniE062uniE063uniE064uniE065uniE066uniE067uniE068uniE069uniE070uniE071uniE072uniE073uniE074uniE075uniE076uniE077uniE078uniE079uniE080uniE081uniE082uniE083uniE084uniE085uniE086uniE087uniE088uniE089uniE090uniE091uniE092uniE093uniE094uniE095uniE096uniE097uniE101uniE102uniE103uniE104uniE105uniE106uniE107uniE108uniE109uniE110uniE111uniE112uniE113uniE114uniE115uniE116uniE117uniE118uniE119uniE120uniE121uniE122uniE123uniE124uniE125uniE126uniE127uniE128uniE129uniE130uniE131uniE132uniE133uniE134uniE135uniE136uniE137uniE138uniE139uniE140uniE141uniE142uniE143uniE144uniE145uniE146uniE148uniE149uniE150uniE151uniE152uniE153uniE154uniE155uniE156uniE157uniE158uniE159uniE160uniE161uniE162uniE163uniE164uniE165uniE166uniE167uniE168uniE169uniE170uniE171uniE172uniE173uniE174uniE175uniE176uniE177uniE178uniE179uniE180uniE181uniE182uniE183uniE184uniE185uniE186uniE187uniE188uniE189uniE190uniE191uniE192uniE193uniE194uniE195uniE197uniE198uniE199uniE200¸
ÿ…°
�K°PX±

ŽY±F+X!°YK°RX!°€Y°+\XY°+���
RæX®��
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..8c54182aa5d4d1ab3c9171976b615c1dcb1dc187
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/fonts/glyphicons-halflings-regular.woff
@@ -0,0 +1,98 @@
+wOFF�
����[�����¡@�
����������������������FFTM��
€������jUÂðGDEF��
œ������ 
�OS/2��
¼���C���`g§K„cmap�����
��rJð	šcvt ���������(‡fpgm��$��
±��eS´/§gasp��Ø���������glyf��à��N��‰<3!head��Rì���4���6bXþhhea��S ������$
+2hmtx��S<��
��ôÁÁŽloca��TP��
«��
¸4VNmaxp��Uü��� ��� 
 name��V��
‚��|Ô¯™ípost��W ��@��„¹F¦iprep��Zà���.���.°ò+webf��[������X¯Ræ���
����Ì=¢Ï����Ïò����Ï	.xÚc`d``àb	`b`Â[@Ìæ1��
¨

��xÚc`fidœÀÀÊÀÂÌÃt!
+B3.a0bÚ
䥰ƒPïp?ÞGÌþ�ÕI0Ô�…‘”(00�a	Ö�xÚÍ‘?KÃ`ÆïmÚHŠÒPD¬ˆwZªƒ]»ÅEí œ:µ8Š“ݺvë"ÅÍàè—isœœÔE„øš€C]|àþ½Üýî%"‡2Û$c=™¾­LZçMhcH
È·Ù
+	íÓ­å@Úr·]ÞùØ5U¯ZRG=­hMÚÔ–v´§Cë*¨¡#4ÑBCŒq›GJ’¯])qÏéÑhA}­k ¡%žë@G:A
N¢ƒ
F˜`šMò–Ì“(éêR<ïã‹'ÚˆÖf¥YQ*².eYWˆßù•_ø™Ÿ|Å—Üç.w¸Í->ãS>æC¶¢ì+ãÒ7Öä¬Ë-6d_‘)_ -wñaõ7SŸƒh–�����(øxÚ]Q»N[AÝ
ÄØ 9Ú³™Æ{¡	ÄՍbd;…åi7r‘‹q
@D
Ú¯ ¡¤H›!H|B>!3kˆ¢4;;³sΙ3KÊ‘ªwékÏSç$ÂÝÍ6ýNHµ³�÷¤ë덌´ƒZlfôÊuûþ›Ñ”;j�å=o)M;Z´§þÑü
+†ûüó;´4ÓôÔ:	é!æ›qKƒïͺËú‚Õáb00¤˜¦â.?¦Rþ·4çjË°µ‘Ѽƒ3ùÉ4@SkmšþÔ!ÕóqKË¦±6˜˜²þ$Á…ÉtUSµÌøÚÁ]²³è`ƒ*́ØÃVy&Ò·$Ê,
öb«Ä“
+9åÜÉþ¤@ùHƼIJ;ㆵÆ‘×À 6O³ÿ<›MmoÂøYÁw¿K:øȆÚb;b)€	DBFUù†Ͻ,äRûÏ@”€åñ´îØD<—µu1Vz~ÛÜòËŠ»V¹Î‹Bwoªj¨Ò)Íû^ξÇžÃAcÁ›ÏûþJú<,®4hCz7zÿ¢µêˆ«¼>²'Ó¿±Z����
�
ÿÿ�xÚ½½	`å•�<ßÌH£[I£‘dK²$Kò)Å’eÅñ‘àÜwÈ͝€€B8® …r´	†B(
-),rŽ”PÚnØm銶êÒB·,½XZŽm!»Ý&ñð¿÷ÍH–íÊîÿÿq$Í%Í{ï{ßûÞ=Ë´1ù×ÂpŒÀ¤K„É–ž}/[2þm°Ì±°É”8<lÀÃeÁÈ,<ž£b"'ÆÛÈ,õí?ÿ™k9öfû†0E¦È/á—02ÓÊ(LF±çRU¬Y¢ø3ŠçbÈ*îª"dK
ÒÉLëñ䣩‚,æÄ‚,D¥¨,¤Ä¸(¤
+EÂ=¿ãù
+¼§ŽÕ6O: ŽÑË�
þÑûZ™ELÙÂ0xsÞܐ-ÆÒ¹oá̝D±eË!…Í*æªÂgËfž2æβŌ›ÆÜY²Sè$*ÖþÈ(é"£êfõàø–º™ŒRœ
üøg˜³…Q²¥­ZnËâOµ¥ÍŽ(…#’U¥9§«J0«HÅZ-KV¼Pr!dÓ3JB«–B‘,|ºJݤSqe•tUqfKý¤³+ˆnEèWºÅ²µ%ÛßߏT,äzñB®¯Ð—ËÊ>9Þ›fã1+D…¨Q‚·0ŸË³ùœQ0Æc©4I‹—^/Þ–X|Õþ6ŸË-Yö÷Ï™é!×ÕƒF²ÞÍÓúgç¤Ð¢%¹g"7=^½ºuÄF3ùâã§îxáü맼]§Ó}ÅEWŽt:ƒÓÖ基𪯦Ÿ¼†Á1©Q~	{�øËMy«…Ï”ÚÈQ+Ü-Ƕ"9FÃÚ¿ØÿèÒÅ¿ÈŸÄHL„Q¸Œâ¨Â˜Å—)Éð%3'ºKV±¿Zçõå¢Ù¾Þd<&¤I<f”¼²ƒ8.[ξÍO\“îêzî’/ý’YCÞ_qùÓ<åØxõ/Ø›màUäà恅±3LžÈ’Íõ
+`qtéR²ëÙõ0ú]E<¨n®Ð½Ãc²§©6Ò5¶~‡ûèÏ>ä_à_`XÆȸFH�{xúz3$ìdé¿Ÿzˆ=ïÐÚCçØí8[öÍÿ~²vàt{Êñ€Ý^£À¤0f&Ç”ÈÏBUá`Y2Šé²Ì™s80®‰ÃM“×J‰+F‰Ó)y;ö&R{}ìõb‘Mâï;Ì—g™†I†Ia˜äÅ„˜DÖ÷z“‚ÁA$8fä[o_~ ?kÑòun÷íËç­rXÆ\ìþ’ö ´¡ƒ=s÷Ø_]rðò¾B{@>¹À]f±rßå<–±å¢?À�5äÞåÿ…€ñ0MÌ)Lف¹3Š\Uš4ÆhÎ(ä"UÉ…²A1À�vH¢{Ǻܭr¿bó™’Û
SÀܯȢâêWšÜû#àü´·’¼ñyÄK`wÖåkés%[dÒ¬Ö¼Œt	ÂÅ&¯I=xõÎÊg_$îï~W}Ÿ¼‡çÔßWv^­„“éZÆ^¤þùÅï™õü³ü&�I”`Fa!O:ª¥&¥{‡Ù0‘ፕ¼NHóÅé§^}õµ]Ó®¿æªõ}³¯½eïððã·\;›sÍÚ²ª›_8gî¾{Õ–Yý×ÞtcyÍšò7]´úè›Ì|þ>{c–Šzrž(ñ˜‰‡+, ÿ~{ù¥ºýnõ&uû=÷²\ERgúùgø¤|Øø>ÆÏ(v¿TñÀDr¦ä§ Oøu,äT!ž¦Þgö¿,üÎ÷}÷¥ËŽsGöʝ¿ýÂŽ?|áç?ŸÀ»˜Çy’%‡Ho_Ö"^c\"MÌTþG™™ £wR¼/WÙª([+¹ûŠêGw18ÿè÷—ÐuÉÊ8áwdàšgRL'“¡0e9ˆ¯–ü- (…ŒË)¦ªÒšU¬%™SlU¥-«83JGNqU•®¬âÉ(éœâ­*Ó²ˆ8›Cr¥—Ž#_Ýg²¹¼­rVá](¢ö™í¢„»þªÒïW†²JKu_k[×4<Õâ*EáÊD{wîrÕR“Í
+‚)ØÔ߯8ÅRsT]/óñü¤JA˜¥Qrœs¼rt±þÄÍØ^ú:0~_Òx	ÊRNǶ֏0º|ÓÖF'Ð0ÃÌdF˜²©×•´‘d¡Œ2HIÓ¼1‹ÒÃE×G?¼»J-€8­½ªLÏ–N¢|ò¡$®OaL£±d€LÜ'Ÿp>\ …B’ºßÇ·Ùõ':“m8Ì^Ü°3ö‰Î0 ='㾜9‹¹”¹‘¹ÖjJ…ÒàE9¤C©·˜EJ”–lÍ!-Js®„ýîLéô/À~kµ´ú–,Pg©Sr!Ó™ùÚ²”BÓ@RÍZ
ÛýÕÒ‚õøé*m€c›o‚íª¥knÏfKwSÊá\ Úlè$±¤˜ÿø}’ÿÿöúTA‚àŒþßÎgë{äÑãmû¯ÿë°ÎÖäEã¯Õy|òx/þKrJsU™ƒ£ªœŽcª¬†Ý0aDåŒhiãñGÏëƒÝ>8œ„]£4ù<Žò=•}Qú·ÿÉÔfàÎØ|?þv#ÍÇ¿ý)(Š2<ÄÄøøÆÀ0°8¤H*Dá²Ǿö#ò²z:×[?Æë.d.äçñó@Nãu3‘ÍD0“IP}ë 	’àAõ-úÃ÷â5°VMÐ
RÌó´Pâ9%TU¢ÙrsÕœæ$h<¡fÜE@¿Öõ‡¶ý!	+œUU¥%[N$ñÒD¾•Làf²¾•¨kí0ÒIÐ2ʬDv¿’w¿�­Cv´Ù
Z‡«¿íccüx®I,{¤¿ÿtäyNÊIq)žÿX=d^±¢þ´õ¼¥{v_¦´‹0gO³j™ªYEuÍê9Ô¬šC£[=‡ºUsøµ+–±Çµò¾ŽØŽkÕW\eª!ö"q½ˆQ]‘‘ù@h‚Õ~.ƒ†£Ðè¢ë’P-Ô˜À˜SWÉyªe›ÚÀŽB“©d`ds�§š™» 6ë`ó½ÉTÞç
¥Y¢M`Ôwé–öøù[³l=ÿñŸ¶ûÕw_Ý}ùuH*âì(âõ<i~¬P¹¦täHéšJá±aõ—Ïo«àbb_³`Ý-2äR©®ÇLcÊ<®8&[.GWFáDÂHXÁLÖÐqVK"•6°°	ǵ¿"#]ú
+Aƒ„Vmhyƒ¢°édšø]ü.f>s2s6ƒL°¢ª,Î(}@½•”zªÊWi)Ü´U@§ÚPCÀöKÅ}N)׏¬Ðê.2`X–V�Ë—P`”Åâ>.šš‹gûܥÐá=Þë‹Á'dlæ²3Ù¾™Dî+¤
+}°™ïÍ°É)$SB*	›ñ˜“5:IÊ(È‚6
¨J^c,4ÞÏ:üÜŠîÁ[
Ý=†d[¬)“4¦3†ÏMŸ¶‚ó;É—†/—Ì­èüœ¡{šQ»Âí2Ü:^ÁììýFrþ¶ò6øÏžmO{ºŸHŸÌá”Áp?kr'w
}ÎÐÕƒ_nîNs†ÏÍÈœÌÚÏ;ÜÉ™Ÿ3dÒÆä´ÀúmÛÖŸ²mÈB)~ô¯¼ ÷k æ¦ŹÖ
+Öþ´Þ,,©L¹#Û—u¡©
+*&*Ž.8žÉP»Ìûà!\uZ]¥Îì҆ši9ÑF%ÝæBy¤L-ÕUꁭî¬Ò[UìÙro^Ô끋z]¨g‚PD‡�u¢à"R_I–¨Ú²’^¨nzôí¢ÓB<í¤«}€x,N‡õè[VG‘»e }lNû@‘Êä3MÚð$kqÛÚá{Y«Ãqìd¾öÁÁvöÀØö�XÆG÷k›š½‰ÿ5Ø ]LÙLõuà{ÐÏ͇PW7Q=©L_2˜@ð:YÍ$^sº°£ì-õ þ±§°·ŒmÛ‹r„]üŽðmFdbLŒ¥N‚\ÒÎX-	Ìh‰àÑfÕIë!"):¬äWdÔa=öŒÕÁ®']
~›Õ¡ÚÆÎ�ô87âŽ2–gxþ)þ)˜ÃàíÚàΪâE![–½xY‚qñàSà °Ã¨¹J^@pü¢�\$»prüG£±äµƒœ²p̬’(ÃŽ™w¢­Ë”¼NØ»Oy𔑈6]»[[x·‹å[Zݺ�ö „ø=ÄMæ÷ž=êûê
õ}߇d퇪OÌ‘ñÆ{ö°g©O|ˆ§ÇT éAj+°=È0/ÐåUZ·²„b•3CNêx fda”cº´Š“$ÊÅ9OŽ‹ɳ?•öþ„<;öVûm=o6=Á+è@9º‚®‡5¿«ëèÚ=1e+ÞS»˜ $;.*˼€·æMôہŽ*+K’Š5ƒ¤²‹ _©W½ 览¨íEþ¤¾òS}¶~óì³Ô"ýx•"Œ3ð+Ø÷Ï2fÎÑ5HËØX±ªˆÚB
+Êd³«$Á(Ž-¸¤Š¢{¿wËT7h•p¿"¹÷Û_ˆŽ©ì5—˜ÌLP_Q{‡Ùl˜¥K©$G…=GÎÚóÆá7öœ¥}œþ
YýÁêS+vUv!
'àƒeÕ§>Àó*®À´y6Èl¬ñ¬Î¢M
,Š˜€ë¯óe3b|¹ùÒ‹˜øEEêWà2§bâq"&F¡zÐñY’k‚‰OēˏÙub®TÏÖp¡LÂÖ}
+ˆO».M€G\T±g
%oGŒo3¨r<qP,/z¢M5Y˜“£…­p-ÿJ@Öm·:*•,éÊV6Ž= ¿BÉ¥&`â“·`™=<†ãgæ5Ì{¤a€Ò`°Õ)ʉ6 o¶p>}SBùä)„òèúHÌlÉÈô!™AÚ'“‰ì‡êI8'¹»œ[Ó™š™Uº™alÅŒ�8CN€Ûé*Y4^
œ„ËÀ{¼r�‡Ø,–$®ù"Ž<aÌ^	D…í
³è@Ž{-I:™…¨(ÀŠî ²®$í:¢~4¢Û/¹‡ŒÞý•—A#bô®¦m
U	4ª“ñÌu§íf4¡ðº˜(sSq<a~ùªe_ç¸/sÜŽó®l7à
;ƒ.ò˜æœ€×7X-Å
ª1¢»
~^0X- ›Dþ »d6!Z¾,/Q*Ìx
èšË°)ˆÑBÝÆœ@‘éËç`NÆc)ÄnËË_¹[ÝüÅÍ·•Ž,$£ôs—v˜]ŠßuxvÅ‘.MøI1°êuž=žk£˜2Š?‡".˜Å Ds-”Ei×’C1Í"¯µæPwOd©‰c:T¶¹¼¨lX«e‡Û[¨0€´Ã•
—û©†—ü!•yí¥ùŒ¸[Ž½Ys¡¡×	ÝòÚò¯ýÛ[¬ï6ÈkÔ‡@^Ë8v-šŽÓ
+#vF¥lâ PR]¸Ô)�¸	:@‡Aˆ)µàªÆ;A:3Ч40n0ç¼I Ühê9([V’®•[¨"rl+h. Å©ÝZd×·TVnÙ²²
+Ì^8ÏþaÕÄu]ú8˜Ë²¶®a$
¹‰«Òxä®g˜„ÙaR$Í@{ð¶k¶^~a±½íú[Fo»òT/ҏŒN³G›ËO&‡Ožkik³Ì=ÉÂérê~àêæ$æ|¦œAêç”dUé£ã2è¶®b1 MgUét•²°5PU\%UJ³µ³@#›5ÔL¥I2³Spy¼r·
Ö:'Ê9±nÅ“–0‘Æ÷ÓlÌÁJQsK AÑ-‘˜´ï°‚B·ã÷ÄøûtóœGÞxûGΩØL{L6úÆ®ß&’VÒuãO/¿ü§7ªµ½+áð½+Ç^%?ÄÕ^|oØÖåx…_ϽÍ@gcĨA4DI
ã#2X)0s5©Ï*;v̯ý'£ ³+ê“
‡j¿Åm¦¿ådÜU‡P¾‰z=Q�CH˜­ÿö¹—^8{­ö«ýùÛžýú­}—ÜyOmü¾ÍŸÍý•þfˆ¤q+ô‡õßFߐG<¬6û\>Y[Þ	ƒ
+œÃ£ñs€Db‚ÔïV’†³\@ˈhА{(,g
+×_-œlÜ9j$w\ÇÞ¬W�°'n-\rçÝUÓýß}a—iÄTþÝ[eSÝ?®€T›�g”Ú$3™Ù`û-f–¢qxiÚ0FÜÕr{Ï\”ÁL9Õ¹D3Pʉî¥x,–)±F8…<h–`/Z-õ.Dç
+4ZJ†0úF«%£’!Í;fGÓ&WUòðî*¥­Ju¹ÌÊ–ÓÔÏ’Ž™;ËÄêÄ»$\¥|gÎب–’‹ðÓUZ”É*Ë«åþ¡y(ËN†‹¦…`eòJþ@ïLT}	XÐÛÚ§c¨³k
+{¼Ó©ËüŒ
ôلݳÌ_ ¯084k6%~OTŒçÑÝ’ËGÑ™®	G/„"‡ê`TCê‘Á‹´£ �¢¸«]́¸$(BáE£ÝMF‹EÕFµ,4ÄQxvi¹æ£‡íÊØ^üÀK¨lÕel
Œ!Àw”§ì
ü%zQ±[EîmdÎ
+ŠãÍx
+hî¾s4?¾¹>îSד͚õSæ½Í8ºöjI
+e³ôÕ\[iÐPó0 l±eQ­E}L+Ê´Kü°–k“æñWQH—\ÌŒýý¥&Ö4œþ4!<) ˜Œ+
|Jð™×?qŸ¢]©¯"•
+÷öѰŽ}Ì_9í´ã~NÐõM×tOµ<Tf`ŠS]Ï-�k0F+ÕõD®fÂxe_¶Ð×›JÆîëì
°è~
+¯
+‡ð
†àW'èz6îw«CápßèÜ'`ûüZ¿o�ä·vg9§Ý\ñfk¶Y‹øÑûï‡ûû”çšÈT9ôžP8u@~¡ÝÞXkdÉ‹’Õ1	$÷ád-ö¨Ñij\·Ê4½×J—KU±L0§-z45îÞ@é” »ž‹Ïr_)Ž¹‹ìû<yö˜X°H‡�c÷t½,ÁýÀ@ìMÂ:l”*äEòbH:ö¦"Ô¹ü6o8ìmX÷P?—A»9…)'F°,Ôf´pµÔ
+EÈ–9˲¢�ÜÉf‘AMšoDÐ\³&+®ÎTLóä
ƒ¡“;*y`‹K„Là
+Ãõ†ñQ•¡ê�°Ü±7ómìŠá3Y—E¶¸Ø‘$뱐Ûd­–±½˜³s*öµ­[É©¸–½ùK‡Ã‚oòBL‚龸”f#€¨kÏ(Ý ¦e`2Lü�,"Õr„ú'#À.â*¥èò^Ê
*%Ð_êL
JÑÖD]4ºÛa/‹£E¨DÅRºšÇ½ßf¦iŠ‘–Ý ù(Ó<,ØÖI³t¡y1ÖëÃì‡*íÜÛ¨í❹ªŽJûÊi«mhJÅÑÊèhÅ8¼~xx=
êàU¨4™šææ;aGò´ƒ)׌’¼høLªïåéØ>6q^÷ÙsJ¸Zfm(݉Ï”Zu-4–ìL•a¤h>™JXëâ`�9ˆ“ìÉ“‹Û‡[=§“ÛVº:óäk±6wØhTo<C½Ìßlëp:ɦrúÊ__ןÞè^72B:<i‡{ë˜{Z“-(ä_É+_P¿<‡þŸï
ϵ€”èaÎeÊ-Y´ª}:>U¥'£YºÀat”øCp
.VQX¶0½´ë–C"0+¥DFÉÓ…æ~¥C„]¥ÿ€`ž&G¤¹TÞ€ÞK‰0Ÿ$žB»
‡(¯mÄAGe;ÖùÅ5ß–£1«
ÝÛ¹å±å•¯rÓ
g>ôù%íÝ}ŠkãšåÝ)Ì'Ê
+gÚLg˝´eÞê»—V6®>õæâõKWn¬ÏKîRª{·è#Ah˜Ä€£Þ(¢ôtµàéÃ!H売ƒsÎè“¥ÊÒ+LO[ÚæÍòu6:#0n²L›ß/ÌÎp'OoõŽô÷›â©„Ívì_{ýûÑsº_Ès`SnÒìµ2kðá‚c®·Q®w
×[€#’TPj.Z0[@Q_CÙO9þ rü4Ó_ókk“³Šs¦d
ÙZ2PÛ-Ò¤Å$l¢Âä`ö丘<b.
+;0D”Ý
+"˜¤œ´xñân€×‘]ì]Y—”ŽÆ*Eus±‹f¼"¨}?~ìÍǹsp™
¥$3{ì™l±˜åV²f)¢kPô£oðwüC|ï`@í|Ù*5Qѵ�ÜN
]Ë¡Odt›}¬ÉLPÑqùÑQFÅküÙJDÙ¤²{&
$e
dwÔ£kØ5Ô½™qÔÓ’+wƒFîÇuÔǶ êì5Ôõ|Æx*£ ŒrÒeàÓî‡$~	ZbG÷ã;ׂ︆ÀöÛtÛO#˜ëis/¨.¸¬ÐˆKåc·þXÅIûžO8?ÖñíÊ	íupÈáú¦ºùxGoR÷2‚~ѝÁà@(ƒ‰C¥·Š¹z¾Å™'öä?Ý~#&ÅF²WÇ£2a´�Ï^TßTß>ÞяÇKÃHÃî“ð?u¼üø£u¢íq¤È¬OØD”LÇÍ-Àü‘•:~Kh~ÁšCs:Í¡YMó.¢ùÅ,b¼5‡1œ+ALÜ„:BÙÕ2-K³
Êþ¶éhõÜü¿Ê9^æÇÿ–µ çÇ¿¡¿eÂþÄíOAõc£Ÿf„ŒíÖÇÇšjé`f0‹`eD«=I³ÝÒ@õÅ445óœ® Ž)Jã`Ÿ^´MHø8÷•ÇCógÎsœ90ç»p[=8>ÿU[
j`¢Vmü’£oý½Âþ©"5ðãlÀWfʳ¨?kqF™uH™]¥èNë)üqÃгG¦éhäÓáǵ£W*¯?ú:ÕØä
‹‹‹u‘½M½:Ý4s¦Zªbƒõå…µÓÌÐ|¦ÄÛuç/º\&¦™åÒaߏtuEÆÜ‘.î0×=ìt¼“¢–¸Ë5Ìs({Š>»a¹¯…riÅßs¨Š®=üƒ¡�@$ö+’Xò¸©â•]	]M¢âퟚ87“RÄ#Fݺ&tóë=€çè^w°øWÒ±ˆ$Þ=æ¿hÙæeË6wq‡ÝÁ û˜
ÞßûÆg$Ãê›ä°ú#<·èvïGòÍüŒ´ô!ƒ{„®倠3Ö¤¬š$ GXC«Àø©žáék*&^ªµ§ùTy‰šÆ{¯ýéu×ÿäÚ…ÿ±¿ß;çŒ+:g¾xÿ…›î¿ÿÐ.ö[qó¶Wÿû¾Ëÿ{dÄÛtéžÅŸßEÏ܏:Õx|MbŽG×¼ZtÍ×]óhD•ÑÃ&ê bˆÂ€‘½’׊FÑŽCˉ±‰¡³¥GerÄ̬~õ·`ºŠá¹78èy ÍÂFÔê…4[¹fSɾ™ÄA®šsñW„¥…Ë×-™X¶íËË/ÿÞMÛ§æ|i‹“5›O/]g~ók_yiÃü»¶\}ÅUŸ›{ÊÅ
Þxæ7·­¼(x¶Ñ·¨máŽÞÜ%»êöòKüg˜f&
+kå:¦Dj8«À
KÑ
Ó¢KH
_µÔ†Ô°a8FÓQñ‰¥H	bÂP±ÒB¼¸¯%Oè.Hà6^&(:Ic½D¤Ì€b†¼ó(¹$òmõ4ÉáöÊ;ª}‡ìÿyðruùÛe—I§££ýÑwŒ¦oƒ‘hÃ+o¨üæÑwÞ¹0K¼®ùŸË.[Ó<ϽæR3“fè˜Á´‰e”TU1k³Ù¥
ËÅÒ^E‡"SŠ¹€¥P+°`É„¹”è/ñFøLÖ§¶lâã¸äk¨a.B$3‘b c`o]s÷ddŸþYáùŒú€à_0{íì~
£-ëk=„H4Ùë1òS2‡ÿ’uȹُ㵗ú
â¸þ7éx™µkÕqûSÿðáú/0«*
+ãeD÷ùÀæ×Æ«Ôm^'-3›")À­kh¤¬>2¹µ¤‰-Ü¡®¼GÃI.ÕPš[ù:â´Cý=ž?ù‹Z~¶–—$3s™²±ðQëì³V¨ã=¤pYÄÍDuJ./LB#•i>Ì	²Ë0Y±ÄبçH°F˜I>Ì$fÌg–Ð
+7õ=ê
­|O}
Þ+ìi¤íeíÈËê/Õƒ/W¨3õåqûö ±¨¬E­9êöÓhðHõd-‚AàOS€*šzrXµÑ¬¦åª‹ÉÝOÞVÕrk²%}YB?¹Ý‰Y~z±†5SIÕî2~'ýF4{`ÊÍÔ€~Cý¦„¹½®§xõzÌ…2èíÂœí×og{ñ7Ù$›ÿ•ÜäB .-œÁ«(_V˜"w]/#S˜”Ð69Á­rüäÝ]Ç×Þô{ù%ô÷™Â¸+Js6~i.è
ßC:·Õp¦¾
+C#ÎÀ7",Ðä0Û;öC~	"Œ*äí)cDc Ùs5æä³(4õŸ!“âYy<Ã3®´¢ª…w€×sã&'ùܳ¸·k|Gauh|ç¦YÖªÎwÑãÝ««ñNô>î¡ÅA§áÛ¨NãÖuThPT ;OÖÍ£d‚™Æ/{ýH]'N¶hô-FàþƝæèbêmê[ìŠ?«‘f׍)&aqs}ô3~%%Z3	3)Yà Ù¨>ôvP"cÊ‹ôÒ±—|„Œ•4YÇ1ÿ4ÿ4õçŽÐÌGKÖjÿÔ̇€žù°3¨ÿBÂ4YÌ{˜šõ9Je\Šs{ˆä¬gÏõ=õ€úÞú¦;ÔîÙCN¦‡'Àåb</	ár5Àe×àÂÜ û¸lŒg0°Äð°j–ˆ±2xÑ|t
+XXxq ¦Ò*KaÒõUÝ	¦QH pG›Å(`Ø¥)7—r!UH	)AžĪWwìxuçNx?¸c
+,mµ3ð>&q"Lî˜<u˜ã09§Àœ%¤&C³‰xÉîgß=o
+$·¨ïÝϼ{žO‡c:3È\D!é¯*ƒTˆRõºW½!:×ÂU%¬¹e
¾a€/ŒëM´Ö›´¸ß̷͠ØԇQ‰ŠJf*—mÎ4*Ú½bÉH¦àË¢‡|Ø0ƒæx‚ƒ—sÃ|¾7Ía¥¤øq2†¯ÜÅ;#k`ͼƒ÷pŸI68S!?©ÜݱæxÏœž¦ìÉs“·OåW6ÀmÁÀ±ÄëòÙ\„—#CIÎÒž]ŸÍ-ióýù
jº8>ɨq´Dd7MâñU1׈wí–ÜR‡}¨OE·ň'&œ±÷Ȩxœ
+ø`+p¾1çKó¦ìÕãpZÅdÊŽ@4G‹¨Ê¶x7LCé\64·£ÃS-áú7zPsb_,žÎÐásÞ"õ—LË	õ+D,‡ÛÚµ8^>7L
+ùœfe@ÀA)žO“TÔq8ÚWˆçs°áTNú^ä¶ÏWú¶lrÿàçO©|áöðÿ¥‹+÷õ¾R	œ»¨²øÿOÉáÊ
÷+ïŠÏέœ·7úÒKM÷ß°ðbÿ~4í«•Eúøù¢_óæ"ã9_žº	XÏ›Ó%~˜3Es¾¼Á‰Éq4/àÉq
Y'JýZxÛm×þŸ8}óW
W1SóU'㜊CÓü“p|€
9ô›v¬ûáNõ±gøÅw¬«îTŸs“³²?_/Õ${@ƒ™‡Öríœ^
+³èÓav4'×N&˜âå¡é]½©)P³Ó‹W>ùauãæ'?˜šowE‘-8öÁÀ‡OnÞX«W>‡ú)ŒLæÜa8V×nJ¬
›¡Ê1ÍdÆâá±½lœ¼D³™>åûzžIíûu_Ö ƒ–¤}Ÿ¦¬v©ê,Ò­ÁðC˜£‹`ŽQO2P/@s°ø*þP‰74¤U# ?$/’ê!­œyl/Öâï|á­Úïk¿CÆ–	ÅدnƒzòÒ°t¨3k¿S£É¿R½
«¨Á˜FÐœqÞÿñ ^u–òÛ+·¼úôù&âÔ°`[ç\Õ(kŒðM±–ŸåÈ”œºŽ'øóÀKŒÊ7“äNõõ›ßÙI’7«›o&£ú
ÎŒG`~/ÆÄùüNú{ºQl]íWb$…©¯‘½7“ÔNõµ›8¢nÞ®¾ÆæñÇR;Ô׶cm
Í©|€êÕqf9ÕÚZªJœú³C™Zfit
+™5«/àÂìJ›Æµ,Ð8Èi3.W!èÙ?ÙoA<a‚j:ÆëPMG±]ˬÔ>ÈÚ|ÜÛçó3x¿÷Ç’HïߎŸ‡vžú3o(ä%ix{	d¸¡N×$ÓÁLcza…éeÊ)”ä=9Ž¢Ô†Å¸‡vf襝†�þÞѽßjóäghaw1'EirÀÕכ̬²wÂTƒMœUNâ ^‰–³zbXB³m
+aÌÅõäR±1ëPª%ôŸ>·Gz?J
Yâ,{isÁ‹\Ìã~õW°y×÷
Ž7˵hb‘X=¦§RÓÄQ»Ïou§“%“×Bh׀æeþ·ÔÍÜ-/ÙÚ×õ#}ô'þYZ;”Ïóˁ¶)°¥^ÊMR¾Æ¿aCÁË:ø4ú|…¾Ä0&¤’1-VÍ¿4›8iz:sÁ¹_¾ãíÏt-úÌeŸ½æúÓW9Ïq§fÈôy7ÖîãM‚7*Æ¿24¤ÞuŠï®ïæo:{ûÀàš\w¸?ü‚úßì^“3=΍öU#{“3ϺiuÖk6„¹+ZZ^ú!ΙK?‡ÿf
pQRŽš[UæºJƒ0‹à58ØgFM½q{eX	}°a°‚.&ˆ_ècS>Ù—J¦Òl
4œ0çà#n“K
æyó"#3¦·9[ÞåkECÄg1;9Îä´úûçlš=Ë™|ô|Rj¾Ó½|•!gï8QÚÉÚx!VWНœ!ŽÞ™ä[#áé7vK–ÄðPxä½ÔŠ½ÅèÂ.·Å)›¬„7z›‡f_2û)²êâ®5X!ú¹×î3EλøñU¶¦Þ¦69àâ-é¥k[Ò—`ú÷˜ø÷øef2ó™Ù.OíUe†–Nº £R
+ÕÒB B
T¾Ys hjoËÓ</¦dž!ºŸgÄÖt~xd>ú@c6lˆ�YŒ±´!U²@™4ŸÒŠò½£ì“˜˜046Ï[~Å–/Ž~qËËç5ƒ“ìfwŸ¶úº›®^yJ×+)„fô‡{”ÿQÒçÝÚsÁ‰%/»¾ÍÒ¶nõ†ù™Ìü
«×µa6èÄ}ˆ¡3§w¶åNøŒƒ,L̝Xt
+–¼¯Y¸îŠ­³/ðohmÅi
+´`€
+ã£
'1_cÊΚ%:’ÁlP¥/øí¡ÿüÏ_3R§Eq¦Ší;†’ƒüÍ¡Ø¿£8]û¬N›§sŸ‹¾è{¾·Ò÷¾—ál˝-wƍ` õ+~%د´ö+‰~ÅÚÏ<oµÙ]`k"­ÿ#³,pÈáœp0Vf	£ÑÓ§s$Ž.¸‘¬:gšú
W’0,_'ø‚¡ÁĽêË÷&V>vù)ËîŸ=ŸØt%jFÏp:H[Òם‰MódÈÆÎÔì›Óö`PHœzîÇÉ-î<ºâ.éÜó¯îlSßêÛá~ü¢™uÍ+›‚cßíLf“3ý³Ø§ÝÓw×,o[›­wÓÙçÑþ_áè¦ú†sÑ“Ô­‘´¤A}–Ä&’_Ú”08MÒØ6ïtïضÿ"/ÔÇ1à3gÎü¾%fh9z¨Èþ|¬»ˆ‚»ƒÔòµ$*wÛaVcò(rsGFIP9ëÃŽ8eÍ’ôù͝儯V£ZêN÷%`º‡Âh“™Ã°éKP§|¾·¯€Þê
+ô¤"õdH\0bŸ…‚h0&‹>'Ù´~ëz²Ééó‹êÅ çÌ7Îô‹ê¢ŸÛ½=2—¬^¿~X}ZýGG·Ýk·ýMýÛi¾Y^Ѽl™YôÎòF„¿Ùp5®å{›'ua(ÀjRÏ9eV1ëêÑ÷<–™i¹0˜†>FÞ³Ò?å¶æ9ºŸ_’vaâä.)TüØ4öľ_»0$[TKa‡õæïÚÒüôœáþƸ@—>‰êi~YôФm/ÁeǍ3Bk|°Ô[Å}‚ÝMë(\`¥9p‡öz@/)p˜úQRµ}X ×ÿ½‡ÆöªOîºÏ©O²í¸î!<ø—J…]ÿ2zP_B•íºûÇîÛy½v Ñ_æ]R«
v!™›èeš#b<–¬e‹=¥þ¤ˆÙô˜¦åÏ#70Zžÿps7³)Gð÷ÍÕ²™–j˜1OÊbLGÍúN FšúR“Øqp®’›ÐaKKàrU\<n±Ž�¹dLŽÓzBI^  ¨S½X¼àu@”×Ú1jפò‰öˆhöý©¥ç~å;_9wiÊoÄöL¤‹]_9rYËé
«ÕÛoëJûEÓ‘JÇÊm^¶"—[qÙ…ÛV’µZ"/Vùa¿¡ß2ßä?ýZ'££,ü;²lüíØ?‘Ý¿CwÙïØÙHëyÌëüy¦Vo&óØ9ìÈoÕ‡Ô=\hìvöïÐ	§ÕÓÍ`Š†- ã›`µ1¨SëNªÖèáME×6¸„Ñ
+H4(x¡c]|™t’®›qìMrï/È
¸ßYa&õ´ÖµmVÿ@šPÝ0fOÀ˜e
ÚrÇ+Sº€ö.%©ecð…¯"› l©³1e±Y‹^€²T’›
¤n:*ÉðèèûDÏ'ç`;	]QéÑÏ8.¯xY4–L¹
NG€»)ihÏÄÉØ÷
+k
+»#¡ŽzÞ²4Fž6v[K·{Òïö<,JpüØLÞ7«½‡½R¨Òácrƒ±ŽÃÙ˜
Ç£6®Ø³—zE"v]!ùœÎôQ	¥+zÁëa,^ånÑ
+ZµßÖòñ·]0VõßvÒüAƒöÛb¹Á>Ë‘(ã÷ˆlµ¤l¸Ó1?Ö–Õ¦:Im§25ªU³ÑÎNÔ3‡=œ4·o¦ÉiLƒ¯½ü2é /¿¬B×’Éuþ…ÿ°'·Ão6Óê"´G-Új<Œ†k¢(q¢ÒøOÀ'ýQõ/½Ô¦�•µú‚…Z†¹¬bg…-Q2PîñViYVSÍw¡VP9B›©E°™Vh™#¢>½'§ü4-sWö`Єa¼&“ŽùÛ"OZ½ìOÂð”zWQK´§Cod
û;_ª[k¥Þ,º®ïÖsu­ «
+`õвk‚£«Ô
°eiÙt©Ãˆ~Ï %0L;“Hi^ÎrÆ
’qÏ
üŒþKÛÙèr3–<7ðŽXÐ÷
+aYÞ ðö‘±3’Öbs¸UÞ_àÞIȼØ0 ëÏÚíGXAòE×
}ÚÂœ%GŽ=SQßµYI³DNVË­¤¾þgh^Ë,úŸôï„u6¯WåhFk$‡2ÕŸ-·ÓœêöÖÅõf´ÖCí9Àª«G‹á÷
‚ì‚T’,£Fºî�TА3„Ñð4Æ5yÝWÍt^·Êmt{ÏôÂûªëœ3·ˆÞ¦ Û.^øÐòþ2c†;H·MŸ7Ý:í"r¦zšÌ_ºÍÛâ	JžVâ¹q©ú­§
ó6³†$w»×+´ÿ[ÏÐPùSèAþAÔ·h«)üK¡·»  Ã;%²ôÇeovïÞÝýæ²?íßÿ§Úö÷‘èÇ>zúÁ®ß,ûãþý\ö›®µ5º¨×EĘ4¬4®ÜvcæX¨âkÖóÖªˆw€`D,m-ñ¥žïâdAGg’œ$D%.žÂàeqh«óH:ñ~h(¥~³y(•mšæØp··¸«†ó‹GÝŽm™>\\ì'ë#Å®“·»ºNnk~ù_‚	õrõ«ŸýÍ
êÅÆÚ°%:œ›™r3Žj‚z{™6€USÀ’glva©ÇÇa¸aýäiM†×Ú›h»Ø+@Ô°LÆEwÙÔÖ….p­^·Ý­tª’FÞA=I9± öäÙ£OÀzúX†M"0SÑ<â0Ó>	÷"Š´±½7Q €ºw2
¾
+È“«é¼„õ¯hø5÷“˜kt¥¶Ò%í4CÛ‹h—{h|-õ9.îÝZrm7ͨíé‚ErÝ€ü~›ØäIÂ¦V@9ÉÛ”‘O¢Þå‚H‰�Ó=
3:BhIV´¶¢Ú*AŽzè2G“¸£,æ¿äÁòML•b³ÃA.tXEÛÅë’^³éâÕ›¶MNõIá1°
Ÿ569àr»]jXy3'ð<k°|q­ú4í൘µ‹	‹ù-£m³Ãëv\»dt™ú´/õpÓ)d•Ô–¼!BXÎÀÙLûó«ÞÕeÚ¹À7k™0¡\K;¢h™¢°^OÇú
+eF¶<ŠƒéýH»!º”`-m‚éÒjq€Ð^J@eP°$#XRhkæÛ)íB­4áB‰ˆ
+Ó_â¦cåHª‹ÒŽ!hÐH%À†0[ËbJqñX*‡2<Zº	CA%3'ž{Êê¸Øî²:ÈÅ‚7ú”I}ÒÕdܾiµå
g“ñ³$±Iýúº»-b�‚™y+Q[¹?VØÙ£Kȵ.—d¿Ìf|‹·§Ä±ì_k“Ȫb»W}úòßï­ú¦Õi5si!ª
)¬Íµ¨³`±ô13ÀB)p®M‡95Q¤CJ
û™•Û%*Bg�yrpÀ…z)öóC¿K;YÜ}ýý%G†æu1XáfkñïT"éP’˜JÄˆMP
+ÆA¬èÃIå“
¢Å²tÖn¸MRŸ^6ºäZg±ÙwÚªç}

òl‘:E5›ØõìÕûŒžÈcY‹¤¹põ%›Ö¨?[m#öK|Öµ÷¸íu‘
+ºÒ¾„T_»¥¢Ç0XƽgðúÝ3—QòZ˜~š¤žÏ*Õr'-Á霘G³X|šÒ²Òg�杴J^r¦�s;UÿŒ09g‚¬°Ödˆ$´&‘˜à$œ'*‹5I“yqV•TÒIP“g]¾Íö¤óZ²ttYåmØ>ö!Ì�Ë—ß%=E}ÊÛ–Ír‚Ñïûæ=€úˆï;±®ÉUÓ«/ºdõ…8™ÈZá±f‡SÝ£®¾¾ÝØìü¾Ïíö‘ŠUp™8»ûö2Š8‹ú8Ì“'¬43t}ÅEõ7=¿Œ¦ïiÍC]6tȺµ}Œ‡V„—LÞþzM¸6`AÌD2œµç××=\•½»‡$XPŸÈ=ê%ìšë~½ç¬=ê»z�ÔC,¯¼H’¤ã%]_}`rÁª7]·Ì`
+ú4˜´l‹–ÊPòbï%7æu•-ŒØ¯U©£KK¤aWI
+º³Ñ<@tmã+äI=¨
D
Ö�zT}ýÅW^šB£aFb:Zö{<ûNDcÖæì§VšAÂ,<wÉêÕºÎN S‚v­ Séëh¥S‘EË‹ŒN†i©“·qд¼Å°¤	`¹t°DšhÃuqõOÊ„™ö£8ˆ´Š³r7£%©é×|Ns;ó%æËÌV}<;ªÊòŒò…QvSp5»^ëNò æ€1ÚÀ®g9O4Þ:¸hÍ5·Üzǽè°¸gYì±ä´SÏßòÀ—©^Þ!ºŸ÷M뜷`Í:¼æâ,³…ñ®¿èÖ;ï¥nNÏDžð}‚×'dÑ5,‡Ù‚]p^A¡Ä`:Âìle£©}i‚Û…¾B˜•Ã$J9œ)s…d
Cå…4—êKጇ+SÆ”&)¶‡à>œü_Þ¼>)Ír”¤×Râi$ý›©É#6Ÿßä_íî™Ò\G·‘>sU8çi»cžhjI»².žÛyÖʏÕè2¶5mm‡‡ç¼Á"ø}F—)â–Í–öøL›Õé³Y…ÌJ§Çíì›œCNi˜ã<„ë!ä,¢Õ-ÄÌ]Í­“)󀜽ºÙ</`õð¶°)æÝ‹¼óÍFÅÆ]jŽ˜‰ ¸¬„µZã2›aí&Ηt‡¡æ°ËHˆ`ñ$Ì&n¡$wZÞ€ÙíáÌV9%µ)ƒ3ð­qŸãln£…�µ„”Ó*±Ë.³µ
+›Èû×ÖÈÛΪÅÉXþYþVÆË0ƒ¤@€ô}²A.€’ž"ÆX†8ÙõÑeþa§:v÷Qû?\¿}ì)g§óÒ»:]ìºs_é;ýÜ;ßÞöìéó2cO¹\—0´âàͧô¼pÍ7·‚Á~½U¥@­ãæö•C¦è—Ó«¸&ª4þ“?TêéïiYÎSë-ÖvFĘÐÿ¢Zƒ`³)Úpj¢Qw¢m°B«6­vºRù—qCï[ÇÛT@G { 8Þß
m�¬ØÒêµôªÖ1Y³«™cÒ
w\œ Ÿb‘{ûØ"îõá
+¿¤ˆÞêAl�Ã4Úh§'˜
ÔƒChUk(‡š‚?†ÕíZh2£8)1ÚuÐC‚j`ÐFÞq­'!†Åiav!d³¸î2%¬¸JDsJSë%ÔkGÝÒ´3lv¤k ½Ò>€~ ýG
c2Ú> 
+K:i:3Á®Ç¸¨´£Zfž;‡QvŒªkáVÌL 4	=”Ø…+`U¸¹²³‚QWíƒ}Mß«`Hµ‚/8ÀµÐch'Ù·´k½Wç^~/Íw‰€>Â,a~¦wlwVÑS¾(§ªÊÜ,–÷Ó¾½Ùr¥YÛIæÎZû¥
)
°$è…ëQk'vÚHj¦þpUvѸɂê¾Â‚Ù¦N¥‡ZÚOÏ~X†J0ö°8h[Ò0HßR÷ è?0ž3;=|FË:
+k=¹l¢Ög_G÷à0n¶iI8J\,epáñ“ãuùñéïâ±>êOÀ-l–zÍ´ý” …©ZA�Øè'êtq$ÝÒ"û–«¥Å'¯l\GÌÚŽÃ	v΂	·¤#pª…”OÐ>è6íüﻢ-é–o·ô¶‡Ã‡;–»}¡Ö\n¥¯oCý£¿døoï,í
+óRU´â@šôÁ¨U±Wöo`J)Ì9˜Ù¯´ˆû­Î`SRHr—²9jDa¹ÉeqUê+Œ·¦0€,à7½½€%á°~	6è	ÃÂjf„à7P¹ŒÇ@Â’¦à´ø–y3§Ggµ§ÚDrgÜïl:ÕkNŸW¯æ’k½¹)étµŽýºwaáT³Á9­5é÷’Ó{‡6õ䳶˜„ÓŽ	sYÃìé¢ë¼åsWm:µm¾ÊCÿ´¬V³«§£³õìÌ:‘ÆÕ+…Ùä*ŸKnMá/ŽÌŒÏjm•ð÷
+y^Ü}ö¹§ýí#F$ÍÞƺϵF~ø1Í·¸‚éã¿Ç¯‡—g†”ÂÝԏ#d	’´­›X‡¦5`³ŒŽfl}.8µ|.D5h~ uGavTL³)X…½¸Œûd0m‡Y´\cNJ'㊗n¹ëìóïºùÅøºÙó_Ú º:/Ÿ72öºøCó|gl\y™mÖìá
ý‹fl¹<·`ðÎõÙ—n¾ù¥Ï¦O½hþ¼þ¬,ϸyÞIóæ_tjºiíIþS/=ýRÛð¼õÍó7®zò™çhøõô
5ÿOŒÖÆã@`Œ	mzŸ°>Œ³`¤'@¨.ð	&D/Í€ïÙ1ç´3FHÓÈÈ“õ‚ƒêõ=˝FŽìl$·Â~&ŠFvŒœqÖ,õ#dãY³vŽàW¾=²ÃlÂïüÏYîîé…Ÿ
ß²Ðom{r¡ø…pddDýÃ,M®WôށØA%„yð4Ò Vµ›zdŒZ×ØwkU´ƒ5Úþ¥É
ʦÑàÓÃPµ”ŽšU\ˆŠQ·^™_<ïÁ'¾\œ¡…VŠh¨þËÐÚ¡¡µEî[R6§³Ò±ù ±ÿÂ8öžšÐKÝ?žÈ`£1ÓãG©do¡/+ŸW@Ł€Œ&™ÿTZkÜétt8HýhUÿxð'dëO¹vNõ-'~ÄÕÿRþìÇGRŒìÊß0=À¡³™û¬cì õÃÙr7O=.èI NHwµìÀcnºæÐ9°Öe«¸@f]¥.ÒYæÝ30Nod˜n¹J³€ :š±æ¾©Zš‹MŽ0»ˆíWºDÅŒnØmïWÄo0Ž¦ÔëWܘ1ˆÞpÐqÅ4‰§ù|¯ž)ÈËq
+¢Œ•øFÌÄ¢w7Ì
—‰â¡M_Iêó†u‹Œ6=²,]¿}y19wå`'÷©oѬØàŠB[ywñKkÚ{]b‡·Yà‡þé‰õ+Iié9N²œLÿúÂé·Í–-ç=]3/Y°Ø®V‚§kðÜáÏ?a]ºL\׶‰
‡ºü’Q�³Þmëtß:k~@	ŸÇÝË?
´ÝÁà*v¨(aMl¦ì¬Õ²‡>ÄãÐi*RúiúÖlÙO»úÃæβ@ý_£U”;5¯RҏoÙé#”bNñ9k¤¥£'‡;·Ò´íèÁÅ
KF,u
jåÒhI¥J¼—>BC�K(“â>؆I®ç´Œ}Ñ’4C&5lÀ”âc~¯ÅÌeº7>vó÷˜³¢5±ÚÛ•ÃyÉ$Ií3âgKÑ/D—fÛ—§:äŸeSkeÁ(YD›hžfke×{
+Áµg¶­/_Ý»¸9$uõ7¯êȳÛC}V‰…¿¹žÚ¬wó£Ý*Z
+wÍ™Ö5ÿŒ®ËDjý?ņÍD(%+ƒŠ©ÞT4.šY|giìeý“F
iI
‡ÛÊÝ‚Ñ=V—Fúì~ñ˜ÞƘ!­mšhb¥·Zbx`o;Í“§ž¹rˆFGC2¶@Ã>K8Š,m–¡åÕáƒ0µÎ.Ã-ú#_,´¢°Ô„íÈ] ²²Ù}n—d¢•r”MØi£–Ž§˜DXÀè5ÑZHÅ.*"¨f‹GiÏiôh8QkŠT�’}¹‚1¤Ñ"­¾9§x:»‹[ö !hÓW<«µ8:Œ
Š*•	4qÐ:óGË,	ì<D}’€«‰ú]@rº¨“·™ŠTßT€ŒSdE$€ÃEã_¡( ξ ÅjÒ4¼6Þj$€  ÁjÞ€Õ¥fœóc¦h †Ž=7™*
Ô@ë$9gœØãT9¶Kr(.ÑyÄ
\²©Ö¿Mt_�!(S”íÚÆPĉ-g}Qû<.ÑDí"ÐG%yh!vd²Rìñ!´Î~†åŒ´K„«]
<·º?ƒ"ÆapCDKKçnäe3mLk: ½
F>(¢Â|…ލ˜”Ý´¿¶Û{`±X•â`EßÕ>;ÅS 8X4DÊÂÏD|“qHPè5M5â@[ÏiÄ¡HÇ?Ê•¸DR¾Ôíp&b±’Ñ°ÖjD\úT¥°;•«—$`Rl;I»Úú,f|é«Ám5¡8åŒZKà´/Xí•“jâ„ÖƒÑÖ¶˜ºØ@tÚ¶»þúßÁkx^0 |,t°¸^‹ïàÍI\Ìux+z3Þƒ[ïù¨ÕwŒ×î6O-–ëÑÌÔ‚ìÉõcXÐøðûï=‚EŒ­¤Q«\ÔêµïœT+wh¯ÅÑj°ÄЋ9	šøThPdÈ h©%Sjöàfìx%ã“!ôt“÷FX°Òò‘÷&�Y!KÕ}é#ïiu˜ª¶#GÆã~ÿkxcãðFÿxå&,ç­C4
Þâ‘#´ï?<Ú" ²ôÿwÚF9„µ6Îa%‡hL€ˆ�Ìl íf€•ò¤ÁKëƒÌ S_Ž©Û+ÜZ§cPdÚÕD©@¨Zö†"Š
+§åØcB„'_._ƒZ{Ô[¥Ex®Šú°ú0>lB!.Õó^Awˆÿ*ÅŒ‡æ‚%±™F¤1Â׬%C”<èñwâL€-A˸Éõáfèsú2 ‰®ÅÆ×L2Iï6Ìf³ÃfeÄa6ÉêÏÉ—YV0›þ€úáb+xÔE^ÉjrÚÙ<¢Hxò¬Íi3»Œ?WºÖSŸË”n~ã™L™Óéfšl,5
+Ò¼‹ÞúÔ¶jºäôÌDÅ%*ÍZçQÒB>Š…Ôc…YŸ´y¥)Žo&¯Õ"“ÃŽÊg<ú®LTè�1ßÒè÷-^`ÙwhP@£lCM@ˆieVëp:é¢À
¶™Uóä$Qå“ì9 iiE­ôƒ8V-c5‹ÉŽÅéÑ H½mõ"ë” {Ý´‚ßB
+ó´j@ŸMË®«UT?¸eQñÑwÈŸÉÆûÈáûÔ'4–8{áõ÷Öôºeï<j&kïSm÷©M©m9µVÓDÒái¬pѪr°¥X¢º‡ªö ´çy³Åát{´JF¹	Ž£`³»Dæ„5:¬ÞXâDU:òå{.¿|ω‹tÜxúò9†¾Pè~i½·¨wp y”hŸ	ôút:7:}ºO±&Ì,mí«¼ÃÊû­®c~òy3±[&6—uZÔ÷¸ìFŒl2¶%Ëçþ“îÿ÷Ý\K!4O¸{©«³É™ãwgÐðÔá£oM¸÷poì»YÃ][¡
ZcJÐèlY¼½Ho/âí¥)¸ƒ:áæ=ìê/«óv±·6Üü»êÙÕ»Õy÷ÍÈÖŸß…x£ÏÖ_Ç\ªb�Ñ õ"÷QÌ}ôÖ>¼up2ær!Å%<XYÚÀƃ7³ßâŽÜwð>ò£òÿÛÙ¯n<ö&aÿñ?áŒj?éÀáÉþ xdA.ÈÖP¶<ûUïö7rN1Š7$ï�|÷¾Ç~ë賚“ñ™ü³ I™°Îƒ§¶Ÿ™V>«ØqN+ªÇš3‘ùÔ„úýåìž±
ä!ÎuôâR¯&{ªÜcÓk2±HqÃ*Ì¥®FH#H|æ†#[6Šô<왲µçÿü1Rä¤î!ZJç4Šî²Ù'k^!M¤àsdZ1Ž:n,‰x‡¤#Àñ•°w×Øœ]˜)V,îâÞö†©<öè«›CÜùÊôÿž‡æãÍbP?B'e£sxáÚBm¤Š™’D`Ù*ûõÆøu $~¤D
Ë£¸qÀÔw¯Ù¦~!›{ý5dãõjâ7¾®¾w͍�`	Nn¸^m垨ÔæŠÑà °ÊLœ>+±µ
˜DCg*BŠÔiâi(‹ÔÁ8ÿ	õú¼N âOÜXû?Šú!½ˆëè«ôäM_Ç÷	½IÝ”vÑ5hç ´s Ict¡ÊÄräoÊÖÉç
+3ぺ@:]ÈÏØýÇ–¥NÀ ¶(ñ`i9¬æ%$°vÈ2‘Îø@NJfM)çhV»Fçͪ¢§…¡+
4;°z’
+#Ú>¸RaŽƒÓiÇÁéxØL€¿x%$bžG	‹BÊV[�ýC°HNFA(-Öo&ã(T€ú—Ph´_=؈Ã%:6:øôÔšg¦œ2¹v@ÓÁ\Ñú·]Á+zÿ:2z„æ'‹´kŘ›þ Ɩ΃ß{F·©´ÎØ7c¤¢äæ°½IIn¦‹,Y9|\dÉæÒ©#ÔZèZ©+
½>º
+S"Y-hU4ãÕ‡
xÎéÒc@n¯$jµ’OP9JÄô3!aµt[ø£nú¢zî`Ö¿¦_ÒÑ£zÓhº	ÚËì·iDór½Lã{õ^öµºìZ]6-½fjNÙŠKÓ>³K6aÿgŒÕ˜©Æn±RGa&EýÉËÚ›Pïg‘ðbµÎxyíI°ÅlVÿO†ÐFVÝn
ªïì
Úk`jï› žD{`üs1”úõ
+ڏoeÄ#^)΍4ö6^Âä0C†F#m9%W-³VÚ»m™²¿9•æ)|VÂx²k&»[hSãh!§Ïö‘°-—§I~À>4pŠKn‡9Ôê(¼8@“QšÉ›
ÔÍ‹ª-°XÝ\;2Ý–$wª[’¶éÓ‰Á,9¸k|
ÂN‡Ãêrgýð±Ûñ°ÛÔl'?ÓÌ´€œf²LÙ¯k
+¾õ™ÓR·Ý@™ŒÖøÈí¢,h¦Zœ8ÅJ*äد¹nÃGe)
褢$Ÿ´,sÐN¢Ñ4Z¹�t™uEõŽb­¸
0SÐc¨PiWkÍØœÊÙê¡bÝÜ­œ}v¥86ï‘[qq1.þ!þ!|F°;ÌÉa.7“ôaÁ'0MR…a‚éÃNâ"‘á{Î;ÿ§÷_‰<"
+žïxz][v;w‹ht|ÞÑí~˜û}çw<ïü{†¢äawÚq»ƒ·œ{lç±Çû¢Ç(><1·×·ŒÞ_	Ÿãš¡y{'eJ#ô
/Mh_f`‚µ‰û’íÙY”h˜šP ùÞa.‹Ì+éõQ4+Áë›I†Éék‘%/vˆ?ÍÇcÞI$¹˜õ%Wn^™ôB.vH(d¼á÷ûÞÐ2¼ƒnƒÅ­¯o;ý±«Š3»ÌæìAoÎA2YÞސ¼MÍKVý©#çÅvxì“R€ò1é¿ÿ)›
©b
+œÔÓ.EÛÚ¢VK}þbp ';÷F¥D4…=]%­‹=}‰2}zÇGÜ7n ãкÎWv¡O¤Æêæ¢îs¨ÝÃL;Ú´êvoŽJ;Ë!êMÖúTiö‘zã¿Z‹›\}«ˆ©´Bˆ~õͯ¥p°4®¢&&>KJ漢½°jlîOpÕíž®‚¨ùðù}¢‹> %ÞÖ¡u# ûÁ–d[»Vä9©†Ú<è<Ìi]ý
9t(‚:}è•­ì
¬·›³U¡“(Ãc/* ›þ”3r¯PmðŽÕ{5!F½ßEÍ¡÷ÿNO‡]246 “þ bT¡?úô‚:Fü|š@[›3›Ö©Ø$tlöy¥æP—}Þ`sìcFF‡èŸ'ê\©hæ×D(ä~**&À4öàTØ›Æa—ýã°K>½ÏÅqa7ˆžnr\ˆu);Tõá]xx×®©<#S®9uR/ųآ1Aõ£ÃÞÖ�»·žñµYÑ*¶.o%µç6è˜iÏ
:.üôéÓ‡î$<.ë Ä¤ñöö¾þävâékß¾=yœiqÕÛ׮ݾ[fMžqZï:y:¦ŽBg϶¦&̇X²íïãqÛ‰Ü¿»ˆÑƒÊÇÎpô3Æ	¸hUO)fÉlÚ¦bÓ®có¼W
+6‡#±DŸç½þ`S¸¥5ùñűÖUþ|ŠçâÄ>
2£4ÿ»ŽêÃð	ÑüµNf÷8>áL)ÖZU„²5“”	SÙãI³0duÔÊ÷äf­âóƐcõ~ï˜ÍÒ^UÚ]4)+ƒöã‘)5aQhÑ^¬Ó8>ydk=N$ŠÒH†ŠŽK¢sŠçü+“•)ò¯BÇH*$iirß™ÖVh¾¹õ‚hÈR§CxÒc㺇ŽšR^à_‹ÃÃчý)¢øœÙÉ»å&ÊÁVYØ]ŒW¬šÔ¯øÜûŒ6‘œ¸½N¾¥¶CôDλи’wâ§;ÒAËýãù½:®- ì©aÍ€f€‰‹M™
”˜„pœÏ–[h‰NK,Ì:…•@«Qä,>×TwĶxiJuVb“.>XvŸÙéæ)AbQ aý9ʲ?‚V§Ô@”Æ,º:Q€'¨B„ÏîÁÕñ¤	àüF¨xbÒ|
íÖê~ðуü‹üIôÙ
+—Ó7ê]V옩bÒª¼£
f6ÒÕjÍùÃÀ4>kE’±_)Œªª”’ŸfàŒ`|tº±hO]¶‹û¬NI{2 G%3ˆ6Ôñ˜@³0$¯ì D‹`;.[þ½éš'ž¸&ÝÕõÜ%_ú%;²†Ì 7yÅåÈOð”cãÕ¿x `slRïÓÙ€úüÃu뇡îG‡
f1hÐV3Á䬉`hÉ�…‰|•|ñÌk'‚¡9/(_U/~¥xÍÓS Á5ƒè¹ºƒ}Á�ƒ èFIŽ`ÓP’CÃŒœ	f™úÁø¾„Ÿ•ÝÝÝ»©÷`©º¯Vïz-üNß
kãñúd¬LÉe"ü ¨7y¢8¤t|fÃ]ÛŸá/X4½ï’î[t9;pý)Á/žyå#¬Ã¼èö@~½äò-º ¬þ¨»›dÃ,òGZÎ:õ³ÆS.{äJÞɳ0ÿ.Ÿ‰xÚc`d```dp\úÿSO<¿ÍWy–
@†ó<œz0ú¿Õÿ9¬wY%€\&(�h3ÙxÚc`d``•øß&­þ]f½Ë�A
ó
‰;KxÚcÜÁ Á²
	§ÀØL=¬šq»100Ü„âÅ@>ö€Ð 9¨þŒ_@ìÿŸ fýÿ5“ˆÅ!jþï€`»aXˆ³ jÅz¤ 4#”f
š1ª‡Â³YÐô¡ø†™yIÌ!ö+VÄ®÷ÿl¨~˜Ø(¿‹z˜ùPö	T;u vî²€43ó'’¿Aøg ñ• á�ãçÝ{Šçc	PÜ<Òn@Ú
+H!‡QÍÏ^@,Š¤—*žÄL@Ì
+gEÂ,G ö0€Áÿ
–'€éG(Æ„à&˜dAg@)` ¬ÿsP!HçÿOÿ?
å*
R®|xÚc``ЂÂ4†%ø £
£c�cã*ÆsŒÿ˜Ì˜f0azǬÃìÃü…¥ˆ5…M‰Í…í»ûöS8
88§pqq¹pup½ããžÀýŒÇŽg¯oï*>+¾¾.¾;ü7|:®	ò	ª	NJº%,&Ü'Â#’$²KTMt’X’Ø-qñ6ñMû$u$gHþ‘ò’ª‘Ú&uMꉴˆ´´Ÿt›ô6éÒ_død¢d–ȼ“5’=$' ×%÷FÞM~ü
ùG
+l
+Z
+n
+y
+>)f)QrR:¡\§¼NEDe’Ê3UÕÕ9ª›Tß©E©u¨íS{¡Î§ž¥~NÃB#Ec‡¦™æ­<­7ÚÚ›´é¸èÌÐݧûL/Mo’Þ/}+	ƒm†j†u†—Œ8Œv'O0‘2YdÊbšfºÏLÌ,Æl‹9—y‚ùó?
[,%,#,§Y^±’°Š³j³ºf­c]b}ÏÆÁ&Ã掭‹í
+;
;»=vïì
ìg909$8lqTrìpüàÔäôùÃù›‹K‚Ë<�Qˆí��
���Û�›�������
����
�

����xÚ­RÍNÂ@œ4I8÷àÁ‹
 "ÂÉxÿ‰FÑ£T(•B‰­TŸÂgðâŃGŸ@ßçð`œ]$ÈÁivwöë|³³S�ÌáÄ/ŽÎhÑ×+îzXÃîÖ1‹…#ØóÂQäð©ðnµ¬Â“ÈjO
+O!¡½+#þPx‹ú¼Â3Ä…ãÄg
+¿"¡÷=¼!©ß‡ahÚn·]w,¯å›–×Ä&<´ÑÅ5ب#€GŽ4’Ha…¨Â·vp×]ò;Ă߀ÉÊ\>Ɛ‚/wU®U®Ηdnñæç(¡ˆmžzˆ“W¤–‹‡C}›=GäÛ¸aEœ’bgRz)à„§—ÙW«õSiyDë·Œ‘¾SyŸï=™Á°§’Ôèí¾«u2X’ßt˜Xã\@“ª
j
+NUqr…‰›X•#ÇÜÓXÿã-Ç©ñÕP>&»]~å6};ʵϪ@Íã”é²Bç¢2ÙW™öý¥™‘È3‡¼Ì2Ï,2ƒÿcæÉˆ…��xÚmÕU×”e�FáÙ€`ÝÝ­s¿óÖØóÙÝÝŠ€(*vwwwwawwǁ?Ÿ øÍöÌ÷ä^3kf?ÏÁ5k:c:£Ïß:Eçÿž?;Æ0¶3¶3±3‰q,Âx&°(‹±8K°$™ÄR,Í2,Ûù‹åXžX‘•X™UX•ÕX5X“µX›uX—õXŸ
ؐØ˜MØ”ÍØœ-Ø’­è
+z”TÔ4´ôÙšmØ–í؞ؑÉìĦ2`„Ù…]ٍÝÙƒ=Ù‹½Ù‡}ُý9€9ˆƒ9„C9ŒÃ9‚#9Š£9†c9Žã99‰iLg's
+39•YÌf§1—Ó9ƒyœÉYœÍ|Îá\Îã|.àB.âb.áR.ãr®àJ®âj®áZ®ãznàFnâfnáVnãvîàNîânîá^îã~àAâaáQãqžàIžâižáYžãy^àE^âe^áU^c
¯óoòoóïòïó
òó	ŸòŸó_ò_ó
ßòßó?ò?ó¿ò¿óÇøi3çÏ™ž	ófÍèv»S‡;¹ûïßpãnÏ-ÝÊ­ÝÆmݾ;y¸ÅÈp«‘qƒysg¾¨F¦Œnía_jº£x‰—x‰‡<|àáxø ›®k'vb'¥k/öb/öb¯°WØ+ìö
+{…½Â^a¯°WØëÙëÙëÙëÙëÙëÙëÙëÙëÙëÙ+í•öJ{¥½Ò^i¯´WÚ+í•ö*{•½Ê^e¯²WÙ«ìUö*{•½Ú^m§¶SÛ©íÔvj;µÚNc§ñ^½Æ^c¯±×Økì5ö{­½Ö^k¯µ×ÚkíµöZ{­½Ö^ß^ß^ß^ß^ß^ß^ß^Ø‹î£ûè>Ãß­ÜÚýï{­;¼GôýGÿÑôýGÿÑôýGÿÑôýGÿÑôýGÿÑôýGÿÑôýGÿÑôýGÿÑôýGÿÑôÝG÷Ñ}tÝG÷Ñ}tÝG÷Ñ}tݧ¶§ÿè?úþ£ÿè?úþ£ÿè?úþ£ÿè?úþ£ÿè?úþ£ÿè?úþ£ÿè?úþ£ÿè?úþ£ÿè?ÿ¹ïÛé;ÿ=þ
Ì]3@¸
ÿ…°
�K°PX±

ŽY±F+X!°YK°RX!°€Y°+\XY°+���
RæX®��
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..b04a0e82fffee109e8cd5e48b3f3aa2a9b2aceff
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/bootstrap.min.js
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.isLoading=!1};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",f.resetText||d.data("resetText",d[e]()),d[e](f[b]||this.options[b]),setTimeout(a.proxy(function(){"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},b.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}if(e.hasClass("active"))return this.sliding=!1;var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});return this.$element.trigger(j),j.isDefaultPrevented()?void 0:(this.sliding=!0,f&&this.pause(),this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")?(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(1e3*d.css("transition-duration").slice(0,-1))):(d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")),f&&this.cycle(),this)};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("collapse in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?void this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);!e&&f.toggle&&"show"==c&&(c=!c),e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(jQuery),+function(a){"use strict";function b(b){a(d).remove(),a(e).each(function(){var d=c(a(this)),e={relatedTarget:this};d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown",e)),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown",e))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown",h),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=" li:not(.divider):visible a",i=f.find("[role=menu]"+h+", [role=listbox]"+h);if(i.length){var j=i.index(i.filter(":focus"));38==b.keyCode&&j>0&&j--,40==b.keyCode&&j<i.length-1&&j++,~j||(j=0),i.eq(j).focus()}}}};var g=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new f(this)),"string"==typeof b&&d[b].call(c)})},a.fn.dropdown.Constructor=f,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=g,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",e,f.prototype.toggle).on("keydown.bs.dropdown.data-api",e+", [role=menu], [role=listbox]",f.prototype.keydown)}(jQuery),+function(a){"use strict";var b=function(b,c){this.options=c,this.$element=a(b),this.$backdrop=this.isShown=null,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};b.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},b.prototype.toggle=function(a){return this[this.isShown?"hide":"show"](a)},b.prototype.show=function(b){var c=this,d=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(d),this.isShown||d.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.backdrop(function(){var d=a.support.transition&&c.$element.hasClass("fade");c.$element.parent().length||c.$element.appendTo(document.body),c.$element.show().scrollTop(0),d&&c.$element[0].offsetWidth,c.$element.addClass("in").attr("aria-hidden",!1),c.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:b});d?c.$element.find(".modal-dialog").one(a.support.transition.end,function(){c.$element.focus().trigger(e)}).emulateTransitionEnd(300):c.$element.focus().trigger(e)}))},b.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one(a.support.transition.end,a.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal())},b.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.focus()},this))},b.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keyup.dismiss.bs.modal")},b.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.removeBackdrop(),a.$element.trigger("hidden.bs.modal")})},b.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},b.prototype.backdrop=function(b){var c=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var d=a.support.transition&&c;if(this.$backdrop=a('<div class="modal-backdrop '+c+'" />').appendTo(document.body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data("bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());c.is("a")&&b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this,d=this.tip();this.setContent(),this.options.animation&&d.addClass("fade");var e="function"==typeof this.options.placement?this.options.placement.call(this,d[0],this.$element[0]):this.options.placement,f=/\s?auto?\s?/i,g=f.test(e);g&&(e=e.replace(f,"")||"top"),d.detach().css({top:0,left:0,display:"block"}).addClass(e),this.options.container?d.appendTo(this.options.container):d.insertAfter(this.$element);var h=this.getPosition(),i=d[0].offsetWidth,j=d[0].offsetHeight;if(g){var k=this.$element.parent(),l=e,m=document.documentElement.scrollTop||document.body.scrollTop,n="body"==this.options.container?window.innerWidth:k.outerWidth(),o="body"==this.options.container?window.innerHeight:k.outerHeight(),p="body"==this.options.container?0:k.offset().left;e="bottom"==e&&h.top+h.height+j-m>o?"top":"top"==e&&h.top-m-j<0?"bottom":"right"==e&&h.right+i>n?"left":"left"==e&&h.left-i<p?"right":e,d.removeClass(l).addClass(e)}var q=this.getCalculatedOffset(e,h,i,j);this.applyPlacement(q,e),this.hoverState=null;var r=function(){c.$element.trigger("shown.bs."+c.type)};a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,r).emulateTransitionEnd(150):r()}},b.prototype.applyPlacement=function(b,c){var d,e=this.tip(),f=e[0].offsetWidth,g=e[0].offsetHeight,h=parseInt(e.css("margin-top"),10),i=parseInt(e.css("margin-left"),10);isNaN(h)&&(h=0),isNaN(i)&&(i=0),b.top=b.top+h,b.left=b.left+i,a.offset.setOffset(e[0],a.extend({using:function(a){e.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),e.addClass("in");var j=e[0].offsetWidth,k=e[0].offsetHeight;if("top"==c&&k!=g&&(d=!0,b.top=b.top+g-k),/bottom|top/.test(c)){var l=0;b.left<0&&(l=-2*b.left,b.left=0,e.offset(b),j=e[0].offsetWidth,k=e[0].offsetHeight),this.replaceArrow(l-f+j,j,"left")}else this.replaceArrow(k-g,k,"top");d&&e.offset(b)},b.prototype.replaceArrow=function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},b.prototype.hide=function(){function b(){"in"!=c.hoverState&&d.detach(),c.$element.trigger("hidden.bs."+c.type)}var c=this,d=this.tip(),e=a.Event("hide.bs."+this.type);return this.$element.trigger(e),e.isDefaultPrevented()?void 0:(d.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,b).emulateTransitionEnd(150):b(),this.hoverState=null,this)},b.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},b.prototype.hasContent=function(){return this.getTitle()},b.prototype.getPosition=function(){var b=this.$element[0];return a.extend({},"function"==typeof b.getBoundingClientRect?b.getBoundingClientRect():{width:b.offsetWidth,height:b.offsetHeight},this.$element.offset())},b.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},b.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},b.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},b.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},b.prototype.enable=function(){this.enabled=!0},b.prototype.disable=function(){this.enabled=!1},b.prototype.toggleEnabled=function(){this.enabled=!this.enabled},b.prototype.toggle=function(b){var c=b?a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type):this;c.tip().hasClass("in")?c.leave(c):c.enter(c)},b.prototype.destroy=function(){clearTimeout(this.timeout),this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var c=a.fn.tooltip;a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof c&&c;(e||"destroy"!=c)&&(e||d.data("bs.tooltip",e=new b(this,f)),"string"==typeof c&&e[c]())})},a.fn.tooltip.Constructor=b,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=c,this}}(jQuery),+function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");b.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;(e||"destroy"!=c)&&(e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]())})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(a(c).is("body")?window:c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);{var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})}},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);if(g&&b<=e[0])return g!=(a=f[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parentsUntil(this.options.target,".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(b.RESET).addClass("affix");var a=this.$window.scrollTop(),c=this.$element.offset();return this.pinnedOffset=c.top-a},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"top"==this.affixed&&(e.top+=d),"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top(this.$element)),"function"==typeof h&&(h=f.bottom(this.$element));var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;if(this.affixed!==i){this.unpin&&this.$element.css("top","");var j="affix"+(i?"-"+i:""),k=a.Event(j+".bs.affix");this.$element.trigger(k),k.isDefaultPrevented()||(this.affixed=i,this.unpin="bottom"==i?this.getPinnedOffset():null,this.$element.removeClass(b.RESET).addClass(j).trigger(a.Event(j.replace("affix","affixed"))),"bottom"==i&&this.$element.offset({top:c-h-this.$element.height()}))}}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(jQuery);
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..8cfc9ef3f4917b76800f6783d33197cd8d618f33
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js
@@ -0,0 +1,5 @@
+!function(){function n(n){return null!=n&&!isNaN(n)}function t(n){return n.length}function e(n){for(var t=1;n*t%1;)t*=10;return t}function r(n,t){try{for(var e in t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}catch(r){n.prototype=t}}function u(){}function i(n){return aa+n in this}function o(n){return n=aa+n,n in this&&delete this[n]}function a(){var n=[];return this.forEach(function(t){n.push(t)}),n}function c(){var n=0;for(var t in this)t.charCodeAt(0)===ca&&++n;return n}function s(){for(var n in this)if(n.charCodeAt(0)===ca)return!1;return!0}function l(){}function f(n,t,e){return function(){var r=e.apply(t,arguments);return r===t?n:r}}function h(n,t){if(t in n)return t;t=t.charAt(0).toUpperCase()+t.substring(1);for(var e=0,r=sa.length;r>e;++e){var u=sa[e]+t;if(u in n)return u}}function g(){}function p(){}function v(n){function t(){for(var t,r=e,u=-1,i=r.length;++u<i;)(t=r[u].on)&&t.apply(this,arguments);return n}var e=[],r=new u;return t.on=function(t,u){var i,o=r.get(t);return arguments.length<2?o&&o.on:(o&&(o.on=null,e=e.slice(0,i=e.indexOf(o)).concat(e.slice(i+1)),r.remove(t)),u&&e.push(r.set(t,{on:u})),n)},t}function d(){Xo.event.preventDefault()}function m(){for(var n,t=Xo.event;n=t.sourceEvent;)t=n;return t}function y(n){for(var t=new p,e=0,r=arguments.length;++e<r;)t[arguments[e]]=v(t);return t.of=function(e,r){return function(u){try{var i=u.sourceEvent=Xo.event;u.target=n,Xo.event=u,t[u.type].apply(e,r)}finally{Xo.event=i}}},t}function x(n){return fa(n,da),n}function M(n){return"function"==typeof n?n:function(){return ha(n,this)}}function _(n){return"function"==typeof n?n:function(){return ga(n,this)}}function b(n,t){function e(){this.removeAttribute(n)}function r(){this.removeAttributeNS(n.space,n.local)}function u(){this.setAttribute(n,t)}function i(){this.setAttributeNS(n.space,n.local,t)}function o(){var e=t.apply(this,arguments);null==e?this.removeAttribute(n):this.setAttribute(n,e)}function a(){var e=t.apply(this,arguments);null==e?this.removeAttributeNS(n.space,n.local):this.setAttributeNS(n.space,n.local,e)}return n=Xo.ns.qualify(n),null==t?n.local?r:e:"function"==typeof t?n.local?a:o:n.local?i:u}function w(n){return n.trim().replace(/\s+/g," ")}function S(n){return new RegExp("(?:^|\\s+)"+Xo.requote(n)+"(?:\\s+|$)","g")}function k(n){return n.trim().split(/^|\s+/)}function E(n,t){function e(){for(var e=-1;++e<u;)n[e](this,t)}function r(){for(var e=-1,r=t.apply(this,arguments);++e<u;)n[e](this,r)}n=k(n).map(A);var u=n.length;return"function"==typeof t?r:e}function A(n){var t=S(n);return function(e,r){if(u=e.classList)return r?u.add(n):u.remove(n);var u=e.getAttribute("class")||"";r?(t.lastIndex=0,t.test(u)||e.setAttribute("class",w(u+" "+n))):e.setAttribute("class",w(u.replace(t," ")))}}function C(n,t,e){function r(){this.style.removeProperty(n)}function u(){this.style.setProperty(n,t,e)}function i(){var r=t.apply(this,arguments);null==r?this.style.removeProperty(n):this.style.setProperty(n,r,e)}return null==t?r:"function"==typeof t?i:u}function N(n,t){function e(){delete this[n]}function r(){this[n]=t}function u(){var e=t.apply(this,arguments);null==e?delete this[n]:this[n]=e}return null==t?e:"function"==typeof t?u:r}function L(n){return"function"==typeof n?n:(n=Xo.ns.qualify(n)).local?function(){return this.ownerDocument.createElementNS(n.space,n.local)}:function(){return this.ownerDocument.createElementNS(this.namespaceURI,n)}}function z(n){return{__data__:n}}function q(n){return function(){return va(this,n)}}function T(n){return arguments.length||(n=Xo.ascending),function(t,e){return t&&e?n(t.__data__,e.__data__):!t-!e}}function R(n,t){for(var e=0,r=n.length;r>e;e++)for(var u,i=n[e],o=0,a=i.length;a>o;o++)(u=i[o])&&t(u,o,e);return n}function D(n){return fa(n,ya),n}function P(n){var t,e;return function(r,u,i){var o,a=n[i].update,c=a.length;for(i!=e&&(e=i,t=0),u>=t&&(t=u+1);!(o=a[t])&&++t<c;);return o}}function U(){var n=this.__transition__;n&&++n.active}function j(n,t,e){function r(){var t=this[o];t&&(this.removeEventListener(n,t,t.$),delete this[o])}function u(){var u=c(t,Bo(arguments));r.call(this),this.addEventListener(n,this[o]=u,u.$=e),u._=t}function i(){var t,e=new RegExp("^__on([^.]+)"+Xo.requote(n)+"$");for(var r in this)if(t=r.match(e)){var u=this[r];this.removeEventListener(t[1],u,u.$),delete this[r]}}var o="__on"+n,a=n.indexOf("."),c=H;a>0&&(n=n.substring(0,a));var s=Ma.get(n);return s&&(n=s,c=F),a?t?u:r:t?g:i}function H(n,t){return function(e){var r=Xo.event;Xo.event=e,t[0]=this.__data__;try{n.apply(this,t)}finally{Xo.event=r}}}function F(n,t){var e=H(n,t);return function(n){var t=this,r=n.relatedTarget;r&&(r===t||8&r.compareDocumentPosition(t))||e.call(t,n)}}function O(){var n=".dragsuppress-"+ ++ba,t="click"+n,e=Xo.select(Go).on("touchmove"+n,d).on("dragstart"+n,d).on("selectstart"+n,d);if(_a){var r=Jo.style,u=r[_a];r[_a]="none"}return function(i){function o(){e.on(t,null)}e.on(n,null),_a&&(r[_a]=u),i&&(e.on(t,function(){d(),o()},!0),setTimeout(o,0))}}function Y(n,t){t.changedTouches&&(t=t.changedTouches[0]);var e=n.ownerSVGElement||n;if(e.createSVGPoint){var r=e.createSVGPoint();if(0>wa&&(Go.scrollX||Go.scrollY)){e=Xo.select("body").append("svg").style({position:"absolute",top:0,left:0,margin:0,padding:0,border:"none"},"important");var u=e[0][0].getScreenCTM();wa=!(u.f||u.e),e.remove()}return wa?(r.x=t.pageX,r.y=t.pageY):(r.x=t.clientX,r.y=t.clientY),r=r.matrixTransform(n.getScreenCTM().inverse()),[r.x,r.y]}var i=n.getBoundingClientRect();return[t.clientX-i.left-n.clientLeft,t.clientY-i.top-n.clientTop]}function I(n){return n>0?1:0>n?-1:0}function Z(n,t,e){return(t[0]-n[0])*(e[1]-n[1])-(t[1]-n[1])*(e[0]-n[0])}function V(n){return n>1?0:-1>n?Sa:Math.acos(n)}function X(n){return n>1?Ea:-1>n?-Ea:Math.asin(n)}function $(n){return((n=Math.exp(n))-1/n)/2}function B(n){return((n=Math.exp(n))+1/n)/2}function W(n){return((n=Math.exp(2*n))-1)/(n+1)}function J(n){return(n=Math.sin(n/2))*n}function G(){}function K(n,t,e){return new Q(n,t,e)}function Q(n,t,e){this.h=n,this.s=t,this.l=e}function nt(n,t,e){function r(n){return n>360?n-=360:0>n&&(n+=360),60>n?i+(o-i)*n/60:180>n?o:240>n?i+(o-i)*(240-n)/60:i}function u(n){return Math.round(255*r(n))}var i,o;return n=isNaN(n)?0:(n%=360)<0?n+360:n,t=isNaN(t)?0:0>t?0:t>1?1:t,e=0>e?0:e>1?1:e,o=.5>=e?e*(1+t):e+t-e*t,i=2*e-o,gt(u(n+120),u(n),u(n-120))}function tt(n,t,e){return new et(n,t,e)}function et(n,t,e){this.h=n,this.c=t,this.l=e}function rt(n,t,e){return isNaN(n)&&(n=0),isNaN(t)&&(t=0),ut(e,Math.cos(n*=Na)*t,Math.sin(n)*t)}function ut(n,t,e){return new it(n,t,e)}function it(n,t,e){this.l=n,this.a=t,this.b=e}function ot(n,t,e){var r=(n+16)/116,u=r+t/500,i=r-e/200;return u=ct(u)*Fa,r=ct(r)*Oa,i=ct(i)*Ya,gt(lt(3.2404542*u-1.5371385*r-.4985314*i),lt(-.969266*u+1.8760108*r+.041556*i),lt(.0556434*u-.2040259*r+1.0572252*i))}function at(n,t,e){return n>0?tt(Math.atan2(e,t)*La,Math.sqrt(t*t+e*e),n):tt(0/0,0/0,n)}function ct(n){return n>.206893034?n*n*n:(n-4/29)/7.787037}function st(n){return n>.008856?Math.pow(n,1/3):7.787037*n+4/29}function lt(n){return Math.round(255*(.00304>=n?12.92*n:1.055*Math.pow(n,1/2.4)-.055))}function ft(n){return gt(n>>16,255&n>>8,255&n)}function ht(n){return ft(n)+""}function gt(n,t,e){return new pt(n,t,e)}function pt(n,t,e){this.r=n,this.g=t,this.b=e}function vt(n){return 16>n?"0"+Math.max(0,n).toString(16):Math.min(255,n).toString(16)}function dt(n,t,e){var r,u,i,o=0,a=0,c=0;if(r=/([a-z]+)\((.*)\)/i.exec(n))switch(u=r[2].split(","),r[1]){case"hsl":return e(parseFloat(u[0]),parseFloat(u[1])/100,parseFloat(u[2])/100);case"rgb":return t(Mt(u[0]),Mt(u[1]),Mt(u[2]))}return(i=Va.get(n))?t(i.r,i.g,i.b):(null!=n&&"#"===n.charAt(0)&&(4===n.length?(o=n.charAt(1),o+=o,a=n.charAt(2),a+=a,c=n.charAt(3),c+=c):7===n.length&&(o=n.substring(1,3),a=n.substring(3,5),c=n.substring(5,7)),o=parseInt(o,16),a=parseInt(a,16),c=parseInt(c,16)),t(o,a,c))}function mt(n,t,e){var r,u,i=Math.min(n/=255,t/=255,e/=255),o=Math.max(n,t,e),a=o-i,c=(o+i)/2;return a?(u=.5>c?a/(o+i):a/(2-o-i),r=n==o?(t-e)/a+(e>t?6:0):t==o?(e-n)/a+2:(n-t)/a+4,r*=60):(r=0/0,u=c>0&&1>c?0:r),K(r,u,c)}function yt(n,t,e){n=xt(n),t=xt(t),e=xt(e);var r=st((.4124564*n+.3575761*t+.1804375*e)/Fa),u=st((.2126729*n+.7151522*t+.072175*e)/Oa),i=st((.0193339*n+.119192*t+.9503041*e)/Ya);return ut(116*u-16,500*(r-u),200*(u-i))}function xt(n){return(n/=255)<=.04045?n/12.92:Math.pow((n+.055)/1.055,2.4)}function Mt(n){var t=parseFloat(n);return"%"===n.charAt(n.length-1)?Math.round(2.55*t):t}function _t(n){return"function"==typeof n?n:function(){return n}}function bt(n){return n}function wt(n){return function(t,e,r){return 2===arguments.length&&"function"==typeof e&&(r=e,e=null),St(t,e,n,r)}}function St(n,t,e,r){function u(){var n,t=c.status;if(!t&&c.responseText||t>=200&&300>t||304===t){try{n=e.call(i,c)}catch(r){return o.error.call(i,r),void 0}o.load.call(i,n)}else o.error.call(i,c)}var i={},o=Xo.dispatch("beforesend","progress","load","error"),a={},c=new XMLHttpRequest,s=null;return!Go.XDomainRequest||"withCredentials"in c||!/^(http(s)?:)?\/\//.test(n)||(c=new XDomainRequest),"onload"in c?c.onload=c.onerror=u:c.onreadystatechange=function(){c.readyState>3&&u()},c.onprogress=function(n){var t=Xo.event;Xo.event=n;try{o.progress.call(i,c)}finally{Xo.event=t}},i.header=function(n,t){return n=(n+"").toLowerCase(),arguments.length<2?a[n]:(null==t?delete a[n]:a[n]=t+"",i)},i.mimeType=function(n){return arguments.length?(t=null==n?null:n+"",i):t},i.responseType=function(n){return arguments.length?(s=n,i):s},i.response=function(n){return e=n,i},["get","post"].forEach(function(n){i[n]=function(){return i.send.apply(i,[n].concat(Bo(arguments)))}}),i.send=function(e,r,u){if(2===arguments.length&&"function"==typeof r&&(u=r,r=null),c.open(e,n,!0),null==t||"accept"in a||(a.accept=t+",*/*"),c.setRequestHeader)for(var l in a)c.setRequestHeader(l,a[l]);return null!=t&&c.overrideMimeType&&c.overrideMimeType(t),null!=s&&(c.responseType=s),null!=u&&i.on("error",u).on("load",function(n){u(null,n)}),o.beforesend.call(i,c),c.send(null==r?null:r),i},i.abort=function(){return c.abort(),i},Xo.rebind(i,o,"on"),null==r?i:i.get(kt(r))}function kt(n){return 1===n.length?function(t,e){n(null==t?e:null)}:n}function Et(){var n=At(),t=Ct()-n;t>24?(isFinite(t)&&(clearTimeout(Wa),Wa=setTimeout(Et,t)),Ba=0):(Ba=1,Ga(Et))}function At(){var n=Date.now();for(Ja=Xa;Ja;)n>=Ja.t&&(Ja.f=Ja.c(n-Ja.t)),Ja=Ja.n;return n}function Ct(){for(var n,t=Xa,e=1/0;t;)t.f?t=n?n.n=t.n:Xa=t.n:(t.t<e&&(e=t.t),t=(n=t).n);return $a=n,e}function Nt(n,t){return t-(n?Math.ceil(Math.log(n)/Math.LN10):1)}function Lt(n,t){var e=Math.pow(10,3*oa(8-t));return{scale:t>8?function(n){return n/e}:function(n){return n*e},symbol:n}}function zt(n){var t=n.decimal,e=n.thousands,r=n.grouping,u=n.currency,i=r?function(n){for(var t=n.length,u=[],i=0,o=r[0];t>0&&o>0;)u.push(n.substring(t-=o,t+o)),o=r[i=(i+1)%r.length];return u.reverse().join(e)}:bt;return function(n){var e=Qa.exec(n),r=e[1]||" ",o=e[2]||">",a=e[3]||"",c=e[4]||"",s=e[5],l=+e[6],f=e[7],h=e[8],g=e[9],p=1,v="",d="",m=!1;switch(h&&(h=+h.substring(1)),(s||"0"===r&&"="===o)&&(s=r="0",o="=",f&&(l-=Math.floor((l-1)/4))),g){case"n":f=!0,g="g";break;case"%":p=100,d="%",g="f";break;case"p":p=100,d="%",g="r";break;case"b":case"o":case"x":case"X":"#"===c&&(v="0"+g.toLowerCase());case"c":case"d":m=!0,h=0;break;case"s":p=-1,g="r"}"$"===c&&(v=u[0],d=u[1]),"r"!=g||h||(g="g"),null!=h&&("g"==g?h=Math.max(1,Math.min(21,h)):("e"==g||"f"==g)&&(h=Math.max(0,Math.min(20,h)))),g=nc.get(g)||qt;var y=s&&f;return function(n){if(m&&n%1)return"";var e=0>n||0===n&&0>1/n?(n=-n,"-"):a;if(0>p){var u=Xo.formatPrefix(n,h);n=u.scale(n),d=u.symbol}else n*=p;n=g(n,h);var c=n.lastIndexOf("."),x=0>c?n:n.substring(0,c),M=0>c?"":t+n.substring(c+1);!s&&f&&(x=i(x));var _=v.length+x.length+M.length+(y?0:e.length),b=l>_?new Array(_=l-_+1).join(r):"";return y&&(x=i(b+x)),e+=v,n=x+M,("<"===o?e+n+b:">"===o?b+e+n:"^"===o?b.substring(0,_>>=1)+e+n+b.substring(_):e+(y?n:b+n))+d}}}function qt(n){return n+""}function Tt(){this._=new Date(arguments.length>1?Date.UTC.apply(this,arguments):arguments[0])}function Rt(n,t,e){function r(t){var e=n(t),r=i(e,1);return r-t>t-e?e:r}function u(e){return t(e=n(new ec(e-1)),1),e}function i(n,e){return t(n=new ec(+n),e),n}function o(n,r,i){var o=u(n),a=[];if(i>1)for(;r>o;)e(o)%i||a.push(new Date(+o)),t(o,1);else for(;r>o;)a.push(new Date(+o)),t(o,1);return a}function a(n,t,e){try{ec=Tt;var r=new Tt;return r._=n,o(r,t,e)}finally{ec=Date}}n.floor=n,n.round=r,n.ceil=u,n.offset=i,n.range=o;var c=n.utc=Dt(n);return c.floor=c,c.round=Dt(r),c.ceil=Dt(u),c.offset=Dt(i),c.range=a,n}function Dt(n){return function(t,e){try{ec=Tt;var r=new Tt;return r._=t,n(r,e)._}finally{ec=Date}}}function Pt(n){function t(n){function t(t){for(var e,u,i,o=[],a=-1,c=0;++a<r;)37===n.charCodeAt(a)&&(o.push(n.substring(c,a)),null!=(u=uc[e=n.charAt(++a)])&&(e=n.charAt(++a)),(i=C[e])&&(e=i(t,null==u?"e"===e?" ":"0":u)),o.push(e),c=a+1);return o.push(n.substring(c,a)),o.join("")}var r=n.length;return t.parse=function(t){var r={y:1900,m:0,d:1,H:0,M:0,S:0,L:0,Z:null},u=e(r,n,t,0);if(u!=t.length)return null;"p"in r&&(r.H=r.H%12+12*r.p);var i=null!=r.Z&&ec!==Tt,o=new(i?Tt:ec);return"j"in r?o.setFullYear(r.y,0,r.j):"w"in r&&("W"in r||"U"in r)?(o.setFullYear(r.y,0,1),o.setFullYear(r.y,0,"W"in r?(r.w+6)%7+7*r.W-(o.getDay()+5)%7:r.w+7*r.U-(o.getDay()+6)%7)):o.setFullYear(r.y,r.m,r.d),o.setHours(r.H+Math.floor(r.Z/100),r.M+r.Z%100,r.S,r.L),i?o._:o},t.toString=function(){return n},t}function e(n,t,e,r){for(var u,i,o,a=0,c=t.length,s=e.length;c>a;){if(r>=s)return-1;if(u=t.charCodeAt(a++),37===u){if(o=t.charAt(a++),i=N[o in uc?t.charAt(a++):o],!i||(r=i(n,e,r))<0)return-1}else if(u!=e.charCodeAt(r++))return-1}return r}function r(n,t,e){b.lastIndex=0;var r=b.exec(t.substring(e));return r?(n.w=w.get(r[0].toLowerCase()),e+r[0].length):-1}function u(n,t,e){M.lastIndex=0;var r=M.exec(t.substring(e));return r?(n.w=_.get(r[0].toLowerCase()),e+r[0].length):-1}function i(n,t,e){E.lastIndex=0;var r=E.exec(t.substring(e));return r?(n.m=A.get(r[0].toLowerCase()),e+r[0].length):-1}function o(n,t,e){S.lastIndex=0;var r=S.exec(t.substring(e));return r?(n.m=k.get(r[0].toLowerCase()),e+r[0].length):-1}function a(n,t,r){return e(n,C.c.toString(),t,r)}function c(n,t,r){return e(n,C.x.toString(),t,r)}function s(n,t,r){return e(n,C.X.toString(),t,r)}function l(n,t,e){var r=x.get(t.substring(e,e+=2).toLowerCase());return null==r?-1:(n.p=r,e)}var f=n.dateTime,h=n.date,g=n.time,p=n.periods,v=n.days,d=n.shortDays,m=n.months,y=n.shortMonths;t.utc=function(n){function e(n){try{ec=Tt;var t=new ec;return t._=n,r(t)}finally{ec=Date}}var r=t(n);return e.parse=function(n){try{ec=Tt;var t=r.parse(n);return t&&t._}finally{ec=Date}},e.toString=r.toString,e},t.multi=t.utc.multi=ee;var x=Xo.map(),M=jt(v),_=Ht(v),b=jt(d),w=Ht(d),S=jt(m),k=Ht(m),E=jt(y),A=Ht(y);p.forEach(function(n,t){x.set(n.toLowerCase(),t)});var C={a:function(n){return d[n.getDay()]},A:function(n){return v[n.getDay()]},b:function(n){return y[n.getMonth()]},B:function(n){return m[n.getMonth()]},c:t(f),d:function(n,t){return Ut(n.getDate(),t,2)},e:function(n,t){return Ut(n.getDate(),t,2)},H:function(n,t){return Ut(n.getHours(),t,2)},I:function(n,t){return Ut(n.getHours()%12||12,t,2)},j:function(n,t){return Ut(1+tc.dayOfYear(n),t,3)},L:function(n,t){return Ut(n.getMilliseconds(),t,3)},m:function(n,t){return Ut(n.getMonth()+1,t,2)},M:function(n,t){return Ut(n.getMinutes(),t,2)},p:function(n){return p[+(n.getHours()>=12)]},S:function(n,t){return Ut(n.getSeconds(),t,2)},U:function(n,t){return Ut(tc.sundayOfYear(n),t,2)},w:function(n){return n.getDay()},W:function(n,t){return Ut(tc.mondayOfYear(n),t,2)},x:t(h),X:t(g),y:function(n,t){return Ut(n.getFullYear()%100,t,2)},Y:function(n,t){return Ut(n.getFullYear()%1e4,t,4)},Z:ne,"%":function(){return"%"}},N={a:r,A:u,b:i,B:o,c:a,d:Bt,e:Bt,H:Jt,I:Jt,j:Wt,L:Qt,m:$t,M:Gt,p:l,S:Kt,U:Ot,w:Ft,W:Yt,x:c,X:s,y:Zt,Y:It,Z:Vt,"%":te};return t}function Ut(n,t,e){var r=0>n?"-":"",u=(r?-n:n)+"",i=u.length;return r+(e>i?new Array(e-i+1).join(t)+u:u)}function jt(n){return new RegExp("^(?:"+n.map(Xo.requote).join("|")+")","i")}function Ht(n){for(var t=new u,e=-1,r=n.length;++e<r;)t.set(n[e].toLowerCase(),e);return t}function Ft(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+1));return r?(n.w=+r[0],e+r[0].length):-1}function Ot(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e));return r?(n.U=+r[0],e+r[0].length):-1}function Yt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e));return r?(n.W=+r[0],e+r[0].length):-1}function It(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+4));return r?(n.y=+r[0],e+r[0].length):-1}function Zt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.y=Xt(+r[0]),e+r[0].length):-1}function Vt(n,t,e){return/^[+-]\d{4}$/.test(t=t.substring(e,e+5))?(n.Z=+t,e+5):-1}function Xt(n){return n+(n>68?1900:2e3)}function $t(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.m=r[0]-1,e+r[0].length):-1}function Bt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.d=+r[0],e+r[0].length):-1}function Wt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+3));return r?(n.j=+r[0],e+r[0].length):-1}function Jt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.H=+r[0],e+r[0].length):-1}function Gt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.M=+r[0],e+r[0].length):-1}function Kt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+2));return r?(n.S=+r[0],e+r[0].length):-1}function Qt(n,t,e){ic.lastIndex=0;var r=ic.exec(t.substring(e,e+3));return r?(n.L=+r[0],e+r[0].length):-1}function ne(n){var t=n.getTimezoneOffset(),e=t>0?"-":"+",r=~~(oa(t)/60),u=oa(t)%60;return e+Ut(r,"0",2)+Ut(u,"0",2)}function te(n,t,e){oc.lastIndex=0;var r=oc.exec(t.substring(e,e+1));return r?e+r[0].length:-1}function ee(n){for(var t=n.length,e=-1;++e<t;)n[e][0]=this(n[e][0]);return function(t){for(var e=0,r=n[e];!r[1](t);)r=n[++e];return r[0](t)}}function re(){}function ue(n,t,e){var r=e.s=n+t,u=r-n,i=r-u;e.t=n-i+(t-u)}function ie(n,t){n&&lc.hasOwnProperty(n.type)&&lc[n.type](n,t)}function oe(n,t,e){var r,u=-1,i=n.length-e;for(t.lineStart();++u<i;)r=n[u],t.point(r[0],r[1],r[2]);t.lineEnd()}function ae(n,t){var e=-1,r=n.length;for(t.polygonStart();++e<r;)oe(n[e],t,1);t.polygonEnd()}function ce(){function n(n,t){n*=Na,t=t*Na/2+Sa/4;var e=n-r,o=Math.cos(t),a=Math.sin(t),c=i*a,s=u*o+c*Math.cos(e),l=c*Math.sin(e);hc.add(Math.atan2(l,s)),r=n,u=o,i=a}var t,e,r,u,i;gc.point=function(o,a){gc.point=n,r=(t=o)*Na,u=Math.cos(a=(e=a)*Na/2+Sa/4),i=Math.sin(a)},gc.lineEnd=function(){n(t,e)}}function se(n){var t=n[0],e=n[1],r=Math.cos(e);return[r*Math.cos(t),r*Math.sin(t),Math.sin(e)]}function le(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]}function fe(n,t){return[n[1]*t[2]-n[2]*t[1],n[2]*t[0]-n[0]*t[2],n[0]*t[1]-n[1]*t[0]]}function he(n,t){n[0]+=t[0],n[1]+=t[1],n[2]+=t[2]}function ge(n,t){return[n[0]*t,n[1]*t,n[2]*t]}function pe(n){var t=Math.sqrt(n[0]*n[0]+n[1]*n[1]+n[2]*n[2]);n[0]/=t,n[1]/=t,n[2]/=t}function ve(n){return[Math.atan2(n[1],n[0]),X(n[2])]}function de(n,t){return oa(n[0]-t[0])<Aa&&oa(n[1]-t[1])<Aa}function me(n,t){n*=Na;var e=Math.cos(t*=Na);ye(e*Math.cos(n),e*Math.sin(n),Math.sin(t))}function ye(n,t,e){++pc,dc+=(n-dc)/pc,mc+=(t-mc)/pc,yc+=(e-yc)/pc}function xe(){function n(n,u){n*=Na;var i=Math.cos(u*=Na),o=i*Math.cos(n),a=i*Math.sin(n),c=Math.sin(u),s=Math.atan2(Math.sqrt((s=e*c-r*a)*s+(s=r*o-t*c)*s+(s=t*a-e*o)*s),t*o+e*a+r*c);vc+=s,xc+=s*(t+(t=o)),Mc+=s*(e+(e=a)),_c+=s*(r+(r=c)),ye(t,e,r)}var t,e,r;kc.point=function(u,i){u*=Na;var o=Math.cos(i*=Na);t=o*Math.cos(u),e=o*Math.sin(u),r=Math.sin(i),kc.point=n,ye(t,e,r)}}function Me(){kc.point=me}function _e(){function n(n,t){n*=Na;var e=Math.cos(t*=Na),o=e*Math.cos(n),a=e*Math.sin(n),c=Math.sin(t),s=u*c-i*a,l=i*o-r*c,f=r*a-u*o,h=Math.sqrt(s*s+l*l+f*f),g=r*o+u*a+i*c,p=h&&-V(g)/h,v=Math.atan2(h,g);bc+=p*s,wc+=p*l,Sc+=p*f,vc+=v,xc+=v*(r+(r=o)),Mc+=v*(u+(u=a)),_c+=v*(i+(i=c)),ye(r,u,i)}var t,e,r,u,i;kc.point=function(o,a){t=o,e=a,kc.point=n,o*=Na;var c=Math.cos(a*=Na);r=c*Math.cos(o),u=c*Math.sin(o),i=Math.sin(a),ye(r,u,i)},kc.lineEnd=function(){n(t,e),kc.lineEnd=Me,kc.point=me}}function be(){return!0}function we(n,t,e,r,u){var i=[],o=[];if(n.forEach(function(n){if(!((t=n.length-1)<=0)){var t,e=n[0],r=n[t];if(de(e,r)){u.lineStart();for(var a=0;t>a;++a)u.point((e=n[a])[0],e[1]);return u.lineEnd(),void 0}var c=new ke(e,n,null,!0),s=new ke(e,null,c,!1);c.o=s,i.push(c),o.push(s),c=new ke(r,n,null,!1),s=new ke(r,null,c,!0),c.o=s,i.push(c),o.push(s)}}),o.sort(t),Se(i),Se(o),i.length){for(var a=0,c=e,s=o.length;s>a;++a)o[a].e=c=!c;for(var l,f,h=i[0];;){for(var g=h,p=!0;g.v;)if((g=g.n)===h)return;l=g.z,u.lineStart();do{if(g.v=g.o.v=!0,g.e){if(p)for(var a=0,s=l.length;s>a;++a)u.point((f=l[a])[0],f[1]);else r(g.x,g.n.x,1,u);g=g.n}else{if(p){l=g.p.z;for(var a=l.length-1;a>=0;--a)u.point((f=l[a])[0],f[1])}else r(g.x,g.p.x,-1,u);g=g.p}g=g.o,l=g.z,p=!p}while(!g.v);u.lineEnd()}}}function Se(n){if(t=n.length){for(var t,e,r=0,u=n[0];++r<t;)u.n=e=n[r],e.p=u,u=e;u.n=e=n[0],e.p=u}}function ke(n,t,e,r){this.x=n,this.z=t,this.o=e,this.e=r,this.v=!1,this.n=this.p=null}function Ee(n,t,e,r){return function(u,i){function o(t,e){var r=u(t,e);n(t=r[0],e=r[1])&&i.point(t,e)}function a(n,t){var e=u(n,t);d.point(e[0],e[1])}function c(){y.point=a,d.lineStart()}function s(){y.point=o,d.lineEnd()}function l(n,t){v.push([n,t]);var e=u(n,t);M.point(e[0],e[1])}function f(){M.lineStart(),v=[]}function h(){l(v[0][0],v[0][1]),M.lineEnd();var n,t=M.clean(),e=x.buffer(),r=e.length;if(v.pop(),p.push(v),v=null,r){if(1&t){n=e[0];var u,r=n.length-1,o=-1;for(i.lineStart();++o<r;)i.point((u=n[o])[0],u[1]);return i.lineEnd(),void 0}r>1&&2&t&&e.push(e.pop().concat(e.shift())),g.push(e.filter(Ae))}}var g,p,v,d=t(i),m=u.invert(r[0],r[1]),y={point:o,lineStart:c,lineEnd:s,polygonStart:function(){y.point=l,y.lineStart=f,y.lineEnd=h,g=[],p=[],i.polygonStart()},polygonEnd:function(){y.point=o,y.lineStart=c,y.lineEnd=s,g=Xo.merge(g);var n=Le(m,p);g.length?we(g,Ne,n,e,i):n&&(i.lineStart(),e(null,null,1,i),i.lineEnd()),i.polygonEnd(),g=p=null},sphere:function(){i.polygonStart(),i.lineStart(),e(null,null,1,i),i.lineEnd(),i.polygonEnd()}},x=Ce(),M=t(x);return y}}function Ae(n){return n.length>1}function Ce(){var n,t=[];return{lineStart:function(){t.push(n=[])},point:function(t,e){n.push([t,e])},lineEnd:g,buffer:function(){var e=t;return t=[],n=null,e},rejoin:function(){t.length>1&&t.push(t.pop().concat(t.shift()))}}}function Ne(n,t){return((n=n.x)[0]<0?n[1]-Ea-Aa:Ea-n[1])-((t=t.x)[0]<0?t[1]-Ea-Aa:Ea-t[1])}function Le(n,t){var e=n[0],r=n[1],u=[Math.sin(e),-Math.cos(e),0],i=0,o=0;hc.reset();for(var a=0,c=t.length;c>a;++a){var s=t[a],l=s.length;if(l)for(var f=s[0],h=f[0],g=f[1]/2+Sa/4,p=Math.sin(g),v=Math.cos(g),d=1;;){d===l&&(d=0),n=s[d];var m=n[0],y=n[1]/2+Sa/4,x=Math.sin(y),M=Math.cos(y),_=m-h,b=oa(_)>Sa,w=p*x;if(hc.add(Math.atan2(w*Math.sin(_),v*M+w*Math.cos(_))),i+=b?_+(_>=0?ka:-ka):_,b^h>=e^m>=e){var S=fe(se(f),se(n));pe(S);var k=fe(u,S);pe(k);var E=(b^_>=0?-1:1)*X(k[2]);(r>E||r===E&&(S[0]||S[1]))&&(o+=b^_>=0?1:-1)}if(!d++)break;h=m,p=x,v=M,f=n}}return(-Aa>i||Aa>i&&0>hc)^1&o}function ze(n){var t,e=0/0,r=0/0,u=0/0;return{lineStart:function(){n.lineStart(),t=1},point:function(i,o){var a=i>0?Sa:-Sa,c=oa(i-e);oa(c-Sa)<Aa?(n.point(e,r=(r+o)/2>0?Ea:-Ea),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),n.point(i,r),t=0):u!==a&&c>=Sa&&(oa(e-u)<Aa&&(e-=u*Aa),oa(i-a)<Aa&&(i-=a*Aa),r=qe(e,r,i,o),n.point(u,r),n.lineEnd(),n.lineStart(),n.point(a,r),t=0),n.point(e=i,r=o),u=a},lineEnd:function(){n.lineEnd(),e=r=0/0},clean:function(){return 2-t}}}function qe(n,t,e,r){var u,i,o=Math.sin(n-e);return oa(o)>Aa?Math.atan((Math.sin(t)*(i=Math.cos(r))*Math.sin(e)-Math.sin(r)*(u=Math.cos(t))*Math.sin(n))/(u*i*o)):(t+r)/2}function Te(n,t,e,r){var u;if(null==n)u=e*Ea,r.point(-Sa,u),r.point(0,u),r.point(Sa,u),r.point(Sa,0),r.point(Sa,-u),r.point(0,-u),r.point(-Sa,-u),r.point(-Sa,0),r.point(-Sa,u);else if(oa(n[0]-t[0])>Aa){var i=n[0]<t[0]?Sa:-Sa;u=e*i/2,r.point(-i,u),r.point(0,u),r.point(i,u)}else r.point(t[0],t[1])}function Re(n){function t(n,t){return Math.cos(n)*Math.cos(t)>i}function e(n){var e,i,c,s,l;return{lineStart:function(){s=c=!1,l=1},point:function(f,h){var g,p=[f,h],v=t(f,h),d=o?v?0:u(f,h):v?u(f+(0>f?Sa:-Sa),h):0;if(!e&&(s=c=v)&&n.lineStart(),v!==c&&(g=r(e,p),(de(e,g)||de(p,g))&&(p[0]+=Aa,p[1]+=Aa,v=t(p[0],p[1]))),v!==c)l=0,v?(n.lineStart(),g=r(p,e),n.point(g[0],g[1])):(g=r(e,p),n.point(g[0],g[1]),n.lineEnd()),e=g;else if(a&&e&&o^v){var m;d&i||!(m=r(p,e,!0))||(l=0,o?(n.lineStart(),n.point(m[0][0],m[0][1]),n.point(m[1][0],m[1][1]),n.lineEnd()):(n.point(m[1][0],m[1][1]),n.lineEnd(),n.lineStart(),n.point(m[0][0],m[0][1])))}!v||e&&de(e,p)||n.point(p[0],p[1]),e=p,c=v,i=d},lineEnd:function(){c&&n.lineEnd(),e=null},clean:function(){return l|(s&&c)<<1}}}function r(n,t,e){var r=se(n),u=se(t),o=[1,0,0],a=fe(r,u),c=le(a,a),s=a[0],l=c-s*s;if(!l)return!e&&n;var f=i*c/l,h=-i*s/l,g=fe(o,a),p=ge(o,f),v=ge(a,h);he(p,v);var d=g,m=le(p,d),y=le(d,d),x=m*m-y*(le(p,p)-1);if(!(0>x)){var M=Math.sqrt(x),_=ge(d,(-m-M)/y);if(he(_,p),_=ve(_),!e)return _;var b,w=n[0],S=t[0],k=n[1],E=t[1];w>S&&(b=w,w=S,S=b);var A=S-w,C=oa(A-Sa)<Aa,N=C||Aa>A;if(!C&&k>E&&(b=k,k=E,E=b),N?C?k+E>0^_[1]<(oa(_[0]-w)<Aa?k:E):k<=_[1]&&_[1]<=E:A>Sa^(w<=_[0]&&_[0]<=S)){var L=ge(d,(-m+M)/y);return he(L,p),[_,ve(L)]}}}function u(t,e){var r=o?n:Sa-n,u=0;return-r>t?u|=1:t>r&&(u|=2),-r>e?u|=4:e>r&&(u|=8),u}var i=Math.cos(n),o=i>0,a=oa(i)>Aa,c=cr(n,6*Na);return Ee(t,e,c,o?[0,-n]:[-Sa,n-Sa])}function De(n,t,e,r){return function(u){var i,o=u.a,a=u.b,c=o.x,s=o.y,l=a.x,f=a.y,h=0,g=1,p=l-c,v=f-s;if(i=n-c,p||!(i>0)){if(i/=p,0>p){if(h>i)return;g>i&&(g=i)}else if(p>0){if(i>g)return;i>h&&(h=i)}if(i=e-c,p||!(0>i)){if(i/=p,0>p){if(i>g)return;i>h&&(h=i)}else if(p>0){if(h>i)return;g>i&&(g=i)}if(i=t-s,v||!(i>0)){if(i/=v,0>v){if(h>i)return;g>i&&(g=i)}else if(v>0){if(i>g)return;i>h&&(h=i)}if(i=r-s,v||!(0>i)){if(i/=v,0>v){if(i>g)return;i>h&&(h=i)}else if(v>0){if(h>i)return;g>i&&(g=i)}return h>0&&(u.a={x:c+h*p,y:s+h*v}),1>g&&(u.b={x:c+g*p,y:s+g*v}),u}}}}}}function Pe(n,t,e,r){function u(r,u){return oa(r[0]-n)<Aa?u>0?0:3:oa(r[0]-e)<Aa?u>0?2:1:oa(r[1]-t)<Aa?u>0?1:0:u>0?3:2}function i(n,t){return o(n.x,t.x)}function o(n,t){var e=u(n,1),r=u(t,1);return e!==r?e-r:0===e?t[1]-n[1]:1===e?n[0]-t[0]:2===e?n[1]-t[1]:t[0]-n[0]}return function(a){function c(n){for(var t=0,e=d.length,r=n[1],u=0;e>u;++u)for(var i,o=1,a=d[u],c=a.length,s=a[0];c>o;++o)i=a[o],s[1]<=r?i[1]>r&&Z(s,i,n)>0&&++t:i[1]<=r&&Z(s,i,n)<0&&--t,s=i;return 0!==t}function s(i,a,c,s){var l=0,f=0;if(null==i||(l=u(i,c))!==(f=u(a,c))||o(i,a)<0^c>0){do s.point(0===l||3===l?n:e,l>1?r:t);while((l=(l+c+4)%4)!==f)}else s.point(a[0],a[1])}function l(u,i){return u>=n&&e>=u&&i>=t&&r>=i}function f(n,t){l(n,t)&&a.point(n,t)}function h(){N.point=p,d&&d.push(m=[]),S=!0,w=!1,_=b=0/0}function g(){v&&(p(y,x),M&&w&&A.rejoin(),v.push(A.buffer())),N.point=f,w&&a.lineEnd()}function p(n,t){n=Math.max(-Ac,Math.min(Ac,n)),t=Math.max(-Ac,Math.min(Ac,t));var e=l(n,t);if(d&&m.push([n,t]),S)y=n,x=t,M=e,S=!1,e&&(a.lineStart(),a.point(n,t));else if(e&&w)a.point(n,t);else{var r={a:{x:_,y:b},b:{x:n,y:t}};C(r)?(w||(a.lineStart(),a.point(r.a.x,r.a.y)),a.point(r.b.x,r.b.y),e||a.lineEnd(),k=!1):e&&(a.lineStart(),a.point(n,t),k=!1)}_=n,b=t,w=e}var v,d,m,y,x,M,_,b,w,S,k,E=a,A=Ce(),C=De(n,t,e,r),N={point:f,lineStart:h,lineEnd:g,polygonStart:function(){a=A,v=[],d=[],k=!0},polygonEnd:function(){a=E,v=Xo.merge(v);var t=c([n,r]),e=k&&t,u=v.length;(e||u)&&(a.polygonStart(),e&&(a.lineStart(),s(null,null,1,a),a.lineEnd()),u&&we(v,i,t,s,a),a.polygonEnd()),v=d=m=null}};return N}}function Ue(n,t){function e(e,r){return e=n(e,r),t(e[0],e[1])}return n.invert&&t.invert&&(e.invert=function(e,r){return e=t.invert(e,r),e&&n.invert(e[0],e[1])}),e}function je(n){var t=0,e=Sa/3,r=nr(n),u=r(t,e);return u.parallels=function(n){return arguments.length?r(t=n[0]*Sa/180,e=n[1]*Sa/180):[180*(t/Sa),180*(e/Sa)]},u}function He(n,t){function e(n,t){var e=Math.sqrt(i-2*u*Math.sin(t))/u;return[e*Math.sin(n*=u),o-e*Math.cos(n)]}var r=Math.sin(n),u=(r+Math.sin(t))/2,i=1+r*(2*u-r),o=Math.sqrt(i)/u;return e.invert=function(n,t){var e=o-t;return[Math.atan2(n,e)/u,X((i-(n*n+e*e)*u*u)/(2*u))]},e}function Fe(){function n(n,t){Nc+=u*n-r*t,r=n,u=t}var t,e,r,u;Rc.point=function(i,o){Rc.point=n,t=r=i,e=u=o},Rc.lineEnd=function(){n(t,e)}}function Oe(n,t){Lc>n&&(Lc=n),n>qc&&(qc=n),zc>t&&(zc=t),t>Tc&&(Tc=t)}function Ye(){function n(n,t){o.push("M",n,",",t,i)}function t(n,t){o.push("M",n,",",t),a.point=e}function e(n,t){o.push("L",n,",",t)}function r(){a.point=n}function u(){o.push("Z")}var i=Ie(4.5),o=[],a={point:n,lineStart:function(){a.point=t},lineEnd:r,polygonStart:function(){a.lineEnd=u},polygonEnd:function(){a.lineEnd=r,a.point=n},pointRadius:function(n){return i=Ie(n),a},result:function(){if(o.length){var n=o.join("");return o=[],n}}};return a}function Ie(n){return"m0,"+n+"a"+n+","+n+" 0 1,1 0,"+-2*n+"a"+n+","+n+" 0 1,1 0,"+2*n+"z"}function Ze(n,t){dc+=n,mc+=t,++yc}function Ve(){function n(n,r){var u=n-t,i=r-e,o=Math.sqrt(u*u+i*i);xc+=o*(t+n)/2,Mc+=o*(e+r)/2,_c+=o,Ze(t=n,e=r)}var t,e;Pc.point=function(r,u){Pc.point=n,Ze(t=r,e=u)}}function Xe(){Pc.point=Ze}function $e(){function n(n,t){var e=n-r,i=t-u,o=Math.sqrt(e*e+i*i);xc+=o*(r+n)/2,Mc+=o*(u+t)/2,_c+=o,o=u*n-r*t,bc+=o*(r+n),wc+=o*(u+t),Sc+=3*o,Ze(r=n,u=t)}var t,e,r,u;Pc.point=function(i,o){Pc.point=n,Ze(t=r=i,e=u=o)},Pc.lineEnd=function(){n(t,e)}}function Be(n){function t(t,e){n.moveTo(t,e),n.arc(t,e,o,0,ka)}function e(t,e){n.moveTo(t,e),a.point=r}function r(t,e){n.lineTo(t,e)}function u(){a.point=t}function i(){n.closePath()}var o=4.5,a={point:t,lineStart:function(){a.point=e},lineEnd:u,polygonStart:function(){a.lineEnd=i},polygonEnd:function(){a.lineEnd=u,a.point=t},pointRadius:function(n){return o=n,a},result:g};return a}function We(n){function t(n){return(a?r:e)(n)}function e(t){return Ke(t,function(e,r){e=n(e,r),t.point(e[0],e[1])})}function r(t){function e(e,r){e=n(e,r),t.point(e[0],e[1])}function r(){x=0/0,S.point=i,t.lineStart()}function i(e,r){var i=se([e,r]),o=n(e,r);u(x,M,y,_,b,w,x=o[0],M=o[1],y=e,_=i[0],b=i[1],w=i[2],a,t),t.point(x,M)}function o(){S.point=e,t.lineEnd()}function c(){r(),S.point=s,S.lineEnd=l}function s(n,t){i(f=n,h=t),g=x,p=M,v=_,d=b,m=w,S.point=i}function l(){u(x,M,y,_,b,w,g,p,f,v,d,m,a,t),S.lineEnd=o,o()}var f,h,g,p,v,d,m,y,x,M,_,b,w,S={point:e,lineStart:r,lineEnd:o,polygonStart:function(){t.polygonStart(),S.lineStart=c},polygonEnd:function(){t.polygonEnd(),S.lineStart=r}};return S}function u(t,e,r,a,c,s,l,f,h,g,p,v,d,m){var y=l-t,x=f-e,M=y*y+x*x;if(M>4*i&&d--){var _=a+g,b=c+p,w=s+v,S=Math.sqrt(_*_+b*b+w*w),k=Math.asin(w/=S),E=oa(oa(w)-1)<Aa||oa(r-h)<Aa?(r+h)/2:Math.atan2(b,_),A=n(E,k),C=A[0],N=A[1],L=C-t,z=N-e,q=x*L-y*z;(q*q/M>i||oa((y*L+x*z)/M-.5)>.3||o>a*g+c*p+s*v)&&(u(t,e,r,a,c,s,C,N,E,_/=S,b/=S,w,d,m),m.point(C,N),u(C,N,E,_,b,w,l,f,h,g,p,v,d,m))}}var i=.5,o=Math.cos(30*Na),a=16;return t.precision=function(n){return arguments.length?(a=(i=n*n)>0&&16,t):Math.sqrt(i)},t}function Je(n){var t=We(function(t,e){return n([t*La,e*La])});return function(n){return tr(t(n))}}function Ge(n){this.stream=n}function Ke(n,t){return{point:t,sphere:function(){n.sphere()},lineStart:function(){n.lineStart()},lineEnd:function(){n.lineEnd()},polygonStart:function(){n.polygonStart()},polygonEnd:function(){n.polygonEnd()}}}function Qe(n){return nr(function(){return n})()}function nr(n){function t(n){return n=a(n[0]*Na,n[1]*Na),[n[0]*h+c,s-n[1]*h]}function e(n){return n=a.invert((n[0]-c)/h,(s-n[1])/h),n&&[n[0]*La,n[1]*La]}function r(){a=Ue(o=ur(m,y,x),i);var n=i(v,d);return c=g-n[0]*h,s=p+n[1]*h,u()}function u(){return l&&(l.valid=!1,l=null),t}var i,o,a,c,s,l,f=We(function(n,t){return n=i(n,t),[n[0]*h+c,s-n[1]*h]}),h=150,g=480,p=250,v=0,d=0,m=0,y=0,x=0,M=Ec,_=bt,b=null,w=null;return t.stream=function(n){return l&&(l.valid=!1),l=tr(M(o,f(_(n)))),l.valid=!0,l},t.clipAngle=function(n){return arguments.length?(M=null==n?(b=n,Ec):Re((b=+n)*Na),u()):b
+},t.clipExtent=function(n){return arguments.length?(w=n,_=n?Pe(n[0][0],n[0][1],n[1][0],n[1][1]):bt,u()):w},t.scale=function(n){return arguments.length?(h=+n,r()):h},t.translate=function(n){return arguments.length?(g=+n[0],p=+n[1],r()):[g,p]},t.center=function(n){return arguments.length?(v=n[0]%360*Na,d=n[1]%360*Na,r()):[v*La,d*La]},t.rotate=function(n){return arguments.length?(m=n[0]%360*Na,y=n[1]%360*Na,x=n.length>2?n[2]%360*Na:0,r()):[m*La,y*La,x*La]},Xo.rebind(t,f,"precision"),function(){return i=n.apply(this,arguments),t.invert=i.invert&&e,r()}}function tr(n){return Ke(n,function(t,e){n.point(t*Na,e*Na)})}function er(n,t){return[n,t]}function rr(n,t){return[n>Sa?n-ka:-Sa>n?n+ka:n,t]}function ur(n,t,e){return n?t||e?Ue(or(n),ar(t,e)):or(n):t||e?ar(t,e):rr}function ir(n){return function(t,e){return t+=n,[t>Sa?t-ka:-Sa>t?t+ka:t,e]}}function or(n){var t=ir(n);return t.invert=ir(-n),t}function ar(n,t){function e(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,s=Math.sin(t),l=s*r+a*u;return[Math.atan2(c*i-l*o,a*r-s*u),X(l*i+c*o)]}var r=Math.cos(n),u=Math.sin(n),i=Math.cos(t),o=Math.sin(t);return e.invert=function(n,t){var e=Math.cos(t),a=Math.cos(n)*e,c=Math.sin(n)*e,s=Math.sin(t),l=s*i-c*o;return[Math.atan2(c*i+s*o,a*r+l*u),X(l*r-a*u)]},e}function cr(n,t){var e=Math.cos(n),r=Math.sin(n);return function(u,i,o,a){var c=o*t;null!=u?(u=sr(e,u),i=sr(e,i),(o>0?i>u:u>i)&&(u+=o*ka)):(u=n+o*ka,i=n-.5*c);for(var s,l=u;o>0?l>i:i>l;l-=c)a.point((s=ve([e,-r*Math.cos(l),-r*Math.sin(l)]))[0],s[1])}}function sr(n,t){var e=se(t);e[0]-=n,pe(e);var r=V(-e[1]);return((-e[2]<0?-r:r)+2*Math.PI-Aa)%(2*Math.PI)}function lr(n,t,e){var r=Xo.range(n,t-Aa,e).concat(t);return function(n){return r.map(function(t){return[n,t]})}}function fr(n,t,e){var r=Xo.range(n,t-Aa,e).concat(t);return function(n){return r.map(function(t){return[t,n]})}}function hr(n){return n.source}function gr(n){return n.target}function pr(n,t,e,r){var u=Math.cos(t),i=Math.sin(t),o=Math.cos(r),a=Math.sin(r),c=u*Math.cos(n),s=u*Math.sin(n),l=o*Math.cos(e),f=o*Math.sin(e),h=2*Math.asin(Math.sqrt(J(r-t)+u*o*J(e-n))),g=1/Math.sin(h),p=h?function(n){var t=Math.sin(n*=h)*g,e=Math.sin(h-n)*g,r=e*c+t*l,u=e*s+t*f,o=e*i+t*a;return[Math.atan2(u,r)*La,Math.atan2(o,Math.sqrt(r*r+u*u))*La]}:function(){return[n*La,t*La]};return p.distance=h,p}function vr(){function n(n,u){var i=Math.sin(u*=Na),o=Math.cos(u),a=oa((n*=Na)-t),c=Math.cos(a);Uc+=Math.atan2(Math.sqrt((a=o*Math.sin(a))*a+(a=r*i-e*o*c)*a),e*i+r*o*c),t=n,e=i,r=o}var t,e,r;jc.point=function(u,i){t=u*Na,e=Math.sin(i*=Na),r=Math.cos(i),jc.point=n},jc.lineEnd=function(){jc.point=jc.lineEnd=g}}function dr(n,t){function e(t,e){var r=Math.cos(t),u=Math.cos(e),i=n(r*u);return[i*u*Math.sin(t),i*Math.sin(e)]}return e.invert=function(n,e){var r=Math.sqrt(n*n+e*e),u=t(r),i=Math.sin(u),o=Math.cos(u);return[Math.atan2(n*i,r*o),Math.asin(r&&e*i/r)]},e}function mr(n,t){function e(n,t){var e=oa(oa(t)-Ea)<Aa?0:o/Math.pow(u(t),i);return[e*Math.sin(i*n),o-e*Math.cos(i*n)]}var r=Math.cos(n),u=function(n){return Math.tan(Sa/4+n/2)},i=n===t?Math.sin(n):Math.log(r/Math.cos(t))/Math.log(u(t)/u(n)),o=r*Math.pow(u(n),i)/i;return i?(e.invert=function(n,t){var e=o-t,r=I(i)*Math.sqrt(n*n+e*e);return[Math.atan2(n,e)/i,2*Math.atan(Math.pow(o/r,1/i))-Ea]},e):xr}function yr(n,t){function e(n,t){var e=i-t;return[e*Math.sin(u*n),i-e*Math.cos(u*n)]}var r=Math.cos(n),u=n===t?Math.sin(n):(r-Math.cos(t))/(t-n),i=r/u+n;return oa(u)<Aa?er:(e.invert=function(n,t){var e=i-t;return[Math.atan2(n,e)/u,i-I(u)*Math.sqrt(n*n+e*e)]},e)}function xr(n,t){return[n,Math.log(Math.tan(Sa/4+t/2))]}function Mr(n){var t,e=Qe(n),r=e.scale,u=e.translate,i=e.clipExtent;return e.scale=function(){var n=r.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.translate=function(){var n=u.apply(e,arguments);return n===e?t?e.clipExtent(null):e:n},e.clipExtent=function(n){var o=i.apply(e,arguments);if(o===e){if(t=null==n){var a=Sa*r(),c=u();i([[c[0]-a,c[1]-a],[c[0]+a,c[1]+a]])}}else t&&(o=null);return o},e.clipExtent(null)}function _r(n,t){return[Math.log(Math.tan(Sa/4+t/2)),-n]}function br(n){return n[0]}function wr(n){return n[1]}function Sr(n){for(var t=n.length,e=[0,1],r=2,u=2;t>u;u++){for(;r>1&&Z(n[e[r-2]],n[e[r-1]],n[u])<=0;)--r;e[r++]=u}return e.slice(0,r)}function kr(n,t){return n[0]-t[0]||n[1]-t[1]}function Er(n,t,e){return(e[0]-t[0])*(n[1]-t[1])<(e[1]-t[1])*(n[0]-t[0])}function Ar(n,t,e,r){var u=n[0],i=e[0],o=t[0]-u,a=r[0]-i,c=n[1],s=e[1],l=t[1]-c,f=r[1]-s,h=(a*(c-s)-f*(u-i))/(f*o-a*l);return[u+h*o,c+h*l]}function Cr(n){var t=n[0],e=n[n.length-1];return!(t[0]-e[0]||t[1]-e[1])}function Nr(){Jr(this),this.edge=this.site=this.circle=null}function Lr(n){var t=Jc.pop()||new Nr;return t.site=n,t}function zr(n){Or(n),$c.remove(n),Jc.push(n),Jr(n)}function qr(n){var t=n.circle,e=t.x,r=t.cy,u={x:e,y:r},i=n.P,o=n.N,a=[n];zr(n);for(var c=i;c.circle&&oa(e-c.circle.x)<Aa&&oa(r-c.circle.cy)<Aa;)i=c.P,a.unshift(c),zr(c),c=i;a.unshift(c),Or(c);for(var s=o;s.circle&&oa(e-s.circle.x)<Aa&&oa(r-s.circle.cy)<Aa;)o=s.N,a.push(s),zr(s),s=o;a.push(s),Or(s);var l,f=a.length;for(l=1;f>l;++l)s=a[l],c=a[l-1],$r(s.edge,c.site,s.site,u);c=a[0],s=a[f-1],s.edge=Vr(c.site,s.site,null,u),Fr(c),Fr(s)}function Tr(n){for(var t,e,r,u,i=n.x,o=n.y,a=$c._;a;)if(r=Rr(a,o)-i,r>Aa)a=a.L;else{if(u=i-Dr(a,o),!(u>Aa)){r>-Aa?(t=a.P,e=a):u>-Aa?(t=a,e=a.N):t=e=a;break}if(!a.R){t=a;break}a=a.R}var c=Lr(n);if($c.insert(t,c),t||e){if(t===e)return Or(t),e=Lr(t.site),$c.insert(c,e),c.edge=e.edge=Vr(t.site,c.site),Fr(t),Fr(e),void 0;if(!e)return c.edge=Vr(t.site,c.site),void 0;Or(t),Or(e);var s=t.site,l=s.x,f=s.y,h=n.x-l,g=n.y-f,p=e.site,v=p.x-l,d=p.y-f,m=2*(h*d-g*v),y=h*h+g*g,x=v*v+d*d,M={x:(d*y-g*x)/m+l,y:(h*x-v*y)/m+f};$r(e.edge,s,p,M),c.edge=Vr(s,n,null,M),e.edge=Vr(n,p,null,M),Fr(t),Fr(e)}}function Rr(n,t){var e=n.site,r=e.x,u=e.y,i=u-t;if(!i)return r;var o=n.P;if(!o)return-1/0;e=o.site;var a=e.x,c=e.y,s=c-t;if(!s)return a;var l=a-r,f=1/i-1/s,h=l/s;return f?(-h+Math.sqrt(h*h-2*f*(l*l/(-2*s)-c+s/2+u-i/2)))/f+r:(r+a)/2}function Dr(n,t){var e=n.N;if(e)return Rr(e,t);var r=n.site;return r.y===t?r.x:1/0}function Pr(n){this.site=n,this.edges=[]}function Ur(n){for(var t,e,r,u,i,o,a,c,s,l,f=n[0][0],h=n[1][0],g=n[0][1],p=n[1][1],v=Xc,d=v.length;d--;)if(i=v[d],i&&i.prepare())for(a=i.edges,c=a.length,o=0;c>o;)l=a[o].end(),r=l.x,u=l.y,s=a[++o%c].start(),t=s.x,e=s.y,(oa(r-t)>Aa||oa(u-e)>Aa)&&(a.splice(o,0,new Br(Xr(i.site,l,oa(r-f)<Aa&&p-u>Aa?{x:f,y:oa(t-f)<Aa?e:p}:oa(u-p)<Aa&&h-r>Aa?{x:oa(e-p)<Aa?t:h,y:p}:oa(r-h)<Aa&&u-g>Aa?{x:h,y:oa(t-h)<Aa?e:g}:oa(u-g)<Aa&&r-f>Aa?{x:oa(e-g)<Aa?t:f,y:g}:null),i.site,null)),++c)}function jr(n,t){return t.angle-n.angle}function Hr(){Jr(this),this.x=this.y=this.arc=this.site=this.cy=null}function Fr(n){var t=n.P,e=n.N;if(t&&e){var r=t.site,u=n.site,i=e.site;if(r!==i){var o=u.x,a=u.y,c=r.x-o,s=r.y-a,l=i.x-o,f=i.y-a,h=2*(c*f-s*l);if(!(h>=-Ca)){var g=c*c+s*s,p=l*l+f*f,v=(f*g-s*p)/h,d=(c*p-l*g)/h,f=d+a,m=Gc.pop()||new Hr;m.arc=n,m.site=u,m.x=v+o,m.y=f+Math.sqrt(v*v+d*d),m.cy=f,n.circle=m;for(var y=null,x=Wc._;x;)if(m.y<x.y||m.y===x.y&&m.x<=x.x){if(!x.L){y=x.P;break}x=x.L}else{if(!x.R){y=x;break}x=x.R}Wc.insert(y,m),y||(Bc=m)}}}}function Or(n){var t=n.circle;t&&(t.P||(Bc=t.N),Wc.remove(t),Gc.push(t),Jr(t),n.circle=null)}function Yr(n){for(var t,e=Vc,r=De(n[0][0],n[0][1],n[1][0],n[1][1]),u=e.length;u--;)t=e[u],(!Ir(t,n)||!r(t)||oa(t.a.x-t.b.x)<Aa&&oa(t.a.y-t.b.y)<Aa)&&(t.a=t.b=null,e.splice(u,1))}function Ir(n,t){var e=n.b;if(e)return!0;var r,u,i=n.a,o=t[0][0],a=t[1][0],c=t[0][1],s=t[1][1],l=n.l,f=n.r,h=l.x,g=l.y,p=f.x,v=f.y,d=(h+p)/2,m=(g+v)/2;if(v===g){if(o>d||d>=a)return;if(h>p){if(i){if(i.y>=s)return}else i={x:d,y:c};e={x:d,y:s}}else{if(i){if(i.y<c)return}else i={x:d,y:s};e={x:d,y:c}}}else if(r=(h-p)/(v-g),u=m-r*d,-1>r||r>1)if(h>p){if(i){if(i.y>=s)return}else i={x:(c-u)/r,y:c};e={x:(s-u)/r,y:s}}else{if(i){if(i.y<c)return}else i={x:(s-u)/r,y:s};e={x:(c-u)/r,y:c}}else if(v>g){if(i){if(i.x>=a)return}else i={x:o,y:r*o+u};e={x:a,y:r*a+u}}else{if(i){if(i.x<o)return}else i={x:a,y:r*a+u};e={x:o,y:r*o+u}}return n.a=i,n.b=e,!0}function Zr(n,t){this.l=n,this.r=t,this.a=this.b=null}function Vr(n,t,e,r){var u=new Zr(n,t);return Vc.push(u),e&&$r(u,n,t,e),r&&$r(u,t,n,r),Xc[n.i].edges.push(new Br(u,n,t)),Xc[t.i].edges.push(new Br(u,t,n)),u}function Xr(n,t,e){var r=new Zr(n,null);return r.a=t,r.b=e,Vc.push(r),r}function $r(n,t,e,r){n.a||n.b?n.l===e?n.b=r:n.a=r:(n.a=r,n.l=t,n.r=e)}function Br(n,t,e){var r=n.a,u=n.b;this.edge=n,this.site=t,this.angle=e?Math.atan2(e.y-t.y,e.x-t.x):n.l===t?Math.atan2(u.x-r.x,r.y-u.y):Math.atan2(r.x-u.x,u.y-r.y)}function Wr(){this._=null}function Jr(n){n.U=n.C=n.L=n.R=n.P=n.N=null}function Gr(n,t){var e=t,r=t.R,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.R=r.L,e.R&&(e.R.U=e),r.L=e}function Kr(n,t){var e=t,r=t.L,u=e.U;u?u.L===e?u.L=r:u.R=r:n._=r,r.U=u,e.U=r,e.L=r.R,e.L&&(e.L.U=e),r.R=e}function Qr(n){for(;n.L;)n=n.L;return n}function nu(n,t){var e,r,u,i=n.sort(tu).pop();for(Vc=[],Xc=new Array(n.length),$c=new Wr,Wc=new Wr;;)if(u=Bc,i&&(!u||i.y<u.y||i.y===u.y&&i.x<u.x))(i.x!==e||i.y!==r)&&(Xc[i.i]=new Pr(i),Tr(i),e=i.x,r=i.y),i=n.pop();else{if(!u)break;qr(u.arc)}t&&(Yr(t),Ur(t));var o={cells:Xc,edges:Vc};return $c=Wc=Vc=Xc=null,o}function tu(n,t){return t.y-n.y||t.x-n.x}function eu(n,t,e){return(n.x-e.x)*(t.y-n.y)-(n.x-t.x)*(e.y-n.y)}function ru(n){return n.x}function uu(n){return n.y}function iu(){return{leaf:!0,nodes:[],point:null,x:null,y:null}}function ou(n,t,e,r,u,i){if(!n(t,e,r,u,i)){var o=.5*(e+u),a=.5*(r+i),c=t.nodes;c[0]&&ou(n,c[0],e,r,o,a),c[1]&&ou(n,c[1],o,r,u,a),c[2]&&ou(n,c[2],e,a,o,i),c[3]&&ou(n,c[3],o,a,u,i)}}function au(n,t){n=Xo.rgb(n),t=Xo.rgb(t);var e=n.r,r=n.g,u=n.b,i=t.r-e,o=t.g-r,a=t.b-u;return function(n){return"#"+vt(Math.round(e+i*n))+vt(Math.round(r+o*n))+vt(Math.round(u+a*n))}}function cu(n,t){var e,r={},u={};for(e in n)e in t?r[e]=fu(n[e],t[e]):u[e]=n[e];for(e in t)e in n||(u[e]=t[e]);return function(n){for(e in r)u[e]=r[e](n);return u}}function su(n,t){return t-=n=+n,function(e){return n+t*e}}function lu(n,t){var e,r,u,i,o,a=0,c=0,s=[],l=[];for(n+="",t+="",Qc.lastIndex=0,r=0;e=Qc.exec(t);++r)e.index&&s.push(t.substring(a,c=e.index)),l.push({i:s.length,x:e[0]}),s.push(null),a=Qc.lastIndex;for(a<t.length&&s.push(t.substring(a)),r=0,i=l.length;(e=Qc.exec(n))&&i>r;++r)if(o=l[r],o.x==e[0]){if(o.i)if(null==s[o.i+1])for(s[o.i-1]+=o.x,s.splice(o.i,1),u=r+1;i>u;++u)l[u].i--;else for(s[o.i-1]+=o.x+s[o.i+1],s.splice(o.i,2),u=r+1;i>u;++u)l[u].i-=2;else if(null==s[o.i+1])s[o.i]=o.x;else for(s[o.i]=o.x+s[o.i+1],s.splice(o.i+1,1),u=r+1;i>u;++u)l[u].i--;l.splice(r,1),i--,r--}else o.x=su(parseFloat(e[0]),parseFloat(o.x));for(;i>r;)o=l.pop(),null==s[o.i+1]?s[o.i]=o.x:(s[o.i]=o.x+s[o.i+1],s.splice(o.i+1,1)),i--;return 1===s.length?null==s[0]?(o=l[0].x,function(n){return o(n)+""}):function(){return t}:function(n){for(r=0;i>r;++r)s[(o=l[r]).i]=o.x(n);return s.join("")}}function fu(n,t){for(var e,r=Xo.interpolators.length;--r>=0&&!(e=Xo.interpolators[r](n,t)););return e}function hu(n,t){var e,r=[],u=[],i=n.length,o=t.length,a=Math.min(n.length,t.length);for(e=0;a>e;++e)r.push(fu(n[e],t[e]));for(;i>e;++e)u[e]=n[e];for(;o>e;++e)u[e]=t[e];return function(n){for(e=0;a>e;++e)u[e]=r[e](n);return u}}function gu(n){return function(t){return 0>=t?0:t>=1?1:n(t)}}function pu(n){return function(t){return 1-n(1-t)}}function vu(n){return function(t){return.5*(.5>t?n(2*t):2-n(2-2*t))}}function du(n){return n*n}function mu(n){return n*n*n}function yu(n){if(0>=n)return 0;if(n>=1)return 1;var t=n*n,e=t*n;return 4*(.5>n?e:3*(n-t)+e-.75)}function xu(n){return function(t){return Math.pow(t,n)}}function Mu(n){return 1-Math.cos(n*Ea)}function _u(n){return Math.pow(2,10*(n-1))}function bu(n){return 1-Math.sqrt(1-n*n)}function wu(n,t){var e;return arguments.length<2&&(t=.45),arguments.length?e=t/ka*Math.asin(1/n):(n=1,e=t/4),function(r){return 1+n*Math.pow(2,-10*r)*Math.sin((r-e)*ka/t)}}function Su(n){return n||(n=1.70158),function(t){return t*t*((n+1)*t-n)}}function ku(n){return 1/2.75>n?7.5625*n*n:2/2.75>n?7.5625*(n-=1.5/2.75)*n+.75:2.5/2.75>n?7.5625*(n-=2.25/2.75)*n+.9375:7.5625*(n-=2.625/2.75)*n+.984375}function Eu(n,t){n=Xo.hcl(n),t=Xo.hcl(t);var e=n.h,r=n.c,u=n.l,i=t.h-e,o=t.c-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.c:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return rt(e+i*n,r+o*n,u+a*n)+""}}function Au(n,t){n=Xo.hsl(n),t=Xo.hsl(t);var e=n.h,r=n.s,u=n.l,i=t.h-e,o=t.s-r,a=t.l-u;return isNaN(o)&&(o=0,r=isNaN(r)?t.s:r),isNaN(i)?(i=0,e=isNaN(e)?t.h:e):i>180?i-=360:-180>i&&(i+=360),function(n){return nt(e+i*n,r+o*n,u+a*n)+""}}function Cu(n,t){n=Xo.lab(n),t=Xo.lab(t);var e=n.l,r=n.a,u=n.b,i=t.l-e,o=t.a-r,a=t.b-u;return function(n){return ot(e+i*n,r+o*n,u+a*n)+""}}function Nu(n,t){return t-=n,function(e){return Math.round(n+t*e)}}function Lu(n){var t=[n.a,n.b],e=[n.c,n.d],r=qu(t),u=zu(t,e),i=qu(Tu(e,t,-u))||0;t[0]*e[1]<e[0]*t[1]&&(t[0]*=-1,t[1]*=-1,r*=-1,u*=-1),this.rotate=(r?Math.atan2(t[1],t[0]):Math.atan2(-e[0],e[1]))*La,this.translate=[n.e,n.f],this.scale=[r,i],this.skew=i?Math.atan2(u,i)*La:0}function zu(n,t){return n[0]*t[0]+n[1]*t[1]}function qu(n){var t=Math.sqrt(zu(n,n));return t&&(n[0]/=t,n[1]/=t),t}function Tu(n,t,e){return n[0]+=e*t[0],n[1]+=e*t[1],n}function Ru(n,t){var e,r=[],u=[],i=Xo.transform(n),o=Xo.transform(t),a=i.translate,c=o.translate,s=i.rotate,l=o.rotate,f=i.skew,h=o.skew,g=i.scale,p=o.scale;return a[0]!=c[0]||a[1]!=c[1]?(r.push("translate(",null,",",null,")"),u.push({i:1,x:su(a[0],c[0])},{i:3,x:su(a[1],c[1])})):c[0]||c[1]?r.push("translate("+c+")"):r.push(""),s!=l?(s-l>180?l+=360:l-s>180&&(s+=360),u.push({i:r.push(r.pop()+"rotate(",null,")")-2,x:su(s,l)})):l&&r.push(r.pop()+"rotate("+l+")"),f!=h?u.push({i:r.push(r.pop()+"skewX(",null,")")-2,x:su(f,h)}):h&&r.push(r.pop()+"skewX("+h+")"),g[0]!=p[0]||g[1]!=p[1]?(e=r.push(r.pop()+"scale(",null,",",null,")"),u.push({i:e-4,x:su(g[0],p[0])},{i:e-2,x:su(g[1],p[1])})):(1!=p[0]||1!=p[1])&&r.push(r.pop()+"scale("+p+")"),e=u.length,function(n){for(var t,i=-1;++i<e;)r[(t=u[i]).i]=t.x(n);return r.join("")}}function Du(n,t){return t=t-(n=+n)?1/(t-n):0,function(e){return(e-n)*t}}function Pu(n,t){return t=t-(n=+n)?1/(t-n):0,function(e){return Math.max(0,Math.min(1,(e-n)*t))}}function Uu(n){for(var t=n.source,e=n.target,r=Hu(t,e),u=[t];t!==r;)t=t.parent,u.push(t);for(var i=u.length;e!==r;)u.splice(i,0,e),e=e.parent;return u}function ju(n){for(var t=[],e=n.parent;null!=e;)t.push(n),n=e,e=e.parent;return t.push(n),t}function Hu(n,t){if(n===t)return n;for(var e=ju(n),r=ju(t),u=e.pop(),i=r.pop(),o=null;u===i;)o=u,u=e.pop(),i=r.pop();return o}function Fu(n){n.fixed|=2}function Ou(n){n.fixed&=-7}function Yu(n){n.fixed|=4,n.px=n.x,n.py=n.y}function Iu(n){n.fixed&=-5}function Zu(n,t,e){var r=0,u=0;if(n.charge=0,!n.leaf)for(var i,o=n.nodes,a=o.length,c=-1;++c<a;)i=o[c],null!=i&&(Zu(i,t,e),n.charge+=i.charge,r+=i.charge*i.cx,u+=i.charge*i.cy);if(n.point){n.leaf||(n.point.x+=Math.random()-.5,n.point.y+=Math.random()-.5);var s=t*e[n.point.index];n.charge+=n.pointCharge=s,r+=s*n.point.x,u+=s*n.point.y}n.cx=r/n.charge,n.cy=u/n.charge}function Vu(n,t){return Xo.rebind(n,t,"sort","children","value"),n.nodes=n,n.links=Wu,n}function Xu(n){return n.children}function $u(n){return n.value}function Bu(n,t){return t.value-n.value}function Wu(n){return Xo.merge(n.map(function(n){return(n.children||[]).map(function(t){return{source:n,target:t}})}))}function Ju(n){return n.x}function Gu(n){return n.y}function Ku(n,t,e){n.y0=t,n.y=e}function Qu(n){return Xo.range(n.length)}function ni(n){for(var t=-1,e=n[0].length,r=[];++t<e;)r[t]=0;return r}function ti(n){for(var t,e=1,r=0,u=n[0][1],i=n.length;i>e;++e)(t=n[e][1])>u&&(r=e,u=t);return r}function ei(n){return n.reduce(ri,0)}function ri(n,t){return n+t[1]}function ui(n,t){return ii(n,Math.ceil(Math.log(t.length)/Math.LN2+1))}function ii(n,t){for(var e=-1,r=+n[0],u=(n[1]-r)/t,i=[];++e<=t;)i[e]=u*e+r;return i}function oi(n){return[Xo.min(n),Xo.max(n)]}function ai(n,t){return n.parent==t.parent?1:2}function ci(n){var t=n.children;return t&&t.length?t[0]:n._tree.thread}function si(n){var t,e=n.children;return e&&(t=e.length)?e[t-1]:n._tree.thread}function li(n,t){var e=n.children;if(e&&(u=e.length))for(var r,u,i=-1;++i<u;)t(r=li(e[i],t),n)>0&&(n=r);return n}function fi(n,t){return n.x-t.x}function hi(n,t){return t.x-n.x}function gi(n,t){return n.depth-t.depth}function pi(n,t){function e(n,r){var u=n.children;if(u&&(o=u.length))for(var i,o,a=null,c=-1;++c<o;)i=u[c],e(i,a),a=i;t(n,r)}e(n,null)}function vi(n){for(var t,e=0,r=0,u=n.children,i=u.length;--i>=0;)t=u[i]._tree,t.prelim+=e,t.mod+=e,e+=t.shift+(r+=t.change)}function di(n,t,e){n=n._tree,t=t._tree;var r=e/(t.number-n.number);n.change+=r,t.change-=r,t.shift+=e,t.prelim+=e,t.mod+=e}function mi(n,t,e){return n._tree.ancestor.parent==t.parent?n._tree.ancestor:e}function yi(n,t){return n.value-t.value}function xi(n,t){var e=n._pack_next;n._pack_next=t,t._pack_prev=n,t._pack_next=e,e._pack_prev=t}function Mi(n,t){n._pack_next=t,t._pack_prev=n}function _i(n,t){var e=t.x-n.x,r=t.y-n.y,u=n.r+t.r;return.999*u*u>e*e+r*r}function bi(n){function t(n){l=Math.min(n.x-n.r,l),f=Math.max(n.x+n.r,f),h=Math.min(n.y-n.r,h),g=Math.max(n.y+n.r,g)}if((e=n.children)&&(s=e.length)){var e,r,u,i,o,a,c,s,l=1/0,f=-1/0,h=1/0,g=-1/0;if(e.forEach(wi),r=e[0],r.x=-r.r,r.y=0,t(r),s>1&&(u=e[1],u.x=u.r,u.y=0,t(u),s>2))for(i=e[2],Ei(r,u,i),t(i),xi(r,i),r._pack_prev=i,xi(i,u),u=r._pack_next,o=3;s>o;o++){Ei(r,u,i=e[o]);var p=0,v=1,d=1;for(a=u._pack_next;a!==u;a=a._pack_next,v++)if(_i(a,i)){p=1;break}if(1==p)for(c=r._pack_prev;c!==a._pack_prev&&!_i(c,i);c=c._pack_prev,d++);p?(d>v||v==d&&u.r<r.r?Mi(r,u=a):Mi(r=c,u),o--):(xi(r,i),u=i,t(i))}var m=(l+f)/2,y=(h+g)/2,x=0;for(o=0;s>o;o++)i=e[o],i.x-=m,i.y-=y,x=Math.max(x,i.r+Math.sqrt(i.x*i.x+i.y*i.y));n.r=x,e.forEach(Si)}}function wi(n){n._pack_next=n._pack_prev=n}function Si(n){delete n._pack_next,delete n._pack_prev}function ki(n,t,e,r){var u=n.children;if(n.x=t+=r*n.x,n.y=e+=r*n.y,n.r*=r,u)for(var i=-1,o=u.length;++i<o;)ki(u[i],t,e,r)}function Ei(n,t,e){var r=n.r+e.r,u=t.x-n.x,i=t.y-n.y;if(r&&(u||i)){var o=t.r+e.r,a=u*u+i*i;o*=o,r*=r;var c=.5+(r-o)/(2*a),s=Math.sqrt(Math.max(0,2*o*(r+a)-(r-=a)*r-o*o))/(2*a);e.x=n.x+c*u+s*i,e.y=n.y+c*i-s*u}else e.x=n.x+r,e.y=n.y}function Ai(n){return 1+Xo.max(n,function(n){return n.y})}function Ci(n){return n.reduce(function(n,t){return n+t.x},0)/n.length}function Ni(n){var t=n.children;return t&&t.length?Ni(t[0]):n}function Li(n){var t,e=n.children;return e&&(t=e.length)?Li(e[t-1]):n}function zi(n){return{x:n.x,y:n.y,dx:n.dx,dy:n.dy}}function qi(n,t){var e=n.x+t[3],r=n.y+t[0],u=n.dx-t[1]-t[3],i=n.dy-t[0]-t[2];return 0>u&&(e+=u/2,u=0),0>i&&(r+=i/2,i=0),{x:e,y:r,dx:u,dy:i}}function Ti(n){var t=n[0],e=n[n.length-1];return e>t?[t,e]:[e,t]}function Ri(n){return n.rangeExtent?n.rangeExtent():Ti(n.range())}function Di(n,t,e,r){var u=e(n[0],n[1]),i=r(t[0],t[1]);return function(n){return i(u(n))}}function Pi(n,t){var e,r=0,u=n.length-1,i=n[r],o=n[u];return i>o&&(e=r,r=u,u=e,e=i,i=o,o=e),n[r]=t.floor(i),n[u]=t.ceil(o),n}function Ui(n){return n?{floor:function(t){return Math.floor(t/n)*n},ceil:function(t){return Math.ceil(t/n)*n}}:ls}function ji(n,t,e,r){var u=[],i=[],o=0,a=Math.min(n.length,t.length)-1;for(n[a]<n[0]&&(n=n.slice().reverse(),t=t.slice().reverse());++o<=a;)u.push(e(n[o-1],n[o])),i.push(r(t[o-1],t[o]));return function(t){var e=Xo.bisect(n,t,1,a)-1;return i[e](u[e](t))}}function Hi(n,t,e,r){function u(){var u=Math.min(n.length,t.length)>2?ji:Di,c=r?Pu:Du;return o=u(n,t,c,e),a=u(t,n,c,fu),i}function i(n){return o(n)}var o,a;return i.invert=function(n){return a(n)},i.domain=function(t){return arguments.length?(n=t.map(Number),u()):n},i.range=function(n){return arguments.length?(t=n,u()):t},i.rangeRound=function(n){return i.range(n).interpolate(Nu)},i.clamp=function(n){return arguments.length?(r=n,u()):r},i.interpolate=function(n){return arguments.length?(e=n,u()):e},i.ticks=function(t){return Ii(n,t)},i.tickFormat=function(t,e){return Zi(n,t,e)},i.nice=function(t){return Oi(n,t),u()},i.copy=function(){return Hi(n,t,e,r)},u()}function Fi(n,t){return Xo.rebind(n,t,"range","rangeRound","interpolate","clamp")}function Oi(n,t){return Pi(n,Ui(Yi(n,t)[2]))}function Yi(n,t){null==t&&(t=10);var e=Ti(n),r=e[1]-e[0],u=Math.pow(10,Math.floor(Math.log(r/t)/Math.LN10)),i=t/r*u;return.15>=i?u*=10:.35>=i?u*=5:.75>=i&&(u*=2),e[0]=Math.ceil(e[0]/u)*u,e[1]=Math.floor(e[1]/u)*u+.5*u,e[2]=u,e}function Ii(n,t){return Xo.range.apply(Xo,Yi(n,t))}function Zi(n,t,e){var r=Yi(n,t);return Xo.format(e?e.replace(Qa,function(n,t,e,u,i,o,a,c,s,l){return[t,e,u,i,o,a,c,s||"."+Xi(l,r),l].join("")}):",."+Vi(r[2])+"f")}function Vi(n){return-Math.floor(Math.log(n)/Math.LN10+.01)}function Xi(n,t){var e=Vi(t[2]);return n in fs?Math.abs(e-Vi(Math.max(Math.abs(t[0]),Math.abs(t[1]))))+ +("e"!==n):e-2*("%"===n)}function $i(n,t,e,r){function u(n){return(e?Math.log(0>n?0:n):-Math.log(n>0?0:-n))/Math.log(t)}function i(n){return e?Math.pow(t,n):-Math.pow(t,-n)}function o(t){return n(u(t))}return o.invert=function(t){return i(n.invert(t))},o.domain=function(t){return arguments.length?(e=t[0]>=0,n.domain((r=t.map(Number)).map(u)),o):r},o.base=function(e){return arguments.length?(t=+e,n.domain(r.map(u)),o):t},o.nice=function(){var t=Pi(r.map(u),e?Math:gs);return n.domain(t),r=t.map(i),o},o.ticks=function(){var n=Ti(r),o=[],a=n[0],c=n[1],s=Math.floor(u(a)),l=Math.ceil(u(c)),f=t%1?2:t;if(isFinite(l-s)){if(e){for(;l>s;s++)for(var h=1;f>h;h++)o.push(i(s)*h);o.push(i(s))}else for(o.push(i(s));s++<l;)for(var h=f-1;h>0;h--)o.push(i(s)*h);for(s=0;o[s]<a;s++);for(l=o.length;o[l-1]>c;l--);o=o.slice(s,l)}return o},o.tickFormat=function(n,t){if(!arguments.length)return hs;arguments.length<2?t=hs:"function"!=typeof t&&(t=Xo.format(t));var r,a=Math.max(.1,n/o.ticks().length),c=e?(r=1e-12,Math.ceil):(r=-1e-12,Math.floor);return function(n){return n/i(c(u(n)+r))<=a?t(n):""}},o.copy=function(){return $i(n.copy(),t,e,r)},Fi(o,n)}function Bi(n,t,e){function r(t){return n(u(t))}var u=Wi(t),i=Wi(1/t);return r.invert=function(t){return i(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain((e=t.map(Number)).map(u)),r):e},r.ticks=function(n){return Ii(e,n)},r.tickFormat=function(n,t){return Zi(e,n,t)},r.nice=function(n){return r.domain(Oi(e,n))},r.exponent=function(o){return arguments.length?(u=Wi(t=o),i=Wi(1/t),n.domain(e.map(u)),r):t},r.copy=function(){return Bi(n.copy(),t,e)},Fi(r,n)}function Wi(n){return function(t){return 0>t?-Math.pow(-t,n):Math.pow(t,n)}}function Ji(n,t){function e(e){return o[((i.get(e)||"range"===t.t&&i.set(e,n.push(e)))-1)%o.length]}function r(t,e){return Xo.range(n.length).map(function(n){return t+e*n})}var i,o,a;return e.domain=function(r){if(!arguments.length)return n;n=[],i=new u;for(var o,a=-1,c=r.length;++a<c;)i.has(o=r[a])||i.set(o,n.push(o));return e[t.t].apply(e,t.a)},e.range=function(n){return arguments.length?(o=n,a=0,t={t:"range",a:arguments},e):o},e.rangePoints=function(u,i){arguments.length<2&&(i=0);var c=u[0],s=u[1],l=(s-c)/(Math.max(1,n.length-1)+i);return o=r(n.length<2?(c+s)/2:c+l*i/2,l),a=0,t={t:"rangePoints",a:arguments},e},e.rangeBands=function(u,i,c){arguments.length<2&&(i=0),arguments.length<3&&(c=i);var s=u[1]<u[0],l=u[s-0],f=u[1-s],h=(f-l)/(n.length-i+2*c);return o=r(l+h*c,h),s&&o.reverse(),a=h*(1-i),t={t:"rangeBands",a:arguments},e},e.rangeRoundBands=function(u,i,c){arguments.length<2&&(i=0),arguments.length<3&&(c=i);var s=u[1]<u[0],l=u[s-0],f=u[1-s],h=Math.floor((f-l)/(n.length-i+2*c)),g=f-l-(n.length-i)*h;return o=r(l+Math.round(g/2),h),s&&o.reverse(),a=Math.round(h*(1-i)),t={t:"rangeRoundBands",a:arguments},e},e.rangeBand=function(){return a},e.rangeExtent=function(){return Ti(t.a[0])},e.copy=function(){return Ji(n,t)},e.domain(n)}function Gi(n,t){function e(){var e=0,i=t.length;for(u=[];++e<i;)u[e-1]=Xo.quantile(n,e/i);return r}function r(n){return isNaN(n=+n)?void 0:t[Xo.bisect(u,n)]}var u;return r.domain=function(t){return arguments.length?(n=t.filter(function(n){return!isNaN(n)}).sort(Xo.ascending),e()):n},r.range=function(n){return arguments.length?(t=n,e()):t},r.quantiles=function(){return u},r.invertExtent=function(e){return e=t.indexOf(e),0>e?[0/0,0/0]:[e>0?u[e-1]:n[0],e<u.length?u[e]:n[n.length-1]]},r.copy=function(){return Gi(n,t)},e()}function Ki(n,t,e){function r(t){return e[Math.max(0,Math.min(o,Math.floor(i*(t-n))))]}function u(){return i=e.length/(t-n),o=e.length-1,r}var i,o;return r.domain=function(e){return arguments.length?(n=+e[0],t=+e[e.length-1],u()):[n,t]},r.range=function(n){return arguments.length?(e=n,u()):e},r.invertExtent=function(t){return t=e.indexOf(t),t=0>t?0/0:t/i+n,[t,t+1/i]},r.copy=function(){return Ki(n,t,e)},u()}function Qi(n,t){function e(e){return e>=e?t[Xo.bisect(n,e)]:void 0}return e.domain=function(t){return arguments.length?(n=t,e):n},e.range=function(n){return arguments.length?(t=n,e):t},e.invertExtent=function(e){return e=t.indexOf(e),[n[e-1],n[e]]},e.copy=function(){return Qi(n,t)},e}function no(n){function t(n){return+n}return t.invert=t,t.domain=t.range=function(e){return arguments.length?(n=e.map(t),t):n},t.ticks=function(t){return Ii(n,t)},t.tickFormat=function(t,e){return Zi(n,t,e)},t.copy=function(){return no(n)},t}function to(n){return n.innerRadius}function eo(n){return n.outerRadius}function ro(n){return n.startAngle}function uo(n){return n.endAngle}function io(n){function t(t){function o(){s.push("M",i(n(l),a))}for(var c,s=[],l=[],f=-1,h=t.length,g=_t(e),p=_t(r);++f<h;)u.call(this,c=t[f],f)?l.push([+g.call(this,c,f),+p.call(this,c,f)]):l.length&&(o(),l=[]);return l.length&&o(),s.length?s.join(""):null}var e=br,r=wr,u=be,i=oo,o=i.key,a=.7;return t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t.defined=function(n){return arguments.length?(u=n,t):u},t.interpolate=function(n){return arguments.length?(o="function"==typeof n?i=n:(i=Ms.get(n)||oo).key,t):o},t.tension=function(n){return arguments.length?(a=n,t):a},t}function oo(n){return n.join("L")}function ao(n){return oo(n)+"Z"}function co(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r[0]+(r=n[t])[0])/2,"V",r[1]);return e>1&&u.push("H",r[0]),u.join("")}function so(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("V",(r=n[t])[1],"H",r[0]);return u.join("")}function lo(n){for(var t=0,e=n.length,r=n[0],u=[r[0],",",r[1]];++t<e;)u.push("H",(r=n[t])[0],"V",r[1]);return u.join("")}function fo(n,t){return n.length<4?oo(n):n[1]+po(n.slice(1,n.length-1),vo(n,t))}function ho(n,t){return n.length<3?oo(n):n[0]+po((n.push(n[0]),n),vo([n[n.length-2]].concat(n,[n[1]]),t))}function go(n,t){return n.length<3?oo(n):n[0]+po(n,vo(n,t))}function po(n,t){if(t.length<1||n.length!=t.length&&n.length!=t.length+2)return oo(n);var e=n.length!=t.length,r="",u=n[0],i=n[1],o=t[0],a=o,c=1;if(e&&(r+="Q"+(i[0]-2*o[0]/3)+","+(i[1]-2*o[1]/3)+","+i[0]+","+i[1],u=n[1],c=2),t.length>1){a=t[1],i=n[c],c++,r+="C"+(u[0]+o[0])+","+(u[1]+o[1])+","+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1];for(var s=2;s<t.length;s++,c++)i=n[c],a=t[s],r+="S"+(i[0]-a[0])+","+(i[1]-a[1])+","+i[0]+","+i[1]}if(e){var l=n[c];r+="Q"+(i[0]+2*a[0]/3)+","+(i[1]+2*a[1]/3)+","+l[0]+","+l[1]}return r}function vo(n,t){for(var e,r=[],u=(1-t)/2,i=n[0],o=n[1],a=1,c=n.length;++a<c;)e=i,i=o,o=n[a],r.push([u*(o[0]-e[0]),u*(o[1]-e[1])]);return r}function mo(n){if(n.length<3)return oo(n);var t=1,e=n.length,r=n[0],u=r[0],i=r[1],o=[u,u,u,(r=n[1])[0]],a=[i,i,i,r[1]],c=[u,",",i,"L",_o(ws,o),",",_o(ws,a)];for(n.push(n[e-1]);++t<=e;)r=n[t],o.shift(),o.push(r[0]),a.shift(),a.push(r[1]),bo(c,o,a);return n.pop(),c.push("L",r),c.join("")}function yo(n){if(n.length<4)return oo(n);for(var t,e=[],r=-1,u=n.length,i=[0],o=[0];++r<3;)t=n[r],i.push(t[0]),o.push(t[1]);for(e.push(_o(ws,i)+","+_o(ws,o)),--r;++r<u;)t=n[r],i.shift(),i.push(t[0]),o.shift(),o.push(t[1]),bo(e,i,o);return e.join("")}function xo(n){for(var t,e,r=-1,u=n.length,i=u+4,o=[],a=[];++r<4;)e=n[r%u],o.push(e[0]),a.push(e[1]);for(t=[_o(ws,o),",",_o(ws,a)],--r;++r<i;)e=n[r%u],o.shift(),o.push(e[0]),a.shift(),a.push(e[1]),bo(t,o,a);return t.join("")}function Mo(n,t){var e=n.length-1;if(e)for(var r,u,i=n[0][0],o=n[0][1],a=n[e][0]-i,c=n[e][1]-o,s=-1;++s<=e;)r=n[s],u=s/e,r[0]=t*r[0]+(1-t)*(i+u*a),r[1]=t*r[1]+(1-t)*(o+u*c);return mo(n)}function _o(n,t){return n[0]*t[0]+n[1]*t[1]+n[2]*t[2]+n[3]*t[3]}function bo(n,t,e){n.push("C",_o(_s,t),",",_o(_s,e),",",_o(bs,t),",",_o(bs,e),",",_o(ws,t),",",_o(ws,e))}function wo(n,t){return(t[1]-n[1])/(t[0]-n[0])}function So(n){for(var t=0,e=n.length-1,r=[],u=n[0],i=n[1],o=r[0]=wo(u,i);++t<e;)r[t]=(o+(o=wo(u=i,i=n[t+1])))/2;return r[t]=o,r}function ko(n){for(var t,e,r,u,i=[],o=So(n),a=-1,c=n.length-1;++a<c;)t=wo(n[a],n[a+1]),oa(t)<Aa?o[a]=o[a+1]=0:(e=o[a]/t,r=o[a+1]/t,u=e*e+r*r,u>9&&(u=3*t/Math.sqrt(u),o[a]=u*e,o[a+1]=u*r));for(a=-1;++a<=c;)u=(n[Math.min(c,a+1)][0]-n[Math.max(0,a-1)][0])/(6*(1+o[a]*o[a])),i.push([u||0,o[a]*u||0]);return i}function Eo(n){return n.length<3?oo(n):n[0]+po(n,ko(n))}function Ao(n){for(var t,e,r,u=-1,i=n.length;++u<i;)t=n[u],e=t[0],r=t[1]+ys,t[0]=e*Math.cos(r),t[1]=e*Math.sin(r);return n}function Co(n){function t(t){function c(){v.push("M",a(n(m),f),l,s(n(d.reverse()),f),"Z")}for(var h,g,p,v=[],d=[],m=[],y=-1,x=t.length,M=_t(e),_=_t(u),b=e===r?function(){return g}:_t(r),w=u===i?function(){return p}:_t(i);++y<x;)o.call(this,h=t[y],y)?(d.push([g=+M.call(this,h,y),p=+_.call(this,h,y)]),m.push([+b.call(this,h,y),+w.call(this,h,y)])):d.length&&(c(),d=[],m=[]);return d.length&&c(),v.length?v.join(""):null}var e=br,r=br,u=0,i=wr,o=be,a=oo,c=a.key,s=a,l="L",f=.7;return t.x=function(n){return arguments.length?(e=r=n,t):r},t.x0=function(n){return arguments.length?(e=n,t):e},t.x1=function(n){return arguments.length?(r=n,t):r},t.y=function(n){return arguments.length?(u=i=n,t):i},t.y0=function(n){return arguments.length?(u=n,t):u},t.y1=function(n){return arguments.length?(i=n,t):i},t.defined=function(n){return arguments.length?(o=n,t):o},t.interpolate=function(n){return arguments.length?(c="function"==typeof n?a=n:(a=Ms.get(n)||oo).key,s=a.reverse||a,l=a.closed?"M":"L",t):c},t.tension=function(n){return arguments.length?(f=n,t):f},t}function No(n){return n.radius}function Lo(n){return[n.x,n.y]}function zo(n){return function(){var t=n.apply(this,arguments),e=t[0],r=t[1]+ys;return[e*Math.cos(r),e*Math.sin(r)]}}function qo(){return 64}function To(){return"circle"}function Ro(n){var t=Math.sqrt(n/Sa);return"M0,"+t+"A"+t+","+t+" 0 1,1 0,"+-t+"A"+t+","+t+" 0 1,1 0,"+t+"Z"}function Do(n,t){return fa(n,Ns),n.id=t,n}function Po(n,t,e,r){var u=n.id;return R(n,"function"==typeof e?function(n,i,o){n.__transition__[u].tween.set(t,r(e.call(n,n.__data__,i,o)))}:(e=r(e),function(n){n.__transition__[u].tween.set(t,e)}))}function Uo(n){return null==n&&(n=""),function(){this.textContent=n}}function jo(n,t,e,r){var i=n.__transition__||(n.__transition__={active:0,count:0}),o=i[e];if(!o){var a=r.time;o=i[e]={tween:new u,time:a,ease:r.ease,delay:r.delay,duration:r.duration},++i.count,Xo.timer(function(r){function u(r){return i.active>e?s():(i.active=e,o.event&&o.event.start.call(n,l,t),o.tween.forEach(function(e,r){(r=r.call(n,l,t))&&v.push(r)}),Xo.timer(function(){return p.c=c(r||1)?be:c,1},0,a),void 0)}function c(r){if(i.active!==e)return s();for(var u=r/g,a=f(u),c=v.length;c>0;)v[--c].call(n,a);return u>=1?(o.event&&o.event.end.call(n,l,t),s()):void 0}function s(){return--i.count?delete i[e]:delete n.__transition__,1}var l=n.__data__,f=o.ease,h=o.delay,g=o.duration,p=Ja,v=[];return p.t=h+a,r>=h?u(r-h):(p.c=u,void 0)},0,a)}}function Ho(n,t){n.attr("transform",function(n){return"translate("+t(n)+",0)"})}function Fo(n,t){n.attr("transform",function(n){return"translate(0,"+t(n)+")"})}function Oo(n){return n.toISOString()}function Yo(n,t,e){function r(t){return n(t)}function u(n,e){var r=n[1]-n[0],u=r/e,i=Xo.bisect(js,u);return i==js.length?[t.year,Yi(n.map(function(n){return n/31536e6}),e)[2]]:i?t[u/js[i-1]<js[i]/u?i-1:i]:[Os,Yi(n,e)[2]]
+}return r.invert=function(t){return Io(n.invert(t))},r.domain=function(t){return arguments.length?(n.domain(t),r):n.domain().map(Io)},r.nice=function(n,t){function e(e){return!isNaN(e)&&!n.range(e,Io(+e+1),t).length}var i=r.domain(),o=Ti(i),a=null==n?u(o,10):"number"==typeof n&&u(o,n);return a&&(n=a[0],t=a[1]),r.domain(Pi(i,t>1?{floor:function(t){for(;e(t=n.floor(t));)t=Io(t-1);return t},ceil:function(t){for(;e(t=n.ceil(t));)t=Io(+t+1);return t}}:n))},r.ticks=function(n,t){var e=Ti(r.domain()),i=null==n?u(e,10):"number"==typeof n?u(e,n):!n.range&&[{range:n},t];return i&&(n=i[0],t=i[1]),n.range(e[0],Io(+e[1]+1),1>t?1:t)},r.tickFormat=function(){return e},r.copy=function(){return Yo(n.copy(),t,e)},Fi(r,n)}function Io(n){return new Date(n)}function Zo(n){return JSON.parse(n.responseText)}function Vo(n){var t=Wo.createRange();return t.selectNode(Wo.body),t.createContextualFragment(n.responseText)}var Xo={version:"3.4.1"};Date.now||(Date.now=function(){return+new Date});var $o=[].slice,Bo=function(n){return $o.call(n)},Wo=document,Jo=Wo.documentElement,Go=window;try{Bo(Jo.childNodes)[0].nodeType}catch(Ko){Bo=function(n){for(var t=n.length,e=new Array(t);t--;)e[t]=n[t];return e}}try{Wo.createElement("div").style.setProperty("opacity",0,"")}catch(Qo){var na=Go.Element.prototype,ta=na.setAttribute,ea=na.setAttributeNS,ra=Go.CSSStyleDeclaration.prototype,ua=ra.setProperty;na.setAttribute=function(n,t){ta.call(this,n,t+"")},na.setAttributeNS=function(n,t,e){ea.call(this,n,t,e+"")},ra.setProperty=function(n,t,e){ua.call(this,n,t+"",e)}}Xo.ascending=function(n,t){return t>n?-1:n>t?1:n>=t?0:0/0},Xo.descending=function(n,t){return n>t?-1:t>n?1:t>=n?0:0/0},Xo.min=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i&&!(null!=(e=n[u])&&e>=e);)e=void 0;for(;++u<i;)null!=(r=n[u])&&e>r&&(e=r)}else{for(;++u<i&&!(null!=(e=t.call(n,n[u],u))&&e>=e);)e=void 0;for(;++u<i;)null!=(r=t.call(n,n[u],u))&&e>r&&(e=r)}return e},Xo.max=function(n,t){var e,r,u=-1,i=n.length;if(1===arguments.length){for(;++u<i&&!(null!=(e=n[u])&&e>=e);)e=void 0;for(;++u<i;)null!=(r=n[u])&&r>e&&(e=r)}else{for(;++u<i&&!(null!=(e=t.call(n,n[u],u))&&e>=e);)e=void 0;for(;++u<i;)null!=(r=t.call(n,n[u],u))&&r>e&&(e=r)}return e},Xo.extent=function(n,t){var e,r,u,i=-1,o=n.length;if(1===arguments.length){for(;++i<o&&!(null!=(e=u=n[i])&&e>=e);)e=u=void 0;for(;++i<o;)null!=(r=n[i])&&(e>r&&(e=r),r>u&&(u=r))}else{for(;++i<o&&!(null!=(e=u=t.call(n,n[i],i))&&e>=e);)e=void 0;for(;++i<o;)null!=(r=t.call(n,n[i],i))&&(e>r&&(e=r),r>u&&(u=r))}return[e,u]},Xo.sum=function(n,t){var e,r=0,u=n.length,i=-1;if(1===arguments.length)for(;++i<u;)isNaN(e=+n[i])||(r+=e);else for(;++i<u;)isNaN(e=+t.call(n,n[i],i))||(r+=e);return r},Xo.mean=function(t,e){var r,u=t.length,i=0,o=-1,a=0;if(1===arguments.length)for(;++o<u;)n(r=t[o])&&(i+=(r-i)/++a);else for(;++o<u;)n(r=e.call(t,t[o],o))&&(i+=(r-i)/++a);return a?i:void 0},Xo.quantile=function(n,t){var e=(n.length-1)*t+1,r=Math.floor(e),u=+n[r-1],i=e-r;return i?u+i*(n[r]-u):u},Xo.median=function(t,e){return arguments.length>1&&(t=t.map(e)),t=t.filter(n),t.length?Xo.quantile(t.sort(Xo.ascending),.5):void 0},Xo.bisector=function(n){return{left:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;n.call(t,t[i],i)<e?r=i+1:u=i}return r},right:function(t,e,r,u){for(arguments.length<3&&(r=0),arguments.length<4&&(u=t.length);u>r;){var i=r+u>>>1;e<n.call(t,t[i],i)?u=i:r=i+1}return r}}};var ia=Xo.bisector(function(n){return n});Xo.bisectLeft=ia.left,Xo.bisect=Xo.bisectRight=ia.right,Xo.shuffle=function(n){for(var t,e,r=n.length;r;)e=0|Math.random()*r--,t=n[r],n[r]=n[e],n[e]=t;return n},Xo.permute=function(n,t){for(var e=t.length,r=new Array(e);e--;)r[e]=n[t[e]];return r},Xo.pairs=function(n){for(var t,e=0,r=n.length-1,u=n[0],i=new Array(0>r?0:r);r>e;)i[e]=[t=u,u=n[++e]];return i},Xo.zip=function(){if(!(u=arguments.length))return[];for(var n=-1,e=Xo.min(arguments,t),r=new Array(e);++n<e;)for(var u,i=-1,o=r[n]=new Array(u);++i<u;)o[i]=arguments[i][n];return r},Xo.transpose=function(n){return Xo.zip.apply(Xo,n)},Xo.keys=function(n){var t=[];for(var e in n)t.push(e);return t},Xo.values=function(n){var t=[];for(var e in n)t.push(n[e]);return t},Xo.entries=function(n){var t=[];for(var e in n)t.push({key:e,value:n[e]});return t},Xo.merge=function(n){for(var t,e,r,u=n.length,i=-1,o=0;++i<u;)o+=n[i].length;for(e=new Array(o);--u>=0;)for(r=n[u],t=r.length;--t>=0;)e[--o]=r[t];return e};var oa=Math.abs;Xo.range=function(n,t,r){if(arguments.length<3&&(r=1,arguments.length<2&&(t=n,n=0)),1/0===(t-n)/r)throw new Error("infinite range");var u,i=[],o=e(oa(r)),a=-1;if(n*=o,t*=o,r*=o,0>r)for(;(u=n+r*++a)>t;)i.push(u/o);else for(;(u=n+r*++a)<t;)i.push(u/o);return i},Xo.map=function(n){var t=new u;if(n instanceof u)n.forEach(function(n,e){t.set(n,e)});else for(var e in n)t.set(e,n[e]);return t},r(u,{has:i,get:function(n){return this[aa+n]},set:function(n,t){return this[aa+n]=t},remove:o,keys:a,values:function(){var n=[];return this.forEach(function(t,e){n.push(e)}),n},entries:function(){var n=[];return this.forEach(function(t,e){n.push({key:t,value:e})}),n},size:c,empty:s,forEach:function(n){for(var t in this)t.charCodeAt(0)===ca&&n.call(this,t.substring(1),this[t])}});var aa="\x00",ca=aa.charCodeAt(0);Xo.nest=function(){function n(t,a,c){if(c>=o.length)return r?r.call(i,a):e?a.sort(e):a;for(var s,l,f,h,g=-1,p=a.length,v=o[c++],d=new u;++g<p;)(h=d.get(s=v(l=a[g])))?h.push(l):d.set(s,[l]);return t?(l=t(),f=function(e,r){l.set(e,n(t,r,c))}):(l={},f=function(e,r){l[e]=n(t,r,c)}),d.forEach(f),l}function t(n,e){if(e>=o.length)return n;var r=[],u=a[e++];return n.forEach(function(n,u){r.push({key:n,values:t(u,e)})}),u?r.sort(function(n,t){return u(n.key,t.key)}):r}var e,r,i={},o=[],a=[];return i.map=function(t,e){return n(e,t,0)},i.entries=function(e){return t(n(Xo.map,e,0),0)},i.key=function(n){return o.push(n),i},i.sortKeys=function(n){return a[o.length-1]=n,i},i.sortValues=function(n){return e=n,i},i.rollup=function(n){return r=n,i},i},Xo.set=function(n){var t=new l;if(n)for(var e=0,r=n.length;r>e;++e)t.add(n[e]);return t},r(l,{has:i,add:function(n){return this[aa+n]=!0,n},remove:function(n){return n=aa+n,n in this&&delete this[n]},values:a,size:c,empty:s,forEach:function(n){for(var t in this)t.charCodeAt(0)===ca&&n.call(this,t.substring(1))}}),Xo.behavior={},Xo.rebind=function(n,t){for(var e,r=1,u=arguments.length;++r<u;)n[e=arguments[r]]=f(n,t,t[e]);return n};var sa=["webkit","ms","moz","Moz","o","O"];Xo.dispatch=function(){for(var n=new p,t=-1,e=arguments.length;++t<e;)n[arguments[t]]=v(n);return n},p.prototype.on=function(n,t){var e=n.indexOf("."),r="";if(e>=0&&(r=n.substring(e+1),n=n.substring(0,e)),n)return arguments.length<2?this[n].on(r):this[n].on(r,t);if(2===arguments.length){if(null==t)for(n in this)this.hasOwnProperty(n)&&this[n].on(r,null);return this}},Xo.event=null,Xo.requote=function(n){return n.replace(la,"\\$&")};var la=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g,fa={}.__proto__?function(n,t){n.__proto__=t}:function(n,t){for(var e in t)n[e]=t[e]},ha=function(n,t){return t.querySelector(n)},ga=function(n,t){return t.querySelectorAll(n)},pa=Jo[h(Jo,"matchesSelector")],va=function(n,t){return pa.call(n,t)};"function"==typeof Sizzle&&(ha=function(n,t){return Sizzle(n,t)[0]||null},ga=function(n,t){return Sizzle.uniqueSort(Sizzle(n,t))},va=Sizzle.matchesSelector),Xo.selection=function(){return xa};var da=Xo.selection.prototype=[];da.select=function(n){var t,e,r,u,i=[];n=M(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]),t.parentNode=(r=this[o]).parentNode;for(var c=-1,s=r.length;++c<s;)(u=r[c])?(t.push(e=n.call(u,u.__data__,c,o)),e&&"__data__"in u&&(e.__data__=u.__data__)):t.push(null)}return x(i)},da.selectAll=function(n){var t,e,r=[];n=_(n);for(var u=-1,i=this.length;++u<i;)for(var o=this[u],a=-1,c=o.length;++a<c;)(e=o[a])&&(r.push(t=Bo(n.call(e,e.__data__,a,u))),t.parentNode=e);return x(r)};var ma={svg:"http://www.w3.org/2000/svg",xhtml:"http://www.w3.org/1999/xhtml",xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"};Xo.ns={prefix:ma,qualify:function(n){var t=n.indexOf(":"),e=n;return t>=0&&(e=n.substring(0,t),n=n.substring(t+1)),ma.hasOwnProperty(e)?{space:ma[e],local:n}:n}},da.attr=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node();return n=Xo.ns.qualify(n),n.local?e.getAttributeNS(n.space,n.local):e.getAttribute(n)}for(t in n)this.each(b(t,n[t]));return this}return this.each(b(n,t))},da.classed=function(n,t){if(arguments.length<2){if("string"==typeof n){var e=this.node(),r=(n=k(n)).length,u=-1;if(t=e.classList){for(;++u<r;)if(!t.contains(n[u]))return!1}else for(t=e.getAttribute("class");++u<r;)if(!S(n[u]).test(t))return!1;return!0}for(t in n)this.each(E(t,n[t]));return this}return this.each(E(n,t))},da.style=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t="");for(e in n)this.each(C(e,n[e],t));return this}if(2>r)return Go.getComputedStyle(this.node(),null).getPropertyValue(n);e=""}return this.each(C(n,t,e))},da.property=function(n,t){if(arguments.length<2){if("string"==typeof n)return this.node()[n];for(t in n)this.each(N(t,n[t]));return this}return this.each(N(n,t))},da.text=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.textContent=null==t?"":t}:null==n?function(){this.textContent=""}:function(){this.textContent=n}):this.node().textContent},da.html=function(n){return arguments.length?this.each("function"==typeof n?function(){var t=n.apply(this,arguments);this.innerHTML=null==t?"":t}:null==n?function(){this.innerHTML=""}:function(){this.innerHTML=n}):this.node().innerHTML},da.append=function(n){return n=L(n),this.select(function(){return this.appendChild(n.apply(this,arguments))})},da.insert=function(n,t){return n=L(n),t=M(t),this.select(function(){return this.insertBefore(n.apply(this,arguments),t.apply(this,arguments)||null)})},da.remove=function(){return this.each(function(){var n=this.parentNode;n&&n.removeChild(this)})},da.data=function(n,t){function e(n,e){var r,i,o,a=n.length,f=e.length,h=Math.min(a,f),g=new Array(f),p=new Array(f),v=new Array(a);if(t){var d,m=new u,y=new u,x=[];for(r=-1;++r<a;)d=t.call(i=n[r],i.__data__,r),m.has(d)?v[r]=i:m.set(d,i),x.push(d);for(r=-1;++r<f;)d=t.call(e,o=e[r],r),(i=m.get(d))?(g[r]=i,i.__data__=o):y.has(d)||(p[r]=z(o)),y.set(d,o),m.remove(d);for(r=-1;++r<a;)m.has(x[r])&&(v[r]=n[r])}else{for(r=-1;++r<h;)i=n[r],o=e[r],i?(i.__data__=o,g[r]=i):p[r]=z(o);for(;f>r;++r)p[r]=z(e[r]);for(;a>r;++r)v[r]=n[r]}p.update=g,p.parentNode=g.parentNode=v.parentNode=n.parentNode,c.push(p),s.push(g),l.push(v)}var r,i,o=-1,a=this.length;if(!arguments.length){for(n=new Array(a=(r=this[0]).length);++o<a;)(i=r[o])&&(n[o]=i.__data__);return n}var c=D([]),s=x([]),l=x([]);if("function"==typeof n)for(;++o<a;)e(r=this[o],n.call(r,r.parentNode.__data__,o));else for(;++o<a;)e(r=this[o],n);return s.enter=function(){return c},s.exit=function(){return l},s},da.datum=function(n){return arguments.length?this.property("__data__",n):this.property("__data__")},da.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=q(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]),t.parentNode=(e=this[i]).parentNode;for(var a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return x(u)},da.order=function(){for(var n=-1,t=this.length;++n<t;)for(var e,r=this[n],u=r.length-1,i=r[u];--u>=0;)(e=r[u])&&(i&&i!==e.nextSibling&&i.parentNode.insertBefore(e,i),i=e);return this},da.sort=function(n){n=T.apply(this,arguments);for(var t=-1,e=this.length;++t<e;)this[t].sort(n);return this.order()},da.each=function(n){return R(this,function(t,e,r){n.call(t,t.__data__,e,r)})},da.call=function(n){var t=Bo(arguments);return n.apply(t[0]=this,t),this},da.empty=function(){return!this.node()},da.node=function(){for(var n=0,t=this.length;t>n;n++)for(var e=this[n],r=0,u=e.length;u>r;r++){var i=e[r];if(i)return i}return null},da.size=function(){var n=0;return this.each(function(){++n}),n};var ya=[];Xo.selection.enter=D,Xo.selection.enter.prototype=ya,ya.append=da.append,ya.empty=da.empty,ya.node=da.node,ya.call=da.call,ya.size=da.size,ya.select=function(n){for(var t,e,r,u,i,o=[],a=-1,c=this.length;++a<c;){r=(u=this[a]).update,o.push(t=[]),t.parentNode=u.parentNode;for(var s=-1,l=u.length;++s<l;)(i=u[s])?(t.push(r[s]=e=n.call(u.parentNode,i.__data__,s,a)),e.__data__=i.__data__):t.push(null)}return x(o)},ya.insert=function(n,t){return arguments.length<2&&(t=P(this)),da.insert.call(this,n,t)},da.transition=function(){for(var n,t,e=ks||++Ls,r=[],u=Es||{time:Date.now(),ease:yu,delay:0,duration:250},i=-1,o=this.length;++i<o;){r.push(n=[]);for(var a=this[i],c=-1,s=a.length;++c<s;)(t=a[c])&&jo(t,c,e,u),n.push(t)}return Do(r,e)},da.interrupt=function(){return this.each(U)},Xo.select=function(n){var t=["string"==typeof n?ha(n,Wo):n];return t.parentNode=Jo,x([t])},Xo.selectAll=function(n){var t=Bo("string"==typeof n?ga(n,Wo):n);return t.parentNode=Jo,x([t])};var xa=Xo.select(Jo);da.on=function(n,t,e){var r=arguments.length;if(3>r){if("string"!=typeof n){2>r&&(t=!1);for(e in n)this.each(j(e,n[e],t));return this}if(2>r)return(r=this.node()["__on"+n])&&r._;e=!1}return this.each(j(n,t,e))};var Ma=Xo.map({mouseenter:"mouseover",mouseleave:"mouseout"});Ma.forEach(function(n){"on"+n in Wo&&Ma.remove(n)});var _a="onselectstart"in Wo?null:h(Jo.style,"userSelect"),ba=0;Xo.mouse=function(n){return Y(n,m())};var wa=/WebKit/.test(Go.navigator.userAgent)?-1:0;Xo.touches=function(n,t){return arguments.length<2&&(t=m().touches),t?Bo(t).map(function(t){var e=Y(n,t);return e.identifier=t.identifier,e}):[]},Xo.behavior.drag=function(){function n(){this.on("mousedown.drag",o).on("touchstart.drag",a)}function t(){return Xo.event.changedTouches[0].identifier}function e(n,t){return Xo.touches(n).filter(function(n){return n.identifier===t})[0]}function r(n,t,e,r){return function(){function o(){var n=t(l,g),e=n[0]-v[0],r=n[1]-v[1];d|=e|r,v=n,f({type:"drag",x:n[0]+c[0],y:n[1]+c[1],dx:e,dy:r})}function a(){m.on(e+"."+p,null).on(r+"."+p,null),y(d&&Xo.event.target===h),f({type:"dragend"})}var c,s=this,l=s.parentNode,f=u.of(s,arguments),h=Xo.event.target,g=n(),p=null==g?"drag":"drag-"+g,v=t(l,g),d=0,m=Xo.select(Go).on(e+"."+p,o).on(r+"."+p,a),y=O();i?(c=i.apply(s,arguments),c=[c.x-v[0],c.y-v[1]]):c=[0,0],f({type:"dragstart"})}}var u=y(n,"drag","dragstart","dragend"),i=null,o=r(g,Xo.mouse,"mousemove","mouseup"),a=r(t,e,"touchmove","touchend");return n.origin=function(t){return arguments.length?(i=t,n):i},Xo.rebind(n,u,"on")};var Sa=Math.PI,ka=2*Sa,Ea=Sa/2,Aa=1e-6,Ca=Aa*Aa,Na=Sa/180,La=180/Sa,za=Math.SQRT2,qa=2,Ta=4;Xo.interpolateZoom=function(n,t){function e(n){var t=n*y;if(m){var e=B(v),o=i/(qa*h)*(e*W(za*t+v)-$(v));return[r+o*s,u+o*l,i*e/B(za*t+v)]}return[r+n*s,u+n*l,i*Math.exp(za*t)]}var r=n[0],u=n[1],i=n[2],o=t[0],a=t[1],c=t[2],s=o-r,l=a-u,f=s*s+l*l,h=Math.sqrt(f),g=(c*c-i*i+Ta*f)/(2*i*qa*h),p=(c*c-i*i-Ta*f)/(2*c*qa*h),v=Math.log(Math.sqrt(g*g+1)-g),d=Math.log(Math.sqrt(p*p+1)-p),m=d-v,y=(m||Math.log(c/i))/za;return e.duration=1e3*y,e},Xo.behavior.zoom=function(){function n(n){n.on(A,s).on(Pa+".zoom",f).on(C,h).on("dblclick.zoom",g).on(L,l)}function t(n){return[(n[0]-S.x)/S.k,(n[1]-S.y)/S.k]}function e(n){return[n[0]*S.k+S.x,n[1]*S.k+S.y]}function r(n){S.k=Math.max(E[0],Math.min(E[1],n))}function u(n,t){t=e(t),S.x+=n[0]-t[0],S.y+=n[1]-t[1]}function i(){_&&_.domain(M.range().map(function(n){return(n-S.x)/S.k}).map(M.invert)),w&&w.domain(b.range().map(function(n){return(n-S.y)/S.k}).map(b.invert))}function o(n){n({type:"zoomstart"})}function a(n){i(),n({type:"zoom",scale:S.k,translate:[S.x,S.y]})}function c(n){n({type:"zoomend"})}function s(){function n(){l=1,u(Xo.mouse(r),g),a(i)}function e(){f.on(C,Go===r?h:null).on(N,null),p(l&&Xo.event.target===s),c(i)}var r=this,i=z.of(r,arguments),s=Xo.event.target,l=0,f=Xo.select(Go).on(C,n).on(N,e),g=t(Xo.mouse(r)),p=O();U.call(r),o(i)}function l(){function n(){var n=Xo.touches(g);return h=S.k,n.forEach(function(n){n.identifier in v&&(v[n.identifier]=t(n))}),n}function e(){for(var t=Xo.event.changedTouches,e=0,i=t.length;i>e;++e)v[t[e].identifier]=null;var o=n(),c=Date.now();if(1===o.length){if(500>c-x){var s=o[0],l=v[s.identifier];r(2*S.k),u(s,l),d(),a(p)}x=c}else if(o.length>1){var s=o[0],f=o[1],h=s[0]-f[0],g=s[1]-f[1];m=h*h+g*g}}function i(){for(var n,t,e,i,o=Xo.touches(g),c=0,s=o.length;s>c;++c,i=null)if(e=o[c],i=v[e.identifier]){if(t)break;n=e,t=i}if(i){var l=(l=e[0]-n[0])*l+(l=e[1]-n[1])*l,f=m&&Math.sqrt(l/m);n=[(n[0]+e[0])/2,(n[1]+e[1])/2],t=[(t[0]+i[0])/2,(t[1]+i[1])/2],r(f*h)}x=null,u(n,t),a(p)}function f(){if(Xo.event.touches.length){for(var t=Xo.event.changedTouches,e=0,r=t.length;r>e;++e)delete v[t[e].identifier];for(var u in v)return void n()}b.on(M,null).on(_,null),w.on(A,s).on(L,l),k(),c(p)}var h,g=this,p=z.of(g,arguments),v={},m=0,y=Xo.event.changedTouches[0].identifier,M="touchmove.zoom-"+y,_="touchend.zoom-"+y,b=Xo.select(Go).on(M,i).on(_,f),w=Xo.select(g).on(A,null).on(L,e),k=O();U.call(g),e(),o(p)}function f(){var n=z.of(this,arguments);m?clearTimeout(m):(U.call(this),o(n)),m=setTimeout(function(){m=null,c(n)},50),d();var e=v||Xo.mouse(this);p||(p=t(e)),r(Math.pow(2,.002*Ra())*S.k),u(e,p),a(n)}function h(){p=null}function g(){var n=z.of(this,arguments),e=Xo.mouse(this),i=t(e),s=Math.log(S.k)/Math.LN2;o(n),r(Math.pow(2,Xo.event.shiftKey?Math.ceil(s)-1:Math.floor(s)+1)),u(e,i),a(n),c(n)}var p,v,m,x,M,_,b,w,S={x:0,y:0,k:1},k=[960,500],E=Da,A="mousedown.zoom",C="mousemove.zoom",N="mouseup.zoom",L="touchstart.zoom",z=y(n,"zoomstart","zoom","zoomend");return n.event=function(n){n.each(function(){var n=z.of(this,arguments),t=S;ks?Xo.select(this).transition().each("start.zoom",function(){S=this.__chart__||{x:0,y:0,k:1},o(n)}).tween("zoom:zoom",function(){var e=k[0],r=k[1],u=e/2,i=r/2,o=Xo.interpolateZoom([(u-S.x)/S.k,(i-S.y)/S.k,e/S.k],[(u-t.x)/t.k,(i-t.y)/t.k,e/t.k]);return function(t){var r=o(t),c=e/r[2];this.__chart__=S={x:u-r[0]*c,y:i-r[1]*c,k:c},a(n)}}).each("end.zoom",function(){c(n)}):(this.__chart__=S,o(n),a(n),c(n))})},n.translate=function(t){return arguments.length?(S={x:+t[0],y:+t[1],k:S.k},i(),n):[S.x,S.y]},n.scale=function(t){return arguments.length?(S={x:S.x,y:S.y,k:+t},i(),n):S.k},n.scaleExtent=function(t){return arguments.length?(E=null==t?Da:[+t[0],+t[1]],n):E},n.center=function(t){return arguments.length?(v=t&&[+t[0],+t[1]],n):v},n.size=function(t){return arguments.length?(k=t&&[+t[0],+t[1]],n):k},n.x=function(t){return arguments.length?(_=t,M=t.copy(),S={x:0,y:0,k:1},n):_},n.y=function(t){return arguments.length?(w=t,b=t.copy(),S={x:0,y:0,k:1},n):w},Xo.rebind(n,z,"on")};var Ra,Da=[0,1/0],Pa="onwheel"in Wo?(Ra=function(){return-Xo.event.deltaY*(Xo.event.deltaMode?120:1)},"wheel"):"onmousewheel"in Wo?(Ra=function(){return Xo.event.wheelDelta},"mousewheel"):(Ra=function(){return-Xo.event.detail},"MozMousePixelScroll");G.prototype.toString=function(){return this.rgb()+""},Xo.hsl=function(n,t,e){return 1===arguments.length?n instanceof Q?K(n.h,n.s,n.l):dt(""+n,mt,K):K(+n,+t,+e)};var Ua=Q.prototype=new G;Ua.brighter=function(n){return n=Math.pow(.7,arguments.length?n:1),K(this.h,this.s,this.l/n)},Ua.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),K(this.h,this.s,n*this.l)},Ua.rgb=function(){return nt(this.h,this.s,this.l)},Xo.hcl=function(n,t,e){return 1===arguments.length?n instanceof et?tt(n.h,n.c,n.l):n instanceof it?at(n.l,n.a,n.b):at((n=yt((n=Xo.rgb(n)).r,n.g,n.b)).l,n.a,n.b):tt(+n,+t,+e)};var ja=et.prototype=new G;ja.brighter=function(n){return tt(this.h,this.c,Math.min(100,this.l+Ha*(arguments.length?n:1)))},ja.darker=function(n){return tt(this.h,this.c,Math.max(0,this.l-Ha*(arguments.length?n:1)))},ja.rgb=function(){return rt(this.h,this.c,this.l).rgb()},Xo.lab=function(n,t,e){return 1===arguments.length?n instanceof it?ut(n.l,n.a,n.b):n instanceof et?rt(n.l,n.c,n.h):yt((n=Xo.rgb(n)).r,n.g,n.b):ut(+n,+t,+e)};var Ha=18,Fa=.95047,Oa=1,Ya=1.08883,Ia=it.prototype=new G;Ia.brighter=function(n){return ut(Math.min(100,this.l+Ha*(arguments.length?n:1)),this.a,this.b)},Ia.darker=function(n){return ut(Math.max(0,this.l-Ha*(arguments.length?n:1)),this.a,this.b)},Ia.rgb=function(){return ot(this.l,this.a,this.b)},Xo.rgb=function(n,t,e){return 1===arguments.length?n instanceof pt?gt(n.r,n.g,n.b):dt(""+n,gt,nt):gt(~~n,~~t,~~e)};var Za=pt.prototype=new G;Za.brighter=function(n){n=Math.pow(.7,arguments.length?n:1);var t=this.r,e=this.g,r=this.b,u=30;return t||e||r?(t&&u>t&&(t=u),e&&u>e&&(e=u),r&&u>r&&(r=u),gt(Math.min(255,~~(t/n)),Math.min(255,~~(e/n)),Math.min(255,~~(r/n)))):gt(u,u,u)},Za.darker=function(n){return n=Math.pow(.7,arguments.length?n:1),gt(~~(n*this.r),~~(n*this.g),~~(n*this.b))},Za.hsl=function(){return mt(this.r,this.g,this.b)},Za.toString=function(){return"#"+vt(this.r)+vt(this.g)+vt(this.b)};var Va=Xo.map({aliceblue:15792383,antiquewhite:16444375,aqua:65535,aquamarine:8388564,azure:15794175,beige:16119260,bisque:16770244,black:0,blanchedalmond:16772045,blue:255,blueviolet:9055202,brown:10824234,burlywood:14596231,cadetblue:6266528,chartreuse:8388352,chocolate:13789470,coral:16744272,cornflowerblue:6591981,cornsilk:16775388,crimson:14423100,cyan:65535,darkblue:139,darkcyan:35723,darkgoldenrod:12092939,darkgray:11119017,darkgreen:25600,darkgrey:11119017,darkkhaki:12433259,darkmagenta:9109643,darkolivegreen:5597999,darkorange:16747520,darkorchid:10040012,darkred:9109504,darksalmon:15308410,darkseagreen:9419919,darkslateblue:4734347,darkslategray:3100495,darkslategrey:3100495,darkturquoise:52945,darkviolet:9699539,deeppink:16716947,deepskyblue:49151,dimgray:6908265,dimgrey:6908265,dodgerblue:2003199,firebrick:11674146,floralwhite:16775920,forestgreen:2263842,fuchsia:16711935,gainsboro:14474460,ghostwhite:16316671,gold:16766720,goldenrod:14329120,gray:8421504,green:32768,greenyellow:11403055,grey:8421504,honeydew:15794160,hotpink:16738740,indianred:13458524,indigo:4915330,ivory:16777200,khaki:15787660,lavender:15132410,lavenderblush:16773365,lawngreen:8190976,lemonchiffon:16775885,lightblue:11393254,lightcoral:15761536,lightcyan:14745599,lightgoldenrodyellow:16448210,lightgray:13882323,lightgreen:9498256,lightgrey:13882323,lightpink:16758465,lightsalmon:16752762,lightseagreen:2142890,lightskyblue:8900346,lightslategray:7833753,lightslategrey:7833753,lightsteelblue:11584734,lightyellow:16777184,lime:65280,limegreen:3329330,linen:16445670,magenta:16711935,maroon:8388608,mediumaquamarine:6737322,mediumblue:205,mediumorchid:12211667,mediumpurple:9662683,mediumseagreen:3978097,mediumslateblue:8087790,mediumspringgreen:64154,mediumturquoise:4772300,mediumvioletred:13047173,midnightblue:1644912,mintcream:16121850,mistyrose:16770273,moccasin:16770229,navajowhite:16768685,navy:128,oldlace:16643558,olive:8421376,olivedrab:7048739,orange:16753920,orangered:16729344,orchid:14315734,palegoldenrod:15657130,palegreen:10025880,paleturquoise:11529966,palevioletred:14381203,papayawhip:16773077,peachpuff:16767673,peru:13468991,pink:16761035,plum:14524637,powderblue:11591910,purple:8388736,red:16711680,rosybrown:12357519,royalblue:4286945,saddlebrown:9127187,salmon:16416882,sandybrown:16032864,seagreen:3050327,seashell:16774638,sienna:10506797,silver:12632256,skyblue:8900331,slateblue:6970061,slategray:7372944,slategrey:7372944,snow:16775930,springgreen:65407,steelblue:4620980,tan:13808780,teal:32896,thistle:14204888,tomato:16737095,turquoise:4251856,violet:15631086,wheat:16113331,white:16777215,whitesmoke:16119285,yellow:16776960,yellowgreen:10145074});Va.forEach(function(n,t){Va.set(n,ft(t))}),Xo.functor=_t,Xo.xhr=wt(bt),Xo.dsv=function(n,t){function e(n,e,i){arguments.length<3&&(i=e,e=null);var o=St(n,t,null==e?r:u(e),i);return o.row=function(n){return arguments.length?o.response(null==(e=n)?r:u(n)):e},o}function r(n){return e.parse(n.responseText)}function u(n){return function(t){return e.parse(t.responseText,n)}}function i(t){return t.map(o).join(n)}function o(n){return a.test(n)?'"'+n.replace(/\"/g,'""')+'"':n}var a=new RegExp('["'+n+"\n]"),c=n.charCodeAt(0);return e.parse=function(n,t){var r;return e.parseRows(n,function(n,e){if(r)return r(n,e-1);var u=new Function("d","return {"+n.map(function(n,t){return JSON.stringify(n)+": d["+t+"]"}).join(",")+"}");r=t?function(n,e){return t(u(n),e)}:u})},e.parseRows=function(n,t){function e(){if(l>=s)return o;if(u)return u=!1,i;var t=l;if(34===n.charCodeAt(t)){for(var e=t;e++<s;)if(34===n.charCodeAt(e)){if(34!==n.charCodeAt(e+1))break;++e}l=e+2;var r=n.charCodeAt(e+1);return 13===r?(u=!0,10===n.charCodeAt(e+2)&&++l):10===r&&(u=!0),n.substring(t+1,e).replace(/""/g,'"')}for(;s>l;){var r=n.charCodeAt(l++),a=1;if(10===r)u=!0;else if(13===r)u=!0,10===n.charCodeAt(l)&&(++l,++a);else if(r!==c)continue;return n.substring(t,l-a)}return n.substring(t)}for(var r,u,i={},o={},a=[],s=n.length,l=0,f=0;(r=e())!==o;){for(var h=[];r!==i&&r!==o;)h.push(r),r=e();(!t||(h=t(h,f++)))&&a.push(h)}return a},e.format=function(t){if(Array.isArray(t[0]))return e.formatRows(t);var r=new l,u=[];return t.forEach(function(n){for(var t in n)r.has(t)||u.push(r.add(t))}),[u.map(o).join(n)].concat(t.map(function(t){return u.map(function(n){return o(t[n])}).join(n)})).join("\n")},e.formatRows=function(n){return n.map(i).join("\n")},e},Xo.csv=Xo.dsv(",","text/csv"),Xo.tsv=Xo.dsv("	","text/tab-separated-values");var Xa,$a,Ba,Wa,Ja,Ga=Go[h(Go,"requestAnimationFrame")]||function(n){setTimeout(n,17)};Xo.timer=function(n,t,e){var r=arguments.length;2>r&&(t=0),3>r&&(e=Date.now());var u=e+t,i={c:n,t:u,f:!1,n:null};$a?$a.n=i:Xa=i,$a=i,Ba||(Wa=clearTimeout(Wa),Ba=1,Ga(Et))},Xo.timer.flush=function(){At(),Ct()},Xo.round=function(n,t){return t?Math.round(n*(t=Math.pow(10,t)))/t:Math.round(n)};var Ka=["y","z","a","f","p","n","\xb5","m","","k","M","G","T","P","E","Z","Y"].map(Lt);Xo.formatPrefix=function(n,t){var e=0;return n&&(0>n&&(n*=-1),t&&(n=Xo.round(n,Nt(n,t))),e=1+Math.floor(1e-12+Math.log(n)/Math.LN10),e=Math.max(-24,Math.min(24,3*Math.floor((0>=e?e+1:e-1)/3)))),Ka[8+e/3]};var Qa=/(?:([^{])?([<>=^]))?([+\- ])?([$#])?(0)?(\d+)?(,)?(\.-?\d+)?([a-z%])?/i,nc=Xo.map({b:function(n){return n.toString(2)},c:function(n){return String.fromCharCode(n)},o:function(n){return n.toString(8)},x:function(n){return n.toString(16)},X:function(n){return n.toString(16).toUpperCase()},g:function(n,t){return n.toPrecision(t)},e:function(n,t){return n.toExponential(t)},f:function(n,t){return n.toFixed(t)},r:function(n,t){return(n=Xo.round(n,Nt(n,t))).toFixed(Math.max(0,Math.min(20,Nt(n*(1+1e-15),t))))}}),tc=Xo.time={},ec=Date;Tt.prototype={getDate:function(){return this._.getUTCDate()},getDay:function(){return this._.getUTCDay()},getFullYear:function(){return this._.getUTCFullYear()},getHours:function(){return this._.getUTCHours()},getMilliseconds:function(){return this._.getUTCMilliseconds()},getMinutes:function(){return this._.getUTCMinutes()},getMonth:function(){return this._.getUTCMonth()},getSeconds:function(){return this._.getUTCSeconds()},getTime:function(){return this._.getTime()},getTimezoneOffset:function(){return 0},valueOf:function(){return this._.valueOf()},setDate:function(){rc.setUTCDate.apply(this._,arguments)},setDay:function(){rc.setUTCDay.apply(this._,arguments)},setFullYear:function(){rc.setUTCFullYear.apply(this._,arguments)},setHours:function(){rc.setUTCHours.apply(this._,arguments)},setMilliseconds:function(){rc.setUTCMilliseconds.apply(this._,arguments)},setMinutes:function(){rc.setUTCMinutes.apply(this._,arguments)},setMonth:function(){rc.setUTCMonth.apply(this._,arguments)},setSeconds:function(){rc.setUTCSeconds.apply(this._,arguments)},setTime:function(){rc.setTime.apply(this._,arguments)}};var rc=Date.prototype;tc.year=Rt(function(n){return n=tc.day(n),n.setMonth(0,1),n},function(n,t){n.setFullYear(n.getFullYear()+t)},function(n){return n.getFullYear()}),tc.years=tc.year.range,tc.years.utc=tc.year.utc.range,tc.day=Rt(function(n){var t=new ec(2e3,0);return t.setFullYear(n.getFullYear(),n.getMonth(),n.getDate()),t},function(n,t){n.setDate(n.getDate()+t)},function(n){return n.getDate()-1}),tc.days=tc.day.range,tc.days.utc=tc.day.utc.range,tc.dayOfYear=function(n){var t=tc.year(n);return Math.floor((n-t-6e4*(n.getTimezoneOffset()-t.getTimezoneOffset()))/864e5)},["sunday","monday","tuesday","wednesday","thursday","friday","saturday"].forEach(function(n,t){t=7-t;var e=tc[n]=Rt(function(n){return(n=tc.day(n)).setDate(n.getDate()-(n.getDay()+t)%7),n},function(n,t){n.setDate(n.getDate()+7*Math.floor(t))},function(n){var e=tc.year(n).getDay();return Math.floor((tc.dayOfYear(n)+(e+t)%7)/7)-(e!==t)});tc[n+"s"]=e.range,tc[n+"s"].utc=e.utc.range,tc[n+"OfYear"]=function(n){var e=tc.year(n).getDay();return Math.floor((tc.dayOfYear(n)+(e+t)%7)/7)}}),tc.week=tc.sunday,tc.weeks=tc.sunday.range,tc.weeks.utc=tc.sunday.utc.range,tc.weekOfYear=tc.sundayOfYear;var uc={"-":"",_:" ",0:"0"},ic=/^\s*\d+/,oc=/^%/;Xo.locale=function(n){return{numberFormat:zt(n),timeFormat:Pt(n)}};var ac=Xo.locale({decimal:".",thousands:",",grouping:[3],currency:["$",""],dateTime:"%a %b %e %X %Y",date:"%m/%d/%Y",time:"%H:%M:%S",periods:["AM","PM"],days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],shortDays:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],shortMonths:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]});Xo.format=ac.numberFormat,Xo.geo={},re.prototype={s:0,t:0,add:function(n){ue(n,this.t,cc),ue(cc.s,this.s,this),this.s?this.t+=cc.t:this.s=cc.t},reset:function(){this.s=this.t=0},valueOf:function(){return this.s}};var cc=new re;Xo.geo.stream=function(n,t){n&&sc.hasOwnProperty(n.type)?sc[n.type](n,t):ie(n,t)};var sc={Feature:function(n,t){ie(n.geometry,t)},FeatureCollection:function(n,t){for(var e=n.features,r=-1,u=e.length;++r<u;)ie(e[r].geometry,t)}},lc={Sphere:function(n,t){t.sphere()},Point:function(n,t){n=n.coordinates,t.point(n[0],n[1],n[2])},MultiPoint:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)n=e[r],t.point(n[0],n[1],n[2])},LineString:function(n,t){oe(n.coordinates,t,0)},MultiLineString:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)oe(e[r],t,0)},Polygon:function(n,t){ae(n.coordinates,t)},MultiPolygon:function(n,t){for(var e=n.coordinates,r=-1,u=e.length;++r<u;)ae(e[r],t)},GeometryCollection:function(n,t){for(var e=n.geometries,r=-1,u=e.length;++r<u;)ie(e[r],t)}};Xo.geo.area=function(n){return fc=0,Xo.geo.stream(n,gc),fc};var fc,hc=new re,gc={sphere:function(){fc+=4*Sa},point:g,lineStart:g,lineEnd:g,polygonStart:function(){hc.reset(),gc.lineStart=ce},polygonEnd:function(){var n=2*hc;fc+=0>n?4*Sa+n:n,gc.lineStart=gc.lineEnd=gc.point=g}};Xo.geo.bounds=function(){function n(n,t){x.push(M=[l=n,h=n]),f>t&&(f=t),t>g&&(g=t)}function t(t,e){var r=se([t*Na,e*Na]);if(m){var u=fe(m,r),i=[u[1],-u[0],0],o=fe(i,u);pe(o),o=ve(o);var c=t-p,s=c>0?1:-1,v=o[0]*La*s,d=oa(c)>180;if(d^(v>s*p&&s*t>v)){var y=o[1]*La;y>g&&(g=y)}else if(v=(v+360)%360-180,d^(v>s*p&&s*t>v)){var y=-o[1]*La;f>y&&(f=y)}else f>e&&(f=e),e>g&&(g=e);d?p>t?a(l,t)>a(l,h)&&(h=t):a(t,h)>a(l,h)&&(l=t):h>=l?(l>t&&(l=t),t>h&&(h=t)):t>p?a(l,t)>a(l,h)&&(h=t):a(t,h)>a(l,h)&&(l=t)}else n(t,e);m=r,p=t}function e(){_.point=t}function r(){M[0]=l,M[1]=h,_.point=n,m=null}function u(n,e){if(m){var r=n-p;y+=oa(r)>180?r+(r>0?360:-360):r}else v=n,d=e;gc.point(n,e),t(n,e)}function i(){gc.lineStart()}function o(){u(v,d),gc.lineEnd(),oa(y)>Aa&&(l=-(h=180)),M[0]=l,M[1]=h,m=null}function a(n,t){return(t-=n)<0?t+360:t}function c(n,t){return n[0]-t[0]}function s(n,t){return t[0]<=t[1]?t[0]<=n&&n<=t[1]:n<t[0]||t[1]<n}var l,f,h,g,p,v,d,m,y,x,M,_={point:n,lineStart:e,lineEnd:r,polygonStart:function(){_.point=u,_.lineStart=i,_.lineEnd=o,y=0,gc.polygonStart()},polygonEnd:function(){gc.polygonEnd(),_.point=n,_.lineStart=e,_.lineEnd=r,0>hc?(l=-(h=180),f=-(g=90)):y>Aa?g=90:-Aa>y&&(f=-90),M[0]=l,M[1]=h
+}};return function(n){g=h=-(l=f=1/0),x=[],Xo.geo.stream(n,_);var t=x.length;if(t){x.sort(c);for(var e,r=1,u=x[0],i=[u];t>r;++r)e=x[r],s(e[0],u)||s(e[1],u)?(a(u[0],e[1])>a(u[0],u[1])&&(u[1]=e[1]),a(e[0],u[1])>a(u[0],u[1])&&(u[0]=e[0])):i.push(u=e);for(var o,e,p=-1/0,t=i.length-1,r=0,u=i[t];t>=r;u=e,++r)e=i[r],(o=a(u[1],e[0]))>p&&(p=o,l=e[0],h=u[1])}return x=M=null,1/0===l||1/0===f?[[0/0,0/0],[0/0,0/0]]:[[l,f],[h,g]]}}(),Xo.geo.centroid=function(n){pc=vc=dc=mc=yc=xc=Mc=_c=bc=wc=Sc=0,Xo.geo.stream(n,kc);var t=bc,e=wc,r=Sc,u=t*t+e*e+r*r;return Ca>u&&(t=xc,e=Mc,r=_c,Aa>vc&&(t=dc,e=mc,r=yc),u=t*t+e*e+r*r,Ca>u)?[0/0,0/0]:[Math.atan2(e,t)*La,X(r/Math.sqrt(u))*La]};var pc,vc,dc,mc,yc,xc,Mc,_c,bc,wc,Sc,kc={sphere:g,point:me,lineStart:xe,lineEnd:Me,polygonStart:function(){kc.lineStart=_e},polygonEnd:function(){kc.lineStart=xe}},Ec=Ee(be,ze,Te,[-Sa,-Sa/2]),Ac=1e9;Xo.geo.clipExtent=function(){var n,t,e,r,u,i,o={stream:function(n){return u&&(u.valid=!1),u=i(n),u.valid=!0,u},extent:function(a){return arguments.length?(i=Pe(n=+a[0][0],t=+a[0][1],e=+a[1][0],r=+a[1][1]),u&&(u.valid=!1,u=null),o):[[n,t],[e,r]]}};return o.extent([[0,0],[960,500]])},(Xo.geo.conicEqualArea=function(){return je(He)}).raw=He,Xo.geo.albers=function(){return Xo.geo.conicEqualArea().rotate([96,0]).center([-.6,38.7]).parallels([29.5,45.5]).scale(1070)},Xo.geo.albersUsa=function(){function n(n){var i=n[0],o=n[1];return t=null,e(i,o),t||(r(i,o),t)||u(i,o),t}var t,e,r,u,i=Xo.geo.albers(),o=Xo.geo.conicEqualArea().rotate([154,0]).center([-2,58.5]).parallels([55,65]),a=Xo.geo.conicEqualArea().rotate([157,0]).center([-3,19.9]).parallels([8,18]),c={point:function(n,e){t=[n,e]}};return n.invert=function(n){var t=i.scale(),e=i.translate(),r=(n[0]-e[0])/t,u=(n[1]-e[1])/t;return(u>=.12&&.234>u&&r>=-.425&&-.214>r?o:u>=.166&&.234>u&&r>=-.214&&-.115>r?a:i).invert(n)},n.stream=function(n){var t=i.stream(n),e=o.stream(n),r=a.stream(n);return{point:function(n,u){t.point(n,u),e.point(n,u),r.point(n,u)},sphere:function(){t.sphere(),e.sphere(),r.sphere()},lineStart:function(){t.lineStart(),e.lineStart(),r.lineStart()},lineEnd:function(){t.lineEnd(),e.lineEnd(),r.lineEnd()},polygonStart:function(){t.polygonStart(),e.polygonStart(),r.polygonStart()},polygonEnd:function(){t.polygonEnd(),e.polygonEnd(),r.polygonEnd()}}},n.precision=function(t){return arguments.length?(i.precision(t),o.precision(t),a.precision(t),n):i.precision()},n.scale=function(t){return arguments.length?(i.scale(t),o.scale(.35*t),a.scale(t),n.translate(i.translate())):i.scale()},n.translate=function(t){if(!arguments.length)return i.translate();var s=i.scale(),l=+t[0],f=+t[1];return e=i.translate(t).clipExtent([[l-.455*s,f-.238*s],[l+.455*s,f+.238*s]]).stream(c).point,r=o.translate([l-.307*s,f+.201*s]).clipExtent([[l-.425*s+Aa,f+.12*s+Aa],[l-.214*s-Aa,f+.234*s-Aa]]).stream(c).point,u=a.translate([l-.205*s,f+.212*s]).clipExtent([[l-.214*s+Aa,f+.166*s+Aa],[l-.115*s-Aa,f+.234*s-Aa]]).stream(c).point,n},n.scale(1070)};var Cc,Nc,Lc,zc,qc,Tc,Rc={point:g,lineStart:g,lineEnd:g,polygonStart:function(){Nc=0,Rc.lineStart=Fe},polygonEnd:function(){Rc.lineStart=Rc.lineEnd=Rc.point=g,Cc+=oa(Nc/2)}},Dc={point:Oe,lineStart:g,lineEnd:g,polygonStart:g,polygonEnd:g},Pc={point:Ze,lineStart:Ve,lineEnd:Xe,polygonStart:function(){Pc.lineStart=$e},polygonEnd:function(){Pc.point=Ze,Pc.lineStart=Ve,Pc.lineEnd=Xe}};Xo.geo.path=function(){function n(n){return n&&("function"==typeof a&&i.pointRadius(+a.apply(this,arguments)),o&&o.valid||(o=u(i)),Xo.geo.stream(n,o)),i.result()}function t(){return o=null,n}var e,r,u,i,o,a=4.5;return n.area=function(n){return Cc=0,Xo.geo.stream(n,u(Rc)),Cc},n.centroid=function(n){return dc=mc=yc=xc=Mc=_c=bc=wc=Sc=0,Xo.geo.stream(n,u(Pc)),Sc?[bc/Sc,wc/Sc]:_c?[xc/_c,Mc/_c]:yc?[dc/yc,mc/yc]:[0/0,0/0]},n.bounds=function(n){return qc=Tc=-(Lc=zc=1/0),Xo.geo.stream(n,u(Dc)),[[Lc,zc],[qc,Tc]]},n.projection=function(n){return arguments.length?(u=(e=n)?n.stream||Je(n):bt,t()):e},n.context=function(n){return arguments.length?(i=null==(r=n)?new Ye:new Be(n),"function"!=typeof a&&i.pointRadius(a),t()):r},n.pointRadius=function(t){return arguments.length?(a="function"==typeof t?t:(i.pointRadius(+t),+t),n):a},n.projection(Xo.geo.albersUsa()).context(null)},Xo.geo.transform=function(n){return{stream:function(t){var e=new Ge(t);for(var r in n)e[r]=n[r];return e}}},Ge.prototype={point:function(n,t){this.stream.point(n,t)},sphere:function(){this.stream.sphere()},lineStart:function(){this.stream.lineStart()},lineEnd:function(){this.stream.lineEnd()},polygonStart:function(){this.stream.polygonStart()},polygonEnd:function(){this.stream.polygonEnd()}},Xo.geo.projection=Qe,Xo.geo.projectionMutator=nr,(Xo.geo.equirectangular=function(){return Qe(er)}).raw=er.invert=er,Xo.geo.rotation=function(n){function t(t){return t=n(t[0]*Na,t[1]*Na),t[0]*=La,t[1]*=La,t}return n=ur(n[0]%360*Na,n[1]*Na,n.length>2?n[2]*Na:0),t.invert=function(t){return t=n.invert(t[0]*Na,t[1]*Na),t[0]*=La,t[1]*=La,t},t},rr.invert=er,Xo.geo.circle=function(){function n(){var n="function"==typeof r?r.apply(this,arguments):r,t=ur(-n[0]*Na,-n[1]*Na,0).invert,u=[];return e(null,null,1,{point:function(n,e){u.push(n=t(n,e)),n[0]*=La,n[1]*=La}}),{type:"Polygon",coordinates:[u]}}var t,e,r=[0,0],u=6;return n.origin=function(t){return arguments.length?(r=t,n):r},n.angle=function(r){return arguments.length?(e=cr((t=+r)*Na,u*Na),n):t},n.precision=function(r){return arguments.length?(e=cr(t*Na,(u=+r)*Na),n):u},n.angle(90)},Xo.geo.distance=function(n,t){var e,r=(t[0]-n[0])*Na,u=n[1]*Na,i=t[1]*Na,o=Math.sin(r),a=Math.cos(r),c=Math.sin(u),s=Math.cos(u),l=Math.sin(i),f=Math.cos(i);return Math.atan2(Math.sqrt((e=f*o)*e+(e=s*l-c*f*a)*e),c*l+s*f*a)},Xo.geo.graticule=function(){function n(){return{type:"MultiLineString",coordinates:t()}}function t(){return Xo.range(Math.ceil(i/d)*d,u,d).map(h).concat(Xo.range(Math.ceil(s/m)*m,c,m).map(g)).concat(Xo.range(Math.ceil(r/p)*p,e,p).filter(function(n){return oa(n%d)>Aa}).map(l)).concat(Xo.range(Math.ceil(a/v)*v,o,v).filter(function(n){return oa(n%m)>Aa}).map(f))}var e,r,u,i,o,a,c,s,l,f,h,g,p=10,v=p,d=90,m=360,y=2.5;return n.lines=function(){return t().map(function(n){return{type:"LineString",coordinates:n}})},n.outline=function(){return{type:"Polygon",coordinates:[h(i).concat(g(c).slice(1),h(u).reverse().slice(1),g(s).reverse().slice(1))]}},n.extent=function(t){return arguments.length?n.majorExtent(t).minorExtent(t):n.minorExtent()},n.majorExtent=function(t){return arguments.length?(i=+t[0][0],u=+t[1][0],s=+t[0][1],c=+t[1][1],i>u&&(t=i,i=u,u=t),s>c&&(t=s,s=c,c=t),n.precision(y)):[[i,s],[u,c]]},n.minorExtent=function(t){return arguments.length?(r=+t[0][0],e=+t[1][0],a=+t[0][1],o=+t[1][1],r>e&&(t=r,r=e,e=t),a>o&&(t=a,a=o,o=t),n.precision(y)):[[r,a],[e,o]]},n.step=function(t){return arguments.length?n.majorStep(t).minorStep(t):n.minorStep()},n.majorStep=function(t){return arguments.length?(d=+t[0],m=+t[1],n):[d,m]},n.minorStep=function(t){return arguments.length?(p=+t[0],v=+t[1],n):[p,v]},n.precision=function(t){return arguments.length?(y=+t,l=lr(a,o,90),f=fr(r,e,y),h=lr(s,c,90),g=fr(i,u,y),n):y},n.majorExtent([[-180,-90+Aa],[180,90-Aa]]).minorExtent([[-180,-80-Aa],[180,80+Aa]])},Xo.geo.greatArc=function(){function n(){return{type:"LineString",coordinates:[t||r.apply(this,arguments),e||u.apply(this,arguments)]}}var t,e,r=hr,u=gr;return n.distance=function(){return Xo.geo.distance(t||r.apply(this,arguments),e||u.apply(this,arguments))},n.source=function(e){return arguments.length?(r=e,t="function"==typeof e?null:e,n):r},n.target=function(t){return arguments.length?(u=t,e="function"==typeof t?null:t,n):u},n.precision=function(){return arguments.length?n:0},n},Xo.geo.interpolate=function(n,t){return pr(n[0]*Na,n[1]*Na,t[0]*Na,t[1]*Na)},Xo.geo.length=function(n){return Uc=0,Xo.geo.stream(n,jc),Uc};var Uc,jc={sphere:g,point:g,lineStart:vr,lineEnd:g,polygonStart:g,polygonEnd:g},Hc=dr(function(n){return Math.sqrt(2/(1+n))},function(n){return 2*Math.asin(n/2)});(Xo.geo.azimuthalEqualArea=function(){return Qe(Hc)}).raw=Hc;var Fc=dr(function(n){var t=Math.acos(n);return t&&t/Math.sin(t)},bt);(Xo.geo.azimuthalEquidistant=function(){return Qe(Fc)}).raw=Fc,(Xo.geo.conicConformal=function(){return je(mr)}).raw=mr,(Xo.geo.conicEquidistant=function(){return je(yr)}).raw=yr;var Oc=dr(function(n){return 1/n},Math.atan);(Xo.geo.gnomonic=function(){return Qe(Oc)}).raw=Oc,xr.invert=function(n,t){return[n,2*Math.atan(Math.exp(t))-Ea]},(Xo.geo.mercator=function(){return Mr(xr)}).raw=xr;var Yc=dr(function(){return 1},Math.asin);(Xo.geo.orthographic=function(){return Qe(Yc)}).raw=Yc;var Ic=dr(function(n){return 1/(1+n)},function(n){return 2*Math.atan(n)});(Xo.geo.stereographic=function(){return Qe(Ic)}).raw=Ic,_r.invert=function(n,t){return[-t,2*Math.atan(Math.exp(n))-Ea]},(Xo.geo.transverseMercator=function(){var n=Mr(_r),t=n.center,e=n.rotate;return n.center=function(n){return n?t([-n[1],n[0]]):(n=t(),[-n[1],n[0]])},n.rotate=function(n){return n?e([n[0],n[1],n.length>2?n[2]+90:90]):(n=e(),[n[0],n[1],n[2]-90])},n.rotate([0,0])}).raw=_r,Xo.geom={},Xo.geom.hull=function(n){function t(n){if(n.length<3)return[];var t,u=_t(e),i=_t(r),o=n.length,a=[],c=[];for(t=0;o>t;t++)a.push([+u.call(this,n[t],t),+i.call(this,n[t],t),t]);for(a.sort(kr),t=0;o>t;t++)c.push([a[t][0],-a[t][1]]);var s=Sr(a),l=Sr(c),f=l[0]===s[0],h=l[l.length-1]===s[s.length-1],g=[];for(t=s.length-1;t>=0;--t)g.push(n[a[s[t]][2]]);for(t=+f;t<l.length-h;++t)g.push(n[a[l[t]][2]]);return g}var e=br,r=wr;return arguments.length?t(n):(t.x=function(n){return arguments.length?(e=n,t):e},t.y=function(n){return arguments.length?(r=n,t):r},t)},Xo.geom.polygon=function(n){return fa(n,Zc),n};var Zc=Xo.geom.polygon.prototype=[];Zc.area=function(){for(var n,t=-1,e=this.length,r=this[e-1],u=0;++t<e;)n=r,r=this[t],u+=n[1]*r[0]-n[0]*r[1];return.5*u},Zc.centroid=function(n){var t,e,r=-1,u=this.length,i=0,o=0,a=this[u-1];for(arguments.length||(n=-1/(6*this.area()));++r<u;)t=a,a=this[r],e=t[0]*a[1]-a[0]*t[1],i+=(t[0]+a[0])*e,o+=(t[1]+a[1])*e;return[i*n,o*n]},Zc.clip=function(n){for(var t,e,r,u,i,o,a=Cr(n),c=-1,s=this.length-Cr(this),l=this[s-1];++c<s;){for(t=n.slice(),n.length=0,u=this[c],i=t[(r=t.length-a)-1],e=-1;++e<r;)o=t[e],Er(o,l,u)?(Er(i,l,u)||n.push(Ar(i,o,l,u)),n.push(o)):Er(i,l,u)&&n.push(Ar(i,o,l,u)),i=o;a&&n.push(n[0]),l=u}return n};var Vc,Xc,$c,Bc,Wc,Jc=[],Gc=[];Pr.prototype.prepare=function(){for(var n,t=this.edges,e=t.length;e--;)n=t[e].edge,n.b&&n.a||t.splice(e,1);return t.sort(jr),t.length},Br.prototype={start:function(){return this.edge.l===this.site?this.edge.a:this.edge.b},end:function(){return this.edge.l===this.site?this.edge.b:this.edge.a}},Wr.prototype={insert:function(n,t){var e,r,u;if(n){if(t.P=n,t.N=n.N,n.N&&(n.N.P=t),n.N=t,n.R){for(n=n.R;n.L;)n=n.L;n.L=t}else n.R=t;e=n}else this._?(n=Qr(this._),t.P=null,t.N=n,n.P=n.L=t,e=n):(t.P=t.N=null,this._=t,e=null);for(t.L=t.R=null,t.U=e,t.C=!0,n=t;e&&e.C;)r=e.U,e===r.L?(u=r.R,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.R&&(Gr(this,e),n=e,e=n.U),e.C=!1,r.C=!0,Kr(this,r))):(u=r.L,u&&u.C?(e.C=u.C=!1,r.C=!0,n=r):(n===e.L&&(Kr(this,e),n=e,e=n.U),e.C=!1,r.C=!0,Gr(this,r))),e=n.U;this._.C=!1},remove:function(n){n.N&&(n.N.P=n.P),n.P&&(n.P.N=n.N),n.N=n.P=null;var t,e,r,u=n.U,i=n.L,o=n.R;if(e=i?o?Qr(o):i:o,u?u.L===n?u.L=e:u.R=e:this._=e,i&&o?(r=e.C,e.C=n.C,e.L=i,i.U=e,e!==o?(u=e.U,e.U=n.U,n=e.R,u.L=n,e.R=o,o.U=e):(e.U=u,u=e,n=e.R)):(r=n.C,n=e),n&&(n.U=u),!r){if(n&&n.C)return n.C=!1,void 0;do{if(n===this._)break;if(n===u.L){if(t=u.R,t.C&&(t.C=!1,u.C=!0,Gr(this,u),t=u.R),t.L&&t.L.C||t.R&&t.R.C){t.R&&t.R.C||(t.L.C=!1,t.C=!0,Kr(this,t),t=u.R),t.C=u.C,u.C=t.R.C=!1,Gr(this,u),n=this._;break}}else if(t=u.L,t.C&&(t.C=!1,u.C=!0,Kr(this,u),t=u.L),t.L&&t.L.C||t.R&&t.R.C){t.L&&t.L.C||(t.R.C=!1,t.C=!0,Gr(this,t),t=u.L),t.C=u.C,u.C=t.L.C=!1,Kr(this,u),n=this._;break}t.C=!0,n=u,u=u.U}while(!n.C);n&&(n.C=!1)}}},Xo.geom.voronoi=function(n){function t(n){var t=new Array(n.length),r=a[0][0],u=a[0][1],i=a[1][0],o=a[1][1];return nu(e(n),a).cells.forEach(function(e,a){var c=e.edges,s=e.site,l=t[a]=c.length?c.map(function(n){var t=n.start();return[t.x,t.y]}):s.x>=r&&s.x<=i&&s.y>=u&&s.y<=o?[[r,o],[i,o],[i,u],[r,u]]:[];l.point=n[a]}),t}function e(n){return n.map(function(n,t){return{x:Math.round(i(n,t)/Aa)*Aa,y:Math.round(o(n,t)/Aa)*Aa,i:t}})}var r=br,u=wr,i=r,o=u,a=Kc;return n?t(n):(t.links=function(n){return nu(e(n)).edges.filter(function(n){return n.l&&n.r}).map(function(t){return{source:n[t.l.i],target:n[t.r.i]}})},t.triangles=function(n){var t=[];return nu(e(n)).cells.forEach(function(e,r){for(var u,i,o=e.site,a=e.edges.sort(jr),c=-1,s=a.length,l=a[s-1].edge,f=l.l===o?l.r:l.l;++c<s;)u=l,i=f,l=a[c].edge,f=l.l===o?l.r:l.l,r<i.i&&r<f.i&&eu(o,i,f)<0&&t.push([n[r],n[i.i],n[f.i]])}),t},t.x=function(n){return arguments.length?(i=_t(r=n),t):r},t.y=function(n){return arguments.length?(o=_t(u=n),t):u},t.clipExtent=function(n){return arguments.length?(a=null==n?Kc:n,t):a===Kc?null:a},t.size=function(n){return arguments.length?t.clipExtent(n&&[[0,0],n]):a===Kc?null:a&&a[1]},t)};var Kc=[[-1e6,-1e6],[1e6,1e6]];Xo.geom.delaunay=function(n){return Xo.geom.voronoi().triangles(n)},Xo.geom.quadtree=function(n,t,e,r,u){function i(n){function i(n,t,e,r,u,i,o,a){if(!isNaN(e)&&!isNaN(r))if(n.leaf){var c=n.x,l=n.y;if(null!=c)if(oa(c-e)+oa(l-r)<.01)s(n,t,e,r,u,i,o,a);else{var f=n.point;n.x=n.y=n.point=null,s(n,f,c,l,u,i,o,a),s(n,t,e,r,u,i,o,a)}else n.x=e,n.y=r,n.point=t}else s(n,t,e,r,u,i,o,a)}function s(n,t,e,r,u,o,a,c){var s=.5*(u+a),l=.5*(o+c),f=e>=s,h=r>=l,g=(h<<1)+f;n.leaf=!1,n=n.nodes[g]||(n.nodes[g]=iu()),f?u=s:a=s,h?o=l:c=l,i(n,t,e,r,u,o,a,c)}var l,f,h,g,p,v,d,m,y,x=_t(a),M=_t(c);if(null!=t)v=t,d=e,m=r,y=u;else if(m=y=-(v=d=1/0),f=[],h=[],p=n.length,o)for(g=0;p>g;++g)l=n[g],l.x<v&&(v=l.x),l.y<d&&(d=l.y),l.x>m&&(m=l.x),l.y>y&&(y=l.y),f.push(l.x),h.push(l.y);else for(g=0;p>g;++g){var _=+x(l=n[g],g),b=+M(l,g);v>_&&(v=_),d>b&&(d=b),_>m&&(m=_),b>y&&(y=b),f.push(_),h.push(b)}var w=m-v,S=y-d;w>S?y=d+w:m=v+S;var k=iu();if(k.add=function(n){i(k,n,+x(n,++g),+M(n,g),v,d,m,y)},k.visit=function(n){ou(n,k,v,d,m,y)},g=-1,null==t){for(;++g<p;)i(k,n[g],f[g],h[g],v,d,m,y);--g}else n.forEach(k.add);return f=h=n=l=null,k}var o,a=br,c=wr;return(o=arguments.length)?(a=ru,c=uu,3===o&&(u=e,r=t,e=t=0),i(n)):(i.x=function(n){return arguments.length?(a=n,i):a},i.y=function(n){return arguments.length?(c=n,i):c},i.extent=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=+n[0][0],e=+n[0][1],r=+n[1][0],u=+n[1][1]),i):null==t?null:[[t,e],[r,u]]},i.size=function(n){return arguments.length?(null==n?t=e=r=u=null:(t=e=0,r=+n[0],u=+n[1]),i):null==t?null:[r-t,u-e]},i)},Xo.interpolateRgb=au,Xo.interpolateObject=cu,Xo.interpolateNumber=su,Xo.interpolateString=lu;var Qc=/[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g;Xo.interpolate=fu,Xo.interpolators=[function(n,t){var e=typeof t;return("string"===e?Va.has(t)||/^(#|rgb\(|hsl\()/.test(t)?au:lu:t instanceof G?au:"object"===e?Array.isArray(t)?hu:cu:su)(n,t)}],Xo.interpolateArray=hu;var ns=function(){return bt},ts=Xo.map({linear:ns,poly:xu,quad:function(){return du},cubic:function(){return mu},sin:function(){return Mu},exp:function(){return _u},circle:function(){return bu},elastic:wu,back:Su,bounce:function(){return ku}}),es=Xo.map({"in":bt,out:pu,"in-out":vu,"out-in":function(n){return vu(pu(n))}});Xo.ease=function(n){var t=n.indexOf("-"),e=t>=0?n.substring(0,t):n,r=t>=0?n.substring(t+1):"in";return e=ts.get(e)||ns,r=es.get(r)||bt,gu(r(e.apply(null,$o.call(arguments,1))))},Xo.interpolateHcl=Eu,Xo.interpolateHsl=Au,Xo.interpolateLab=Cu,Xo.interpolateRound=Nu,Xo.transform=function(n){var t=Wo.createElementNS(Xo.ns.prefix.svg,"g");return(Xo.transform=function(n){if(null!=n){t.setAttribute("transform",n);var e=t.transform.baseVal.consolidate()}return new Lu(e?e.matrix:rs)})(n)},Lu.prototype.toString=function(){return"translate("+this.translate+")rotate("+this.rotate+")skewX("+this.skew+")scale("+this.scale+")"};var rs={a:1,b:0,c:0,d:1,e:0,f:0};Xo.interpolateTransform=Ru,Xo.layout={},Xo.layout.bundle=function(){return function(n){for(var t=[],e=-1,r=n.length;++e<r;)t.push(Uu(n[e]));return t}},Xo.layout.chord=function(){function n(){var n,s,f,h,g,p={},v=[],d=Xo.range(i),m=[];for(e=[],r=[],n=0,h=-1;++h<i;){for(s=0,g=-1;++g<i;)s+=u[h][g];v.push(s),m.push(Xo.range(i)),n+=s}for(o&&d.sort(function(n,t){return o(v[n],v[t])}),a&&m.forEach(function(n,t){n.sort(function(n,e){return a(u[t][n],u[t][e])})}),n=(ka-l*i)/n,s=0,h=-1;++h<i;){for(f=s,g=-1;++g<i;){var y=d[h],x=m[y][g],M=u[y][x],_=s,b=s+=M*n;p[y+"-"+x]={index:y,subindex:x,startAngle:_,endAngle:b,value:M}}r[y]={index:y,startAngle:f,endAngle:s,value:(s-f)/n},s+=l}for(h=-1;++h<i;)for(g=h-1;++g<i;){var w=p[h+"-"+g],S=p[g+"-"+h];(w.value||S.value)&&e.push(w.value<S.value?{source:S,target:w}:{source:w,target:S})}c&&t()}function t(){e.sort(function(n,t){return c((n.source.value+n.target.value)/2,(t.source.value+t.target.value)/2)})}var e,r,u,i,o,a,c,s={},l=0;return s.matrix=function(n){return arguments.length?(i=(u=n)&&u.length,e=r=null,s):u},s.padding=function(n){return arguments.length?(l=n,e=r=null,s):l},s.sortGroups=function(n){return arguments.length?(o=n,e=r=null,s):o},s.sortSubgroups=function(n){return arguments.length?(a=n,e=null,s):a},s.sortChords=function(n){return arguments.length?(c=n,e&&t(),s):c},s.chords=function(){return e||n(),e},s.groups=function(){return r||n(),r},s},Xo.layout.force=function(){function n(n){return function(t,e,r,u){if(t.point!==n){var i=t.cx-n.x,o=t.cy-n.y,a=u-e,c=i*i+o*o;if(c>a*a/d){if(p>c){var s=t.charge/c;n.px-=i*s,n.py-=o*s}return!0}if(t.point&&c&&p>c){var s=t.pointCharge/c;n.px-=i*s,n.py-=o*s}}return!t.charge}}function t(n){n.px=Xo.event.x,n.py=Xo.event.y,a.resume()}var e,r,u,i,o,a={},c=Xo.dispatch("start","tick","end"),s=[1,1],l=.9,f=us,h=is,g=-30,p=os,v=.1,d=.64,m=[],y=[];return a.tick=function(){if((r*=.99)<.005)return c.end({type:"end",alpha:r=0}),!0;var t,e,a,f,h,p,d,x,M,_=m.length,b=y.length;for(e=0;b>e;++e)a=y[e],f=a.source,h=a.target,x=h.x-f.x,M=h.y-f.y,(p=x*x+M*M)&&(p=r*i[e]*((p=Math.sqrt(p))-u[e])/p,x*=p,M*=p,h.x-=x*(d=f.weight/(h.weight+f.weight)),h.y-=M*d,f.x+=x*(d=1-d),f.y+=M*d);if((d=r*v)&&(x=s[0]/2,M=s[1]/2,e=-1,d))for(;++e<_;)a=m[e],a.x+=(x-a.x)*d,a.y+=(M-a.y)*d;if(g)for(Zu(t=Xo.geom.quadtree(m),r,o),e=-1;++e<_;)(a=m[e]).fixed||t.visit(n(a));for(e=-1;++e<_;)a=m[e],a.fixed?(a.x=a.px,a.y=a.py):(a.x-=(a.px-(a.px=a.x))*l,a.y-=(a.py-(a.py=a.y))*l);c.tick({type:"tick",alpha:r})},a.nodes=function(n){return arguments.length?(m=n,a):m},a.links=function(n){return arguments.length?(y=n,a):y},a.size=function(n){return arguments.length?(s=n,a):s},a.linkDistance=function(n){return arguments.length?(f="function"==typeof n?n:+n,a):f},a.distance=a.linkDistance,a.linkStrength=function(n){return arguments.length?(h="function"==typeof n?n:+n,a):h},a.friction=function(n){return arguments.length?(l=+n,a):l},a.charge=function(n){return arguments.length?(g="function"==typeof n?n:+n,a):g},a.chargeDistance=function(n){return arguments.length?(p=n*n,a):Math.sqrt(p)},a.gravity=function(n){return arguments.length?(v=+n,a):v},a.theta=function(n){return arguments.length?(d=n*n,a):Math.sqrt(d)},a.alpha=function(n){return arguments.length?(n=+n,r?r=n>0?n:0:n>0&&(c.start({type:"start",alpha:r=n}),Xo.timer(a.tick)),a):r},a.start=function(){function n(n,r){if(!e){for(e=new Array(c),a=0;c>a;++a)e[a]=[];for(a=0;s>a;++a){var u=y[a];e[u.source.index].push(u.target),e[u.target.index].push(u.source)}}for(var i,o=e[t],a=-1,s=o.length;++a<s;)if(!isNaN(i=o[a][n]))return i;return Math.random()*r}var t,e,r,c=m.length,l=y.length,p=s[0],v=s[1];for(t=0;c>t;++t)(r=m[t]).index=t,r.weight=0;for(t=0;l>t;++t)r=y[t],"number"==typeof r.source&&(r.source=m[r.source]),"number"==typeof r.target&&(r.target=m[r.target]),++r.source.weight,++r.target.weight;for(t=0;c>t;++t)r=m[t],isNaN(r.x)&&(r.x=n("x",p)),isNaN(r.y)&&(r.y=n("y",v)),isNaN(r.px)&&(r.px=r.x),isNaN(r.py)&&(r.py=r.y);if(u=[],"function"==typeof f)for(t=0;l>t;++t)u[t]=+f.call(this,y[t],t);else for(t=0;l>t;++t)u[t]=f;if(i=[],"function"==typeof h)for(t=0;l>t;++t)i[t]=+h.call(this,y[t],t);else for(t=0;l>t;++t)i[t]=h;if(o=[],"function"==typeof g)for(t=0;c>t;++t)o[t]=+g.call(this,m[t],t);else for(t=0;c>t;++t)o[t]=g;return a.resume()},a.resume=function(){return a.alpha(.1)},a.stop=function(){return a.alpha(0)},a.drag=function(){return e||(e=Xo.behavior.drag().origin(bt).on("dragstart.force",Fu).on("drag.force",t).on("dragend.force",Ou)),arguments.length?(this.on("mouseover.force",Yu).on("mouseout.force",Iu).call(e),void 0):e},Xo.rebind(a,c,"on")};var us=20,is=1,os=1/0;Xo.layout.hierarchy=function(){function n(t,o,a){var c=u.call(e,t,o);if(t.depth=o,a.push(t),c&&(s=c.length)){for(var s,l,f=-1,h=t.children=new Array(s),g=0,p=o+1;++f<s;)l=h[f]=n(c[f],p,a),l.parent=t,g+=l.value;r&&h.sort(r),i&&(t.value=g)}else delete t.children,i&&(t.value=+i.call(e,t,o)||0);return t}function t(n,r){var u=n.children,o=0;if(u&&(a=u.length))for(var a,c=-1,s=r+1;++c<a;)o+=t(u[c],s);else i&&(o=+i.call(e,n,r)||0);return i&&(n.value=o),o}function e(t){var e=[];return n(t,0,e),e}var r=Bu,u=Xu,i=$u;return e.sort=function(n){return arguments.length?(r=n,e):r},e.children=function(n){return arguments.length?(u=n,e):u},e.value=function(n){return arguments.length?(i=n,e):i},e.revalue=function(n){return t(n,0),n},e},Xo.layout.partition=function(){function n(t,e,r,u){var i=t.children;if(t.x=e,t.y=t.depth*u,t.dx=r,t.dy=u,i&&(o=i.length)){var o,a,c,s=-1;for(r=t.value?r/t.value:0;++s<o;)n(a=i[s],e,c=a.value*r,u),e+=c}}function t(n){var e=n.children,r=0;if(e&&(u=e.length))for(var u,i=-1;++i<u;)r=Math.max(r,t(e[i]));return 1+r}function e(e,i){var o=r.call(this,e,i);return n(o[0],0,u[0],u[1]/t(o[0])),o}var r=Xo.layout.hierarchy(),u=[1,1];return e.size=function(n){return arguments.length?(u=n,e):u},Vu(e,r)},Xo.layout.pie=function(){function n(i){var o=i.map(function(e,r){return+t.call(n,e,r)}),a=+("function"==typeof r?r.apply(this,arguments):r),c=(("function"==typeof u?u.apply(this,arguments):u)-a)/Xo.sum(o),s=Xo.range(i.length);null!=e&&s.sort(e===as?function(n,t){return o[t]-o[n]}:function(n,t){return e(i[n],i[t])});var l=[];return s.forEach(function(n){var t;l[n]={data:i[n],value:t=o[n],startAngle:a,endAngle:a+=t*c}}),l}var t=Number,e=as,r=0,u=ka;return n.value=function(e){return arguments.length?(t=e,n):t},n.sort=function(t){return arguments.length?(e=t,n):e},n.startAngle=function(t){return arguments.length?(r=t,n):r},n.endAngle=function(t){return arguments.length?(u=t,n):u},n};var as={};Xo.layout.stack=function(){function n(a,c){var s=a.map(function(e,r){return t.call(n,e,r)}),l=s.map(function(t){return t.map(function(t,e){return[i.call(n,t,e),o.call(n,t,e)]})}),f=e.call(n,l,c);s=Xo.permute(s,f),l=Xo.permute(l,f);var h,g,p,v=r.call(n,l,c),d=s.length,m=s[0].length;for(g=0;m>g;++g)for(u.call(n,s[0][g],p=v[g],l[0][g][1]),h=1;d>h;++h)u.call(n,s[h][g],p+=l[h-1][g][1],l[h][g][1]);return a}var t=bt,e=Qu,r=ni,u=Ku,i=Ju,o=Gu;return n.values=function(e){return arguments.length?(t=e,n):t},n.order=function(t){return arguments.length?(e="function"==typeof t?t:cs.get(t)||Qu,n):e},n.offset=function(t){return arguments.length?(r="function"==typeof t?t:ss.get(t)||ni,n):r},n.x=function(t){return arguments.length?(i=t,n):i},n.y=function(t){return arguments.length?(o=t,n):o},n.out=function(t){return arguments.length?(u=t,n):u},n};var cs=Xo.map({"inside-out":function(n){var t,e,r=n.length,u=n.map(ti),i=n.map(ei),o=Xo.range(r).sort(function(n,t){return u[n]-u[t]}),a=0,c=0,s=[],l=[];for(t=0;r>t;++t)e=o[t],c>a?(a+=i[e],s.push(e)):(c+=i[e],l.push(e));return l.reverse().concat(s)},reverse:function(n){return Xo.range(n.length).reverse()},"default":Qu}),ss=Xo.map({silhouette:function(n){var t,e,r,u=n.length,i=n[0].length,o=[],a=0,c=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];r>a&&(a=r),o.push(r)}for(e=0;i>e;++e)c[e]=(a-o[e])/2;return c},wiggle:function(n){var t,e,r,u,i,o,a,c,s,l=n.length,f=n[0],h=f.length,g=[];for(g[0]=c=s=0,e=1;h>e;++e){for(t=0,u=0;l>t;++t)u+=n[t][e][1];for(t=0,i=0,a=f[e][0]-f[e-1][0];l>t;++t){for(r=0,o=(n[t][e][1]-n[t][e-1][1])/(2*a);t>r;++r)o+=(n[r][e][1]-n[r][e-1][1])/a;i+=o*n[t][e][1]}g[e]=c-=u?i/u*a:0,s>c&&(s=c)}for(e=0;h>e;++e)g[e]-=s;return g},expand:function(n){var t,e,r,u=n.length,i=n[0].length,o=1/u,a=[];for(e=0;i>e;++e){for(t=0,r=0;u>t;t++)r+=n[t][e][1];if(r)for(t=0;u>t;t++)n[t][e][1]/=r;else for(t=0;u>t;t++)n[t][e][1]=o}for(e=0;i>e;++e)a[e]=0;return a},zero:ni});Xo.layout.histogram=function(){function n(n,i){for(var o,a,c=[],s=n.map(e,this),l=r.call(this,s,i),f=u.call(this,l,s,i),i=-1,h=s.length,g=f.length-1,p=t?1:1/h;++i<g;)o=c[i]=[],o.dx=f[i+1]-(o.x=f[i]),o.y=0;if(g>0)for(i=-1;++i<h;)a=s[i],a>=l[0]&&a<=l[1]&&(o=c[Xo.bisect(f,a,1,g)-1],o.y+=p,o.push(n[i]));return c}var t=!0,e=Number,r=oi,u=ui;return n.value=function(t){return arguments.length?(e=t,n):e},n.range=function(t){return arguments.length?(r=_t(t),n):r},n.bins=function(t){return arguments.length?(u="number"==typeof t?function(n){return ii(n,t)}:_t(t),n):u},n.frequency=function(e){return arguments.length?(t=!!e,n):t},n},Xo.layout.tree=function(){function n(n,i){function o(n,t){var r=n.children,u=n._tree;if(r&&(i=r.length)){for(var i,a,s,l=r[0],f=l,h=-1;++h<i;)s=r[h],o(s,a),f=c(s,a,f),a=s;vi(n);var g=.5*(l._tree.prelim+s._tree.prelim);t?(u.prelim=t._tree.prelim+e(n,t),u.mod=u.prelim-g):u.prelim=g}else t&&(u.prelim=t._tree.prelim+e(n,t))}function a(n,t){n.x=n._tree.prelim+t;var e=n.children;if(e&&(r=e.length)){var r,u=-1;for(t+=n._tree.mod;++u<r;)a(e[u],t)}}function c(n,t,r){if(t){for(var u,i=n,o=n,a=t,c=n.parent.children[0],s=i._tree.mod,l=o._tree.mod,f=a._tree.mod,h=c._tree.mod;a=si(a),i=ci(i),a&&i;)c=ci(c),o=si(o),o._tree.ancestor=n,u=a._tree.prelim+f-i._tree.prelim-s+e(a,i),u>0&&(di(mi(a,n,r),n,u),s+=u,l+=u),f+=a._tree.mod,s+=i._tree.mod,h+=c._tree.mod,l+=o._tree.mod;a&&!si(o)&&(o._tree.thread=a,o._tree.mod+=f-l),i&&!ci(c)&&(c._tree.thread=i,c._tree.mod+=s-h,r=n)}return r}var s=t.call(this,n,i),l=s[0];pi(l,function(n,t){n._tree={ancestor:n,prelim:0,mod:0,change:0,shift:0,number:t?t._tree.number+1:0}}),o(l),a(l,-l._tree.prelim);var f=li(l,hi),h=li(l,fi),g=li(l,gi),p=f.x-e(f,h)/2,v=h.x+e(h,f)/2,d=g.depth||1;return pi(l,u?function(n){n.x*=r[0],n.y=n.depth*r[1],delete n._tree}:function(n){n.x=(n.x-p)/(v-p)*r[0],n.y=n.depth/d*r[1],delete n._tree}),s}var t=Xo.layout.hierarchy().sort(null).value(null),e=ai,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Vu(n,t)},Xo.layout.pack=function(){function n(n,i){var o=e.call(this,n,i),a=o[0],c=u[0],s=u[1],l=null==t?Math.sqrt:"function"==typeof t?t:function(){return t};if(a.x=a.y=0,pi(a,function(n){n.r=+l(n.value)}),pi(a,bi),r){var f=r*(t?1:Math.max(2*a.r/c,2*a.r/s))/2;pi(a,function(n){n.r+=f}),pi(a,bi),pi(a,function(n){n.r-=f})}return ki(a,c/2,s/2,t?1:1/Math.max(2*a.r/c,2*a.r/s)),o}var t,e=Xo.layout.hierarchy().sort(yi),r=0,u=[1,1];return n.size=function(t){return arguments.length?(u=t,n):u},n.radius=function(e){return arguments.length?(t=null==e||"function"==typeof e?e:+e,n):t},n.padding=function(t){return arguments.length?(r=+t,n):r},Vu(n,e)},Xo.layout.cluster=function(){function n(n,i){var o,a=t.call(this,n,i),c=a[0],s=0;pi(c,function(n){var t=n.children;t&&t.length?(n.x=Ci(t),n.y=Ai(t)):(n.x=o?s+=e(n,o):0,n.y=0,o=n)});var l=Ni(c),f=Li(c),h=l.x-e(l,f)/2,g=f.x+e(f,l)/2;return pi(c,u?function(n){n.x=(n.x-c.x)*r[0],n.y=(c.y-n.y)*r[1]}:function(n){n.x=(n.x-h)/(g-h)*r[0],n.y=(1-(c.y?n.y/c.y:1))*r[1]}),a}var t=Xo.layout.hierarchy().sort(null).value(null),e=ai,r=[1,1],u=!1;return n.separation=function(t){return arguments.length?(e=t,n):e},n.size=function(t){return arguments.length?(u=null==(r=t),n):u?null:r},n.nodeSize=function(t){return arguments.length?(u=null!=(r=t),n):u?r:null},Vu(n,t)},Xo.layout.treemap=function(){function n(n,t){for(var e,r,u=-1,i=n.length;++u<i;)r=(e=n[u]).value*(0>t?0:t),e.area=isNaN(r)||0>=r?0:r}function t(e){var i=e.children;if(i&&i.length){var o,a,c,s=f(e),l=[],h=i.slice(),p=1/0,v="slice"===g?s.dx:"dice"===g?s.dy:"slice-dice"===g?1&e.depth?s.dy:s.dx:Math.min(s.dx,s.dy);for(n(h,s.dx*s.dy/e.value),l.area=0;(c=h.length)>0;)l.push(o=h[c-1]),l.area+=o.area,"squarify"!==g||(a=r(l,v))<=p?(h.pop(),p=a):(l.area-=l.pop().area,u(l,v,s,!1),v=Math.min(s.dx,s.dy),l.length=l.area=0,p=1/0);l.length&&(u(l,v,s,!0),l.length=l.area=0),i.forEach(t)}}function e(t){var r=t.children;if(r&&r.length){var i,o=f(t),a=r.slice(),c=[];for(n(a,o.dx*o.dy/t.value),c.area=0;i=a.pop();)c.push(i),c.area+=i.area,null!=i.z&&(u(c,i.z?o.dx:o.dy,o,!a.length),c.length=c.area=0);r.forEach(e)}}function r(n,t){for(var e,r=n.area,u=0,i=1/0,o=-1,a=n.length;++o<a;)(e=n[o].area)&&(i>e&&(i=e),e>u&&(u=e));return r*=r,t*=t,r?Math.max(t*u*p/r,r/(t*i*p)):1/0}function u(n,t,e,r){var u,i=-1,o=n.length,a=e.x,s=e.y,l=t?c(n.area/t):0;if(t==e.dx){for((r||l>e.dy)&&(l=e.dy);++i<o;)u=n[i],u.x=a,u.y=s,u.dy=l,a+=u.dx=Math.min(e.x+e.dx-a,l?c(u.area/l):0);u.z=!0,u.dx+=e.x+e.dx-a,e.y+=l,e.dy-=l}else{for((r||l>e.dx)&&(l=e.dx);++i<o;)u=n[i],u.x=a,u.y=s,u.dx=l,s+=u.dy=Math.min(e.y+e.dy-s,l?c(u.area/l):0);u.z=!1,u.dy+=e.y+e.dy-s,e.x+=l,e.dx-=l}}function i(r){var u=o||a(r),i=u[0];return i.x=0,i.y=0,i.dx=s[0],i.dy=s[1],o&&a.revalue(i),n([i],i.dx*i.dy/i.value),(o?e:t)(i),h&&(o=u),u}var o,a=Xo.layout.hierarchy(),c=Math.round,s=[1,1],l=null,f=zi,h=!1,g="squarify",p=.5*(1+Math.sqrt(5));return i.size=function(n){return arguments.length?(s=n,i):s},i.padding=function(n){function t(t){var e=n.call(i,t,t.depth);return null==e?zi(t):qi(t,"number"==typeof e?[e,e,e,e]:e)}function e(t){return qi(t,n)}if(!arguments.length)return l;var r;return f=null==(l=n)?zi:"function"==(r=typeof n)?t:"number"===r?(n=[n,n,n,n],e):e,i},i.round=function(n){return arguments.length?(c=n?Math.round:Number,i):c!=Number},i.sticky=function(n){return arguments.length?(h=n,o=null,i):h},i.ratio=function(n){return arguments.length?(p=n,i):p},i.mode=function(n){return arguments.length?(g=n+"",i):g},Vu(i,a)},Xo.random={normal:function(n,t){var e=arguments.length;return 2>e&&(t=1),1>e&&(n=0),function(){var e,r,u;do e=2*Math.random()-1,r=2*Math.random()-1,u=e*e+r*r;while(!u||u>1);return n+t*e*Math.sqrt(-2*Math.log(u)/u)}},logNormal:function(){var n=Xo.random.normal.apply(Xo,arguments);return function(){return Math.exp(n())}},bates:function(n){var t=Xo.random.irwinHall(n);return function(){return t()/n}},irwinHall:function(n){return function(){for(var t=0,e=0;n>e;e++)t+=Math.random();return t}}},Xo.scale={};var ls={floor:bt,ceil:bt};Xo.scale.linear=function(){return Hi([0,1],[0,1],fu,!1)};var fs={s:1,g:1,p:1,r:1,e:1};Xo.scale.log=function(){return $i(Xo.scale.linear().domain([0,1]),10,!0,[1,10])};var hs=Xo.format(".0e"),gs={floor:function(n){return-Math.ceil(-n)},ceil:function(n){return-Math.floor(-n)}};Xo.scale.pow=function(){return Bi(Xo.scale.linear(),1,[0,1])},Xo.scale.sqrt=function(){return Xo.scale.pow().exponent(.5)},Xo.scale.ordinal=function(){return Ji([],{t:"range",a:[[]]})},Xo.scale.category10=function(){return Xo.scale.ordinal().range(ps)},Xo.scale.category20=function(){return Xo.scale.ordinal().range(vs)},Xo.scale.category20b=function(){return Xo.scale.ordinal().range(ds)},Xo.scale.category20c=function(){return Xo.scale.ordinal().range(ms)};var ps=[2062260,16744206,2924588,14034728,9725885,9197131,14907330,8355711,12369186,1556175].map(ht),vs=[2062260,11454440,16744206,16759672,2924588,10018698,14034728,16750742,9725885,12955861,9197131,12885140,14907330,16234194,8355711,13092807,12369186,14408589,1556175,10410725].map(ht),ds=[3750777,5395619,7040719,10264286,6519097,9216594,11915115,13556636,9202993,12426809,15186514,15190932,8666169,11356490,14049643,15177372,8077683,10834324,13528509,14589654].map(ht),ms=[3244733,7057110,10406625,13032431,15095053,16616764,16625259,16634018,3253076,7652470,10607003,13101504,7695281,10394312,12369372,14342891,6513507,9868950,12434877,14277081].map(ht);Xo.scale.quantile=function(){return Gi([],[])
+},Xo.scale.quantize=function(){return Ki(0,1,[0,1])},Xo.scale.threshold=function(){return Qi([.5],[0,1])},Xo.scale.identity=function(){return no([0,1])},Xo.svg={},Xo.svg.arc=function(){function n(){var n=t.apply(this,arguments),i=e.apply(this,arguments),o=r.apply(this,arguments)+ys,a=u.apply(this,arguments)+ys,c=(o>a&&(c=o,o=a,a=c),a-o),s=Sa>c?"0":"1",l=Math.cos(o),f=Math.sin(o),h=Math.cos(a),g=Math.sin(a);return c>=xs?n?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,"+n+"A"+n+","+n+" 0 1,0 0,"+-n+"A"+n+","+n+" 0 1,0 0,"+n+"Z":"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"Z":n?"M"+i*l+","+i*f+"A"+i+","+i+" 0 "+s+",1 "+i*h+","+i*g+"L"+n*h+","+n*g+"A"+n+","+n+" 0 "+s+",0 "+n*l+","+n*f+"Z":"M"+i*l+","+i*f+"A"+i+","+i+" 0 "+s+",1 "+i*h+","+i*g+"L0,0"+"Z"}var t=to,e=eo,r=ro,u=uo;return n.innerRadius=function(e){return arguments.length?(t=_t(e),n):t},n.outerRadius=function(t){return arguments.length?(e=_t(t),n):e},n.startAngle=function(t){return arguments.length?(r=_t(t),n):r},n.endAngle=function(t){return arguments.length?(u=_t(t),n):u},n.centroid=function(){var n=(t.apply(this,arguments)+e.apply(this,arguments))/2,i=(r.apply(this,arguments)+u.apply(this,arguments))/2+ys;return[Math.cos(i)*n,Math.sin(i)*n]},n};var ys=-Ea,xs=ka-Aa;Xo.svg.line=function(){return io(bt)};var Ms=Xo.map({linear:oo,"linear-closed":ao,step:co,"step-before":so,"step-after":lo,basis:mo,"basis-open":yo,"basis-closed":xo,bundle:Mo,cardinal:go,"cardinal-open":fo,"cardinal-closed":ho,monotone:Eo});Ms.forEach(function(n,t){t.key=n,t.closed=/-closed$/.test(n)});var _s=[0,2/3,1/3,0],bs=[0,1/3,2/3,0],ws=[0,1/6,2/3,1/6];Xo.svg.line.radial=function(){var n=io(Ao);return n.radius=n.x,delete n.x,n.angle=n.y,delete n.y,n},so.reverse=lo,lo.reverse=so,Xo.svg.area=function(){return Co(bt)},Xo.svg.area.radial=function(){var n=Co(Ao);return n.radius=n.x,delete n.x,n.innerRadius=n.x0,delete n.x0,n.outerRadius=n.x1,delete n.x1,n.angle=n.y,delete n.y,n.startAngle=n.y0,delete n.y0,n.endAngle=n.y1,delete n.y1,n},Xo.svg.chord=function(){function n(n,a){var c=t(this,i,n,a),s=t(this,o,n,a);return"M"+c.p0+r(c.r,c.p1,c.a1-c.a0)+(e(c,s)?u(c.r,c.p1,c.r,c.p0):u(c.r,c.p1,s.r,s.p0)+r(s.r,s.p1,s.a1-s.a0)+u(s.r,s.p1,c.r,c.p0))+"Z"}function t(n,t,e,r){var u=t.call(n,e,r),i=a.call(n,u,r),o=c.call(n,u,r)+ys,l=s.call(n,u,r)+ys;return{r:i,a0:o,a1:l,p0:[i*Math.cos(o),i*Math.sin(o)],p1:[i*Math.cos(l),i*Math.sin(l)]}}function e(n,t){return n.a0==t.a0&&n.a1==t.a1}function r(n,t,e){return"A"+n+","+n+" 0 "+ +(e>Sa)+",1 "+t}function u(n,t,e,r){return"Q 0,0 "+r}var i=hr,o=gr,a=No,c=ro,s=uo;return n.radius=function(t){return arguments.length?(a=_t(t),n):a},n.source=function(t){return arguments.length?(i=_t(t),n):i},n.target=function(t){return arguments.length?(o=_t(t),n):o},n.startAngle=function(t){return arguments.length?(c=_t(t),n):c},n.endAngle=function(t){return arguments.length?(s=_t(t),n):s},n},Xo.svg.diagonal=function(){function n(n,u){var i=t.call(this,n,u),o=e.call(this,n,u),a=(i.y+o.y)/2,c=[i,{x:i.x,y:a},{x:o.x,y:a},o];return c=c.map(r),"M"+c[0]+"C"+c[1]+" "+c[2]+" "+c[3]}var t=hr,e=gr,r=Lo;return n.source=function(e){return arguments.length?(t=_t(e),n):t},n.target=function(t){return arguments.length?(e=_t(t),n):e},n.projection=function(t){return arguments.length?(r=t,n):r},n},Xo.svg.diagonal.radial=function(){var n=Xo.svg.diagonal(),t=Lo,e=n.projection;return n.projection=function(n){return arguments.length?e(zo(t=n)):t},n},Xo.svg.symbol=function(){function n(n,r){return(Ss.get(t.call(this,n,r))||Ro)(e.call(this,n,r))}var t=To,e=qo;return n.type=function(e){return arguments.length?(t=_t(e),n):t},n.size=function(t){return arguments.length?(e=_t(t),n):e},n};var Ss=Xo.map({circle:Ro,cross:function(n){var t=Math.sqrt(n/5)/2;return"M"+-3*t+","+-t+"H"+-t+"V"+-3*t+"H"+t+"V"+-t+"H"+3*t+"V"+t+"H"+t+"V"+3*t+"H"+-t+"V"+t+"H"+-3*t+"Z"},diamond:function(n){var t=Math.sqrt(n/(2*Cs)),e=t*Cs;return"M0,"+-t+"L"+e+",0"+" 0,"+t+" "+-e+",0"+"Z"},square:function(n){var t=Math.sqrt(n)/2;return"M"+-t+","+-t+"L"+t+","+-t+" "+t+","+t+" "+-t+","+t+"Z"},"triangle-down":function(n){var t=Math.sqrt(n/As),e=t*As/2;return"M0,"+e+"L"+t+","+-e+" "+-t+","+-e+"Z"},"triangle-up":function(n){var t=Math.sqrt(n/As),e=t*As/2;return"M0,"+-e+"L"+t+","+e+" "+-t+","+e+"Z"}});Xo.svg.symbolTypes=Ss.keys();var ks,Es,As=Math.sqrt(3),Cs=Math.tan(30*Na),Ns=[],Ls=0;Ns.call=da.call,Ns.empty=da.empty,Ns.node=da.node,Ns.size=da.size,Xo.transition=function(n){return arguments.length?ks?n.transition():n:xa.transition()},Xo.transition.prototype=Ns,Ns.select=function(n){var t,e,r,u=this.id,i=[];n=M(n);for(var o=-1,a=this.length;++o<a;){i.push(t=[]);for(var c=this[o],s=-1,l=c.length;++s<l;)(r=c[s])&&(e=n.call(r,r.__data__,s,o))?("__data__"in r&&(e.__data__=r.__data__),jo(e,s,u,r.__transition__[u]),t.push(e)):t.push(null)}return Do(i,u)},Ns.selectAll=function(n){var t,e,r,u,i,o=this.id,a=[];n=_(n);for(var c=-1,s=this.length;++c<s;)for(var l=this[c],f=-1,h=l.length;++f<h;)if(r=l[f]){i=r.__transition__[o],e=n.call(r,r.__data__,f,c),a.push(t=[]);for(var g=-1,p=e.length;++g<p;)(u=e[g])&&jo(u,g,o,i),t.push(u)}return Do(a,o)},Ns.filter=function(n){var t,e,r,u=[];"function"!=typeof n&&(n=q(n));for(var i=0,o=this.length;o>i;i++){u.push(t=[]);for(var e=this[i],a=0,c=e.length;c>a;a++)(r=e[a])&&n.call(r,r.__data__,a,i)&&t.push(r)}return Do(u,this.id)},Ns.tween=function(n,t){var e=this.id;return arguments.length<2?this.node().__transition__[e].tween.get(n):R(this,null==t?function(t){t.__transition__[e].tween.remove(n)}:function(r){r.__transition__[e].tween.set(n,t)})},Ns.attr=function(n,t){function e(){this.removeAttribute(a)}function r(){this.removeAttributeNS(a.space,a.local)}function u(n){return null==n?e:(n+="",function(){var t,e=this.getAttribute(a);return e!==n&&(t=o(e,n),function(n){this.setAttribute(a,t(n))})})}function i(n){return null==n?r:(n+="",function(){var t,e=this.getAttributeNS(a.space,a.local);return e!==n&&(t=o(e,n),function(n){this.setAttributeNS(a.space,a.local,t(n))})})}if(arguments.length<2){for(t in n)this.attr(t,n[t]);return this}var o="transform"==n?Ru:fu,a=Xo.ns.qualify(n);return Po(this,"attr."+n,t,a.local?i:u)},Ns.attrTween=function(n,t){function e(n,e){var r=t.call(this,n,e,this.getAttribute(u));return r&&function(n){this.setAttribute(u,r(n))}}function r(n,e){var r=t.call(this,n,e,this.getAttributeNS(u.space,u.local));return r&&function(n){this.setAttributeNS(u.space,u.local,r(n))}}var u=Xo.ns.qualify(n);return this.tween("attr."+n,u.local?r:e)},Ns.style=function(n,t,e){function r(){this.style.removeProperty(n)}function u(t){return null==t?r:(t+="",function(){var r,u=Go.getComputedStyle(this,null).getPropertyValue(n);return u!==t&&(r=fu(u,t),function(t){this.style.setProperty(n,r(t),e)})})}var i=arguments.length;if(3>i){if("string"!=typeof n){2>i&&(t="");for(e in n)this.style(e,n[e],t);return this}e=""}return Po(this,"style."+n,t,u)},Ns.styleTween=function(n,t,e){function r(r,u){var i=t.call(this,r,u,Go.getComputedStyle(this,null).getPropertyValue(n));return i&&function(t){this.style.setProperty(n,i(t),e)}}return arguments.length<3&&(e=""),this.tween("style."+n,r)},Ns.text=function(n){return Po(this,"text",n,Uo)},Ns.remove=function(){return this.each("end.transition",function(){var n;this.__transition__.count<2&&(n=this.parentNode)&&n.removeChild(this)})},Ns.ease=function(n){var t=this.id;return arguments.length<1?this.node().__transition__[t].ease:("function"!=typeof n&&(n=Xo.ease.apply(Xo,arguments)),R(this,function(e){e.__transition__[t].ease=n}))},Ns.delay=function(n){var t=this.id;return R(this,"function"==typeof n?function(e,r,u){e.__transition__[t].delay=+n.call(e,e.__data__,r,u)}:(n=+n,function(e){e.__transition__[t].delay=n}))},Ns.duration=function(n){var t=this.id;return R(this,"function"==typeof n?function(e,r,u){e.__transition__[t].duration=Math.max(1,n.call(e,e.__data__,r,u))}:(n=Math.max(1,n),function(e){e.__transition__[t].duration=n}))},Ns.each=function(n,t){var e=this.id;if(arguments.length<2){var r=Es,u=ks;ks=e,R(this,function(t,r,u){Es=t.__transition__[e],n.call(t,t.__data__,r,u)}),Es=r,ks=u}else R(this,function(r){var u=r.__transition__[e];(u.event||(u.event=Xo.dispatch("start","end"))).on(n,t)});return this},Ns.transition=function(){for(var n,t,e,r,u=this.id,i=++Ls,o=[],a=0,c=this.length;c>a;a++){o.push(n=[]);for(var t=this[a],s=0,l=t.length;l>s;s++)(e=t[s])&&(r=Object.create(e.__transition__[u]),r.delay+=r.duration,jo(e,s,i,r)),n.push(e)}return Do(o,i)},Xo.svg.axis=function(){function n(n){n.each(function(){var n,s=Xo.select(this),l=this.__chart__||e,f=this.__chart__=e.copy(),h=null==c?f.ticks?f.ticks.apply(f,a):f.domain():c,g=null==t?f.tickFormat?f.tickFormat.apply(f,a):bt:t,p=s.selectAll(".tick").data(h,f),v=p.enter().insert("g",".domain").attr("class","tick").style("opacity",Aa),d=Xo.transition(p.exit()).style("opacity",Aa).remove(),m=Xo.transition(p).style("opacity",1),y=Ri(f),x=s.selectAll(".domain").data([0]),M=(x.enter().append("path").attr("class","domain"),Xo.transition(x));v.append("line"),v.append("text");var _=v.select("line"),b=m.select("line"),w=p.select("text").text(g),S=v.select("text"),k=m.select("text");switch(r){case"bottom":n=Ho,_.attr("y2",u),S.attr("y",Math.max(u,0)+o),b.attr("x2",0).attr("y2",u),k.attr("x",0).attr("y",Math.max(u,0)+o),w.attr("dy",".71em").style("text-anchor","middle"),M.attr("d","M"+y[0]+","+i+"V0H"+y[1]+"V"+i);break;case"top":n=Ho,_.attr("y2",-u),S.attr("y",-(Math.max(u,0)+o)),b.attr("x2",0).attr("y2",-u),k.attr("x",0).attr("y",-(Math.max(u,0)+o)),w.attr("dy","0em").style("text-anchor","middle"),M.attr("d","M"+y[0]+","+-i+"V0H"+y[1]+"V"+-i);break;case"left":n=Fo,_.attr("x2",-u),S.attr("x",-(Math.max(u,0)+o)),b.attr("x2",-u).attr("y2",0),k.attr("x",-(Math.max(u,0)+o)).attr("y",0),w.attr("dy",".32em").style("text-anchor","end"),M.attr("d","M"+-i+","+y[0]+"H0V"+y[1]+"H"+-i);break;case"right":n=Fo,_.attr("x2",u),S.attr("x",Math.max(u,0)+o),b.attr("x2",u).attr("y2",0),k.attr("x",Math.max(u,0)+o).attr("y",0),w.attr("dy",".32em").style("text-anchor","start"),M.attr("d","M"+i+","+y[0]+"H0V"+y[1]+"H"+i)}if(f.rangeBand){var E=f,A=E.rangeBand()/2;l=f=function(n){return E(n)+A}}else l.rangeBand?l=f:d.call(n,f);v.call(n,l),m.call(n,f)})}var t,e=Xo.scale.linear(),r=zs,u=6,i=6,o=3,a=[10],c=null;return n.scale=function(t){return arguments.length?(e=t,n):e},n.orient=function(t){return arguments.length?(r=t in qs?t+"":zs,n):r},n.ticks=function(){return arguments.length?(a=arguments,n):a},n.tickValues=function(t){return arguments.length?(c=t,n):c},n.tickFormat=function(e){return arguments.length?(t=e,n):t},n.tickSize=function(t){var e=arguments.length;return e?(u=+t,i=+arguments[e-1],n):u},n.innerTickSize=function(t){return arguments.length?(u=+t,n):u},n.outerTickSize=function(t){return arguments.length?(i=+t,n):i},n.tickPadding=function(t){return arguments.length?(o=+t,n):o},n.tickSubdivide=function(){return arguments.length&&n},n};var zs="bottom",qs={top:1,right:1,bottom:1,left:1};Xo.svg.brush=function(){function n(i){i.each(function(){var i=Xo.select(this).style("pointer-events","all").style("-webkit-tap-highlight-color","rgba(0,0,0,0)").on("mousedown.brush",u).on("touchstart.brush",u),o=i.selectAll(".background").data([0]);o.enter().append("rect").attr("class","background").style("visibility","hidden").style("cursor","crosshair"),i.selectAll(".extent").data([0]).enter().append("rect").attr("class","extent").style("cursor","move");var a=i.selectAll(".resize").data(p,bt);a.exit().remove(),a.enter().append("g").attr("class",function(n){return"resize "+n}).style("cursor",function(n){return Ts[n]}).append("rect").attr("x",function(n){return/[ew]$/.test(n)?-3:null}).attr("y",function(n){return/^[ns]/.test(n)?-3:null}).attr("width",6).attr("height",6).style("visibility","hidden"),a.style("display",n.empty()?"none":null);var l,f=Xo.transition(i),h=Xo.transition(o);c&&(l=Ri(c),h.attr("x",l[0]).attr("width",l[1]-l[0]),e(f)),s&&(l=Ri(s),h.attr("y",l[0]).attr("height",l[1]-l[0]),r(f)),t(f)})}function t(n){n.selectAll(".resize").attr("transform",function(n){return"translate("+l[+/e$/.test(n)]+","+f[+/^s/.test(n)]+")"})}function e(n){n.select(".extent").attr("x",l[0]),n.selectAll(".extent,.n>rect,.s>rect").attr("width",l[1]-l[0])}function r(n){n.select(".extent").attr("y",f[0]),n.selectAll(".extent,.e>rect,.w>rect").attr("height",f[1]-f[0])}function u(){function u(){32==Xo.event.keyCode&&(C||(x=null,L[0]-=l[1],L[1]-=f[1],C=2),d())}function p(){32==Xo.event.keyCode&&2==C&&(L[0]+=l[1],L[1]+=f[1],C=0,d())}function v(){var n=Xo.mouse(_),u=!1;M&&(n[0]+=M[0],n[1]+=M[1]),C||(Xo.event.altKey?(x||(x=[(l[0]+l[1])/2,(f[0]+f[1])/2]),L[0]=l[+(n[0]<x[0])],L[1]=f[+(n[1]<x[1])]):x=null),E&&m(n,c,0)&&(e(S),u=!0),A&&m(n,s,1)&&(r(S),u=!0),u&&(t(S),w({type:"brush",mode:C?"move":"resize"}))}function m(n,t,e){var r,u,a=Ri(t),c=a[0],s=a[1],p=L[e],v=e?f:l,d=v[1]-v[0];return C&&(c-=p,s-=d+p),r=(e?g:h)?Math.max(c,Math.min(s,n[e])):n[e],C?u=(r+=p)+d:(x&&(p=Math.max(c,Math.min(s,2*x[e]-r))),r>p?(u=r,r=p):u=p),v[0]!=r||v[1]!=u?(e?o=null:i=null,v[0]=r,v[1]=u,!0):void 0}function y(){v(),S.style("pointer-events","all").selectAll(".resize").style("display",n.empty()?"none":null),Xo.select("body").style("cursor",null),z.on("mousemove.brush",null).on("mouseup.brush",null).on("touchmove.brush",null).on("touchend.brush",null).on("keydown.brush",null).on("keyup.brush",null),N(),w({type:"brushend"})}var x,M,_=this,b=Xo.select(Xo.event.target),w=a.of(_,arguments),S=Xo.select(_),k=b.datum(),E=!/^(n|s)$/.test(k)&&c,A=!/^(e|w)$/.test(k)&&s,C=b.classed("extent"),N=O(),L=Xo.mouse(_),z=Xo.select(Go).on("keydown.brush",u).on("keyup.brush",p);if(Xo.event.changedTouches?z.on("touchmove.brush",v).on("touchend.brush",y):z.on("mousemove.brush",v).on("mouseup.brush",y),S.interrupt().selectAll("*").interrupt(),C)L[0]=l[0]-L[0],L[1]=f[0]-L[1];else if(k){var q=+/w$/.test(k),T=+/^n/.test(k);M=[l[1-q]-L[0],f[1-T]-L[1]],L[0]=l[q],L[1]=f[T]}else Xo.event.altKey&&(x=L.slice());S.style("pointer-events","none").selectAll(".resize").style("display",null),Xo.select("body").style("cursor",b.style("cursor")),w({type:"brushstart"}),v()}var i,o,a=y(n,"brushstart","brush","brushend"),c=null,s=null,l=[0,0],f=[0,0],h=!0,g=!0,p=Rs[0];return n.event=function(n){n.each(function(){var n=a.of(this,arguments),t={x:l,y:f,i:i,j:o},e=this.__chart__||t;this.__chart__=t,ks?Xo.select(this).transition().each("start.brush",function(){i=e.i,o=e.j,l=e.x,f=e.y,n({type:"brushstart"})}).tween("brush:brush",function(){var e=hu(l,t.x),r=hu(f,t.y);return i=o=null,function(u){l=t.x=e(u),f=t.y=r(u),n({type:"brush",mode:"resize"})}}).each("end.brush",function(){i=t.i,o=t.j,n({type:"brush",mode:"resize"}),n({type:"brushend"})}):(n({type:"brushstart"}),n({type:"brush",mode:"resize"}),n({type:"brushend"}))})},n.x=function(t){return arguments.length?(c=t,p=Rs[!c<<1|!s],n):c},n.y=function(t){return arguments.length?(s=t,p=Rs[!c<<1|!s],n):s},n.clamp=function(t){return arguments.length?(c&&s?(h=!!t[0],g=!!t[1]):c?h=!!t:s&&(g=!!t),n):c&&s?[h,g]:c?h:s?g:null},n.extent=function(t){var e,r,u,a,h;return arguments.length?(c&&(e=t[0],r=t[1],s&&(e=e[0],r=r[0]),i=[e,r],c.invert&&(e=c(e),r=c(r)),e>r&&(h=e,e=r,r=h),(e!=l[0]||r!=l[1])&&(l=[e,r])),s&&(u=t[0],a=t[1],c&&(u=u[1],a=a[1]),o=[u,a],s.invert&&(u=s(u),a=s(a)),u>a&&(h=u,u=a,a=h),(u!=f[0]||a!=f[1])&&(f=[u,a])),n):(c&&(i?(e=i[0],r=i[1]):(e=l[0],r=l[1],c.invert&&(e=c.invert(e),r=c.invert(r)),e>r&&(h=e,e=r,r=h))),s&&(o?(u=o[0],a=o[1]):(u=f[0],a=f[1],s.invert&&(u=s.invert(u),a=s.invert(a)),u>a&&(h=u,u=a,a=h))),c&&s?[[e,u],[r,a]]:c?[e,r]:s&&[u,a])},n.clear=function(){return n.empty()||(l=[0,0],f=[0,0],i=o=null),n},n.empty=function(){return!!c&&l[0]==l[1]||!!s&&f[0]==f[1]},Xo.rebind(n,a,"on")};var Ts={n:"ns-resize",e:"ew-resize",s:"ns-resize",w:"ew-resize",nw:"nwse-resize",ne:"nesw-resize",se:"nwse-resize",sw:"nesw-resize"},Rs=[["n","e","s","w","nw","ne","se","sw"],["e","w"],["n","s"],[]],Ds=tc.format=ac.timeFormat,Ps=Ds.utc,Us=Ps("%Y-%m-%dT%H:%M:%S.%LZ");Ds.iso=Date.prototype.toISOString&&+new Date("2000-01-01T00:00:00.000Z")?Oo:Us,Oo.parse=function(n){var t=new Date(n);return isNaN(t)?null:t},Oo.toString=Us.toString,tc.second=Rt(function(n){return new ec(1e3*Math.floor(n/1e3))},function(n,t){n.setTime(n.getTime()+1e3*Math.floor(t))},function(n){return n.getSeconds()}),tc.seconds=tc.second.range,tc.seconds.utc=tc.second.utc.range,tc.minute=Rt(function(n){return new ec(6e4*Math.floor(n/6e4))},function(n,t){n.setTime(n.getTime()+6e4*Math.floor(t))},function(n){return n.getMinutes()}),tc.minutes=tc.minute.range,tc.minutes.utc=tc.minute.utc.range,tc.hour=Rt(function(n){var t=n.getTimezoneOffset()/60;return new ec(36e5*(Math.floor(n/36e5-t)+t))},function(n,t){n.setTime(n.getTime()+36e5*Math.floor(t))},function(n){return n.getHours()}),tc.hours=tc.hour.range,tc.hours.utc=tc.hour.utc.range,tc.month=Rt(function(n){return n=tc.day(n),n.setDate(1),n},function(n,t){n.setMonth(n.getMonth()+t)},function(n){return n.getMonth()}),tc.months=tc.month.range,tc.months.utc=tc.month.utc.range;var js=[1e3,5e3,15e3,3e4,6e4,3e5,9e5,18e5,36e5,108e5,216e5,432e5,864e5,1728e5,6048e5,2592e6,7776e6,31536e6],Hs=[[tc.second,1],[tc.second,5],[tc.second,15],[tc.second,30],[tc.minute,1],[tc.minute,5],[tc.minute,15],[tc.minute,30],[tc.hour,1],[tc.hour,3],[tc.hour,6],[tc.hour,12],[tc.day,1],[tc.day,2],[tc.week,1],[tc.month,1],[tc.month,3],[tc.year,1]],Fs=Ds.multi([[".%L",function(n){return n.getMilliseconds()}],[":%S",function(n){return n.getSeconds()}],["%I:%M",function(n){return n.getMinutes()}],["%I %p",function(n){return n.getHours()}],["%a %d",function(n){return n.getDay()&&1!=n.getDate()}],["%b %d",function(n){return 1!=n.getDate()}],["%B",function(n){return n.getMonth()}],["%Y",be]]),Os={range:function(n,t,e){return Xo.range(+n,+t,e).map(Io)},floor:bt,ceil:bt};Hs.year=tc.year,tc.scale=function(){return Yo(Xo.scale.linear(),Hs,Fs)};var Ys=Hs.map(function(n){return[n[0].utc,n[1]]}),Is=Ps.multi([[".%L",function(n){return n.getUTCMilliseconds()}],[":%S",function(n){return n.getUTCSeconds()}],["%I:%M",function(n){return n.getUTCMinutes()}],["%I %p",function(n){return n.getUTCHours()}],["%a %d",function(n){return n.getUTCDay()&&1!=n.getUTCDate()}],["%b %d",function(n){return 1!=n.getUTCDate()}],["%B",function(n){return n.getUTCMonth()}],["%Y",be]]);Ys.year=tc.year.utc,tc.scale.utc=function(){return Yo(Xo.scale.linear(),Ys,Is)},Xo.text=wt(function(n){return n.responseText}),Xo.json=function(n,t){return St(n,"application/json",Zo,t)},Xo.html=function(n,t){return St(n,"text/html",Vo,t)},Xo.xml=wt(function(n){return n.responseXML}),"function"==typeof define&&define.amd?define(Xo):"object"==typeof module&&module.exports?module.exports=Xo:this.d3=Xo}();
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.js b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.js
new file mode 100644
index 0000000000000000000000000000000000000000..c5b8ee618ec0d4e5734b5883a0128d54170c80ef
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/holder.js
@@ -0,0 +1,648 @@
+/*!
+
+Holder - 2.3.1 - client side image placeholders
+(c) 2012-2014 Ivan Malopinsky / http://imsky.co
+
+Provided under the MIT License.
+Commercial use requires attribution.
+
+*/
+var Holder = Holder || {};
+(function (app, win) {
+var system_config = {
+	use_svg: false,
+	use_canvas: false,
+	use_fallback: false
+};
+var instance_config = {};
+var preempted = false;
+canvas = document.createElement('canvas');
+var dpr = 1, bsr = 1;
+var resizable_images = [];
+
+if (!canvas.getContext) {
+	system_config.use_fallback = true;
+} else {
+	if (canvas.toDataURL("image/png")
+		.indexOf("data:image/png") < 0) {
+		//Android doesn't support data URI
+		system_config.use_fallback = true;
+	} else {
+		var ctx = canvas.getContext("2d");
+	}
+}
+
+if(!!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect){
+	system_config.use_svg = true;
+	system_config.use_canvas = false;
+}
+
+if(!system_config.use_fallback){
+    dpr = window.devicePixelRatio || 1,
+    bsr = ctx.webkitBackingStorePixelRatio || ctx.mozBackingStorePixelRatio || ctx.msBackingStorePixelRatio || ctx.oBackingStorePixelRatio || ctx.backingStorePixelRatio || 1;
+}
+
+var ratio = dpr / bsr;
+
+var settings = {
+	domain: "holder.js",
+	images: "img",
+	bgnodes: ".holderjs",
+	themes: {
+		"gray": {
+			background: "#eee",
+			foreground: "#aaa",
+			size: 12
+		},
+		"social": {
+			background: "#3a5a97",
+			foreground: "#fff",
+			size: 12
+		},
+		"industrial": {
+			background: "#434A52",
+			foreground: "#C2F200",
+			size: 12
+		},
+		"sky": {
+			background: "#0D8FDB",
+			foreground: "#fff",
+			size: 12
+		},
+		"vine": {
+			background: "#39DBAC",
+			foreground: "#1E292C",
+			size: 12
+		},
+		"lava": {
+			background: "#F8591A",
+			foreground: "#1C2846",
+			size: 12
+		}
+	},
+	stylesheet: ""
+};
+app.flags = {
+	dimensions: {
+		regex: /^(\d+)x(\d+)$/,
+		output: function (val) {
+			var exec = this.regex.exec(val);
+			return {
+				width: +exec[1],
+				height: +exec[2]
+			}
+		}
+	},
+	fluid: {
+		regex: /^([0-9%]+)x([0-9%]+)$/,
+		output: function (val) {
+			var exec = this.regex.exec(val);
+			return {
+				width: exec[1],
+				height: exec[2]
+			}
+		}
+	},
+	colors: {
+		regex: /#([0-9a-f]{3,})\:#([0-9a-f]{3,})/i,
+		output: function (val) {
+			var exec = this.regex.exec(val);
+			return {
+				size: settings.themes.gray.size,
+				foreground: "#" + exec[2],
+				background: "#" + exec[1]
+			}
+		}
+	},
+	text: {
+		regex: /text\:(.*)/,
+		output: function (val) {
+			return this.regex.exec(val)[1];
+		}
+	},
+	font: {
+		regex: /font\:(.*)/,
+		output: function (val) {
+			return this.regex.exec(val)[1];
+		}
+	},
+	auto: {
+		regex: /^auto$/
+	},
+	textmode: {
+		regex: /textmode\:(.*)/,
+		output: function(val){
+			return this.regex.exec(val)[1];
+		}
+	}
+}
+
+function text_size(width, height, template) {
+	height = parseInt(height, 10);
+	width = parseInt(width, 10);
+	var bigSide = Math.max(height, width)
+	var smallSide = Math.min(height, width)
+	var scale = 1 / 12;
+	var newHeight = Math.min(smallSide * 0.75, 0.75 * bigSide * scale);
+	return {
+		height: Math.round(Math.max(template.size, newHeight))
+	}
+}
+
+var svg_el = (function(){
+	//Prevent IE <9 from initializing SVG renderer
+	if(!window.XMLSerializer) return;
+	var serializer = new XMLSerializer();
+	var svg_ns = "http://www.w3.org/2000/svg"
+	var svg = document.createElementNS(svg_ns, "svg");
+	//IE throws an exception if this is set and Chrome requires it to be set
+	if(svg.webkitMatchesSelector){
+		svg.setAttribute("xmlns", "http://www.w3.org/2000/svg")
+	}
+	var bg_el = document.createElementNS(svg_ns, "rect")
+	var text_el = document.createElementNS(svg_ns, "text")
+	var textnode_el = document.createTextNode(null)
+	text_el.setAttribute("text-anchor", "middle")
+	text_el.appendChild(textnode_el)
+	svg.appendChild(bg_el)
+	svg.appendChild(text_el)
+
+	return function(props){
+		svg.setAttribute("width",props.width);
+		svg.setAttribute("height", props.height);
+		bg_el.setAttribute("width", props.width);
+		bg_el.setAttribute("height", props.height);
+		bg_el.setAttribute("fill", props.template.background);
+		text_el.setAttribute("x", props.width/2)
+		text_el.setAttribute("y", props.height/2)
+		textnode_el.nodeValue=props.text
+		text_el.setAttribute("style", css_properties({
+		"fill": props.template.foreground,
+		"font-weight": "bold",
+		"font-size": props.text_height+"px",
+		"font-family":props.font,
+		"dominant-baseline":"central"
+		}))
+		return serializer.serializeToString(svg)
+	}
+})()
+
+function css_properties(props){
+	var ret = [];
+	for(p in props){
+		if(props.hasOwnProperty(p)){
+			ret.push(p+":"+props[p])
+		}
+	}
+	return ret.join(";")
+}
+
+function draw_canvas(args) {
+	var ctx = args.ctx,
+		dimensions = args.dimensions,
+		template = args.template,
+		ratio = args.ratio,
+		holder = args.holder,
+		literal = holder.textmode == "literal",
+		exact = holder.textmode == "exact";
+
+	var ts = text_size(dimensions.width, dimensions.height, template);
+	var text_height = ts.height;
+	var width = dimensions.width * ratio,
+		height = dimensions.height * ratio;
+	var font = template.font ? template.font : "Arial,Helvetica,sans-serif";
+	canvas.width = width;
+	canvas.height = height;
+	ctx.textAlign = "center";
+	ctx.textBaseline = "middle";
+	ctx.fillStyle = template.background;
+	ctx.fillRect(0, 0, width, height);
+	ctx.fillStyle = template.foreground;
+	ctx.font = "bold " + text_height + "px " + font;
+	var text = template.text ? template.text : (Math.floor(dimensions.width) + "x" + Math.floor(dimensions.height));
+	if (literal) {
+		var dimensions = holder.dimensions;
+		text = dimensions.width + "x" + dimensions.height;
+	}
+	else if(exact && holder.exact_dimensions){
+		var dimensions = holder.exact_dimensions;
+		text = (Math.floor(dimensions.width) + "x" + Math.floor(dimensions.height));
+	}
+	var text_width = ctx.measureText(text).width;
+	if (text_width / width >= 0.75) {
+		text_height = Math.floor(text_height * 0.75 * (width / text_width));
+	}
+	//Resetting font size if necessary
+	ctx.font = "bold " + (text_height * ratio) + "px " + font;
+	ctx.fillText(text, (width / 2), (height / 2), width);
+	return canvas.toDataURL("image/png");
+}
+
+function draw_svg(args){
+	var dimensions = args.dimensions,
+		template = args.template,
+		holder = args.holder,
+		literal = holder.textmode == "literal",
+		exact = holder.textmode == "exact";
+
+	var ts = text_size(dimensions.width, dimensions.height, template);
+	var text_height = ts.height;
+	var width = dimensions.width,
+		height = dimensions.height;
+		
+	var font = template.font ? template.font : "Arial,Helvetica,sans-serif";
+	var text = template.text ? template.text : (Math.floor(dimensions.width) + "x" + Math.floor(dimensions.height));
+	
+	if (literal) {
+		var dimensions = holder.dimensions;
+		text = dimensions.width + "x" + dimensions.height;
+	}
+	else if(exact && holder.exact_dimensions){
+		var dimensions = holder.exact_dimensions;
+		text = (Math.floor(dimensions.width) + "x" + Math.floor(dimensions.height));
+	}
+	var string = svg_el({
+		text: text, 
+		width:width, 
+		height:height, 
+		text_height:text_height, 
+		font:font, 
+		template:template
+	})
+	return "data:image/svg+xml;base64,"+btoa(string);
+}
+
+function draw(args) {
+	if(instance_config.use_canvas && !instance_config.use_svg){
+		return draw_canvas(args);
+	}
+	else{
+		return draw_svg(args);
+	}
+}
+
+function render(mode, el, holder, src) {
+	var dimensions = holder.dimensions,
+		theme = holder.theme,
+		text = holder.text ? decodeURIComponent(holder.text) : holder.text;
+	var dimensions_caption = dimensions.width + "x" + dimensions.height;
+	theme = (text ? extend(theme, {
+		text: text
+	}) : theme);
+	theme = (holder.font ? extend(theme, {
+		font: holder.font
+	}) : theme);
+	el.setAttribute("data-src", src);
+	holder.theme = theme;
+	el.holder_data = holder;
+	
+	if (mode == "image") {
+		el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption);
+		if (instance_config.use_fallback || !holder.auto) {
+			el.style.width = dimensions.width + "px";
+			el.style.height = dimensions.height + "px";
+		}
+		if (instance_config.use_fallback) {
+			el.style.backgroundColor = theme.background;
+		} else {
+			el.setAttribute("src", draw({ctx: ctx, dimensions: dimensions, template: theme, ratio:ratio, holder: holder}));
+			
+			if(holder.textmode && holder.textmode == "exact"){
+				resizable_images.push(el);
+				resizable_update(el);
+			}
+			
+		}
+	} else if (mode == "background") {
+		if (!instance_config.use_fallback) {
+			el.style.backgroundImage = "url(" + draw({ctx:ctx, dimensions: dimensions, template: theme, ratio: ratio, holder: holder}) + ")";
+			el.style.backgroundSize = dimensions.width + "px " + dimensions.height + "px";
+		}
+	} else if (mode == "fluid") {
+		el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption);
+		if (dimensions.height.slice(-1) == "%") {
+			el.style.height = dimensions.height
+		} else if(holder.auto == null || !holder.auto){
+			el.style.height = dimensions.height + "px"
+		}
+		if (dimensions.width.slice(-1) == "%") {
+			el.style.width = dimensions.width
+		} else if(holder.auto == null || !holder.auto){
+			el.style.width = dimensions.width + "px"
+		}
+		if (el.style.display == "inline" || el.style.display === "" || el.style.display == "none") {
+			el.style.display = "block";
+		}
+		
+		set_initial_dimensions(el)
+		
+		if (instance_config.use_fallback) {
+			el.style.backgroundColor = theme.background;
+		} else {
+			resizable_images.push(el);
+			resizable_update(el);
+		}
+	}
+}
+
+function dimension_check(el, callback) {
+	var dimensions = {
+		height: el.clientHeight,
+		width: el.clientWidth
+	};
+	if (!dimensions.height && !dimensions.width) {
+		el.setAttribute("data-holder-invisible", true)
+		callback.call(this, el)
+	}
+	else{
+		el.removeAttribute("data-holder-invisible")
+		return dimensions;
+	}
+}
+
+function set_initial_dimensions(el){
+	if(el.holder_data){
+		var dimensions = dimension_check(el, app.invisible_error_fn( set_initial_dimensions))
+		if(dimensions){
+			var holder = el.holder_data;
+			holder.initial_dimensions = dimensions;
+			holder.fluid_data = {
+				fluid_height: holder.dimensions.height.slice(-1) == "%",
+				fluid_width: holder.dimensions.width.slice(-1) == "%",
+				mode: null
+			}
+			if(holder.fluid_data.fluid_width && !holder.fluid_data.fluid_height){
+				holder.fluid_data.mode = "width"
+				holder.fluid_data.ratio = holder.initial_dimensions.width / parseFloat(holder.dimensions.height)
+			}
+			else if(!holder.fluid_data.fluid_width && holder.fluid_data.fluid_height){
+				holder.fluid_data.mode = "height";
+				holder.fluid_data.ratio = parseFloat(holder.dimensions.width) / holder.initial_dimensions.height
+			}
+		}
+	}
+}
+
+function resizable_update(element) {
+	var images;
+	if (element.nodeType == null) {
+		images = resizable_images;
+	} else {
+		images = [element]
+	}
+	for (var i in images) {
+		if (!images.hasOwnProperty(i)) {
+			continue;
+		}
+		var el = images[i]
+		if (el.holder_data) {
+			var holder = el.holder_data;
+			var dimensions = dimension_check(el, app.invisible_error_fn( resizable_update))
+			if(dimensions){
+				if(holder.fluid){
+					if(holder.auto){
+						switch(holder.fluid_data.mode){
+							case "width":
+								dimensions.height = dimensions.width / holder.fluid_data.ratio;
+							break;
+							case "height":
+								dimensions.width = dimensions.height * holder.fluid_data.ratio;
+							break;
+						}
+					}
+					el.setAttribute("src", draw({
+						ctx: ctx,
+						dimensions: dimensions,
+						template: holder.theme,
+						ratio: ratio,
+						holder: holder
+					}))
+				}
+				if(holder.textmode && holder.textmode == "exact"){
+					holder.exact_dimensions = dimensions;
+					el.setAttribute("src", draw({
+						ctx: ctx,
+						dimensions: holder.dimensions,
+						template: holder.theme,
+						ratio: ratio,
+						holder: holder
+					}))
+				}
+			}
+		}
+	}
+}
+
+function parse_flags(flags, options) {
+	var ret = {
+		theme: extend(settings.themes.gray, {})
+	};
+	var render = false;
+	for (var fl = flags.length, j = 0; j < fl; j++) {
+		var flag = flags[j];
+		if (app.flags.dimensions.match(flag)) {
+			render = true;
+			ret.dimensions = app.flags.dimensions.output(flag);
+		} else if (app.flags.fluid.match(flag)) {
+			render = true;
+			ret.dimensions = app.flags.fluid.output(flag);
+			ret.fluid = true;
+		} else if (app.flags.textmode.match(flag)) {
+			ret.textmode = app.flags.textmode.output(flag)
+		} else if (app.flags.colors.match(flag)) {
+			ret.theme = app.flags.colors.output(flag);
+		} else if (options.themes[flag]) {
+			//If a theme is specified, it will override custom colors
+			if(options.themes.hasOwnProperty(flag)){
+				ret.theme = extend(options.themes[flag], {});
+			}
+		} else if (app.flags.font.match(flag)) {
+			ret.font = app.flags.font.output(flag);
+		} else if (app.flags.auto.match(flag)) {
+			ret.auto = true;
+		} else if (app.flags.text.match(flag)) {
+			ret.text = app.flags.text.output(flag);
+		}
+	}
+	return render ? ret : false;
+}
+
+for (var flag in app.flags) {
+	if (!app.flags.hasOwnProperty(flag)) continue;
+	app.flags[flag].match = function (val) {
+		return val.match(this.regex)
+	}
+}
+
+app.invisible_error_fn = function(fn){
+	return function(el){
+		if(el.hasAttribute("data-holder-invisible")){
+			throw new Error("Holder: invisible placeholder")
+		}
+	}
+}
+
+app.add_theme = function (name, theme) {
+	name != null && theme != null && (settings.themes[name] = theme);
+	return app;
+};
+
+app.add_image = function (src, el) {
+	var node = selector(el);
+	if (node.length) {
+		for (var i = 0, l = node.length; i < l; i++) {
+			var img = document.createElement("img")
+			img.setAttribute("data-src", src);
+			node[i].appendChild(img);
+		}
+	}
+	return app;
+};
+
+app.run = function (o) {
+	instance_config = extend({}, system_config)
+	preempted = true;
+
+	var options = extend(settings, o),
+		images = [],
+		imageNodes = [],
+		bgnodes = [];
+		
+	if(options.use_canvas != null && options.use_canvas){
+		instance_config.use_canvas = true;
+		instance_config.use_svg = false;
+	}
+		
+	if (typeof (options.images) == "string") {
+		imageNodes = selector(options.images);
+	} else if (window.NodeList && options.images instanceof window.NodeList) {
+		imageNodes = options.images;
+	} else if (window.Node && options.images instanceof window.Node) {
+		imageNodes = [options.images];
+	} else if(window.HTMLCollection && options.images instanceof window.HTMLCollection){
+		imageNodes = options.images
+	}
+
+	if (typeof (options.bgnodes) == "string") {
+		bgnodes = selector(options.bgnodes);
+	} else if (window.NodeList && options.elements instanceof window.NodeList) {
+		bgnodes = options.bgnodes;
+	} else if (window.Node && options.bgnodes instanceof window.Node) {
+		bgnodes = [options.bgnodes];
+	}
+	for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]);
+	var holdercss = document.getElementById("holderjs-style");
+	if (!holdercss) {
+		holdercss = document.createElement("style");
+		holdercss.setAttribute("id", "holderjs-style");
+		holdercss.type = "text/css";
+		document.getElementsByTagName("head")[0].appendChild(holdercss);
+	}
+	if (!options.nocss) {
+		if (holdercss.styleSheet) {
+			holdercss.styleSheet.cssText += options.stylesheet;
+		} else {
+			holdercss.appendChild(document.createTextNode(options.stylesheet));
+		}
+	}
+	var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)");
+	for (var l = bgnodes.length, i = 0; i < l; i++) {
+		var src = window.getComputedStyle(bgnodes[i], null)
+			.getPropertyValue("background-image");
+		var flags = src.match(cssregex);
+		var bgsrc = bgnodes[i].getAttribute("data-background-src");
+		if (flags) {
+			var holder = parse_flags(flags[1].split("/"), options);
+			if (holder) {
+				render("background", bgnodes[i], holder, src);
+			}
+		} else if (bgsrc != null) {
+			var holder = parse_flags(bgsrc.substr(bgsrc.lastIndexOf(options.domain) + options.domain.length + 1)
+				.split("/"), options);
+			if (holder) {
+				render("background", bgnodes[i], holder, src);
+			}
+		}
+	}
+	for (l = images.length, i = 0; i < l; i++) {
+		var attr_data_src, attr_src;
+		attr_src = attr_data_src = src = null;
+		try {
+			attr_src = images[i].getAttribute("src");
+			attr_datasrc = images[i].getAttribute("data-src");
+		} catch (e) {}
+		if (attr_datasrc == null && !! attr_src && attr_src.indexOf(options.domain) >= 0) {
+			src = attr_src;
+		} else if ( !! attr_datasrc && attr_datasrc.indexOf(options.domain) >= 0) {
+			src = attr_datasrc;
+		}
+		if (src) {
+			var holder = parse_flags(src.substr(src.lastIndexOf(options.domain) + options.domain.length + 1).split("/"), options);
+			if (holder) {
+				if (holder.fluid) {
+					render("fluid", images[i], holder, src)
+				} else {
+					render("image", images[i], holder, src);
+				}
+			}
+		}
+	}
+	return app;
+};
+
+contentLoaded(win, function () {
+	if (window.addEventListener) {
+		window.addEventListener("resize", resizable_update, false);
+		window.addEventListener("orientationchange", resizable_update, false);
+	} else {
+		window.attachEvent("onresize", resizable_update)
+	}
+	preempted || app.run({});
+});
+if (typeof define === "function" && define.amd) {
+	define([], function () {
+		return app;
+	});
+}
+
+//github.com/davidchambers/Base64.js
+(function(){function t(t){this.message=t}var e="undefined"!=typeof exports?exports:this,r="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";t.prototype=Error(),t.prototype.name="InvalidCharacterError",e.btoa||(e.btoa=function(e){for(var o,n,a=0,i=r,c="";e.charAt(0|a)||(i="=",a%1);c+=i.charAt(63&o>>8-8*(a%1))){if(n=e.charCodeAt(a+=.75),n>255)throw new t("'btoa' failed");o=o<<8|n}return c}),e.atob||(e.atob=function(e){if(e=e.replace(/=+$/,""),1==e.length%4)throw new t("'atob' failed");for(var o,n,a=0,i=0,c="";n=e.charAt(i++);~n&&(o=a%4?64*o+n:n,a++%4)?c+=String.fromCharCode(255&o>>(6&-2*a)):0)n=r.indexOf(n);return c})})();
+
+//getElementsByClassName polyfill
+document.getElementsByClassName||(document.getElementsByClassName=function(e){var t=document,n,r,i,s=[];if(t.querySelectorAll)return t.querySelectorAll("."+e);if(t.evaluate){r=".//*[contains(concat(' ', @class, ' '), ' "+e+" ')]",n=t.evaluate(r,t,null,0,null);while(i=n.iterateNext())s.push(i)}else{n=t.getElementsByTagName("*"),r=new RegExp("(^|\\s)"+e+"(\\s|$)");for(i=0;i<n.length;i++)r.test(n[i].className)&&s.push(n[i])}return s})
+
+//getComputedStyle polyfill
+window.getComputedStyle||(window.getComputedStyle=function(e){return this.el=e,this.getPropertyValue=function(t){var n=/(\-([a-z]){1})/g;return t=="float"&&(t="styleFloat"),n.test(t)&&(t=t.replace(n,function(){return arguments[2].toUpperCase()})),e.currentStyle[t]?e.currentStyle[t]:null},this})
+
+//http://javascript.nwbox.com/ContentLoaded by Diego Perini with modifications
+function contentLoaded(n,t){var l="complete",s="readystatechange",u=!1,h=u,c=!0,i=n.document,a=i.documentElement,e=i.addEventListener?"addEventListener":"attachEvent",v=i.addEventListener?"removeEventListener":"detachEvent",f=i.addEventListener?"":"on",r=function(e){(e.type!=s||i.readyState==l)&&((e.type=="load"?n:i)[v](f+e.type,r,u),!h&&(h=!0)&&t.call(n,null))},o=function(){try{a.doScroll("left")}catch(n){setTimeout(o,50);return}r("poll")};if(i.readyState==l)t.call(n,"lazy");else{if(i.createEventObject&&a.doScroll){try{c=!n.frameElement}catch(y){}c&&o()}i[e](f+"DOMContentLoaded",r,u),i[e](f+s,r,u),n[e](f+"load",r,u)}}
+
+//https://gist.github.com/991057 by Jed Schmidt with modifications
+function selector(a,b){var a=a.match(/^(\W)?(.*)/),b=b||document,c=b["getElement"+(a[1]?"#"==a[1]?"ById":"sByClassName":"sByTagName")],d=c.call(b,a[2]),e=[];return null!==d&&(e=d.length||0===d.length?d:[d]),e}
+
+//shallow object property extend
+function extend(a,b){
+	var c={};
+	for(var i in a){
+		if(a.hasOwnProperty(i)){
+			c[i]=a[i];
+		}
+	}
+	for(var i in b){
+		if(b.hasOwnProperty(i)){
+			c[i]=b[i];
+		}
+	}
+	return c
+}
+
+//hasOwnProperty polyfill
+if (!Object.prototype.hasOwnProperty)
+    /*jshint -W001, -W103 */
+    Object.prototype.hasOwnProperty = function(prop) {
+		var proto = this.__proto__ || this.constructor.prototype;
+		return (prop in this) && (!(prop in proto) || proto[prop] !== this[prop]);
+	}
+    /*jshint +W001, +W103 */
+
+})(Holder, window);
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.js b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.js
similarity index 58%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.js
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.js
index 784f221caf83c7b22d5af716ffb2af11d7b14d57..6168aacd5ed78801973b1b5fb4e43599096dc258 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.js
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/html5shiv.js
@@ -1,8 +1,8 @@
 /*
- HTML5 Shiv v3.6.2pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+ HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
 */
 (function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
+a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
 c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
-"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
-for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
+"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
+if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.js b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.js
new file mode 100644
index 0000000000000000000000000000000000000000..046e93aa15e754747f529679e8c1567377f1bd6d
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/jquery.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.11.0 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k="".trim,l={},m="1.11.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="<select t=''><option selected=''></option></select>",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=jb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=kb(b);function nb(){}nb.prototype=d.filters=d.pseudos,d.setFilters=new nb;function ob(a,b){var c,e,f,g,h,i,j,k=x[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=Q.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?db.error(a):x(a,i).slice(0)}function pb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f
+}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},W=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a>",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=$.test(e)?this.mouseHooks:Z.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||z),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||z,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==db()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===db()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=z.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===L&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&(a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault())?bb:cb):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:cb,isPropagationStopped:cb,isImmediatePropagationStopped:cb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=bb,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=bb,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submitBubbles||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?b.form:void 0;c&&!n._data(c,"submitBubbles")&&(n.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),n._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.changeBubbles||(n.event.special.change={setup:function(){return Y.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),n.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),n.event.simulate("change",this,a,!0)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;Y.test(b.nodeName)&&!n._data(b,"changeBubbles")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a,!0)}),n._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!Y.test(this.nodeName)}}),l.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=cb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return n().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=n.guid++)),this.each(function(){n.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=cb),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});function eb(a){var b=fb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var fb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gb=/ jQuery\d+="(?:null|\d+)"/g,hb=new RegExp("<(?:"+fb+")[\\s/>]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/<tbody/i,mb=/<|&#?\w+;/,nb=/<(?:script|style|link)/i,ob=/checked\s*(?:[^=]|=\s*.checked.)/i,pb=/^$|\/(?:java|ecma)script/i,qb=/^true\/(.*)/,rb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,sb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1></$2>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?"<table>"!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Db[0].contentWindow||Db[0].contentDocument).document,b.write(),b.close(),c=Fb(a,b),Db.detach()),Eb[a]=c),c}!function(){var a,b,c=z.createElement("div"),d="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],a.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(a.style.opacity),l.cssFloat=!!a.style.cssFloat,c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===c.style.backgroundClip,a=c=null,l.shrinkWrapBlocks=function(){var a,c,e,f;if(null==b){if(a=z.getElementsByTagName("body")[0],!a)return;f="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",c=z.createElement("div"),e=z.createElement("div"),a.appendChild(c).appendChild(e),b=!1,typeof e.style.zoom!==L&&(e.style.cssText=d+";width:1px;padding:1px;zoom:1",e.innerHTML="<div></div>",e.firstChild.style.width="5px",b=3!==e.offsetWidth),a.removeChild(c),a=c=e=null}return b}}();var Hb=/^margin/,Ib=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Jb,Kb,Lb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Jb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),Ib.test(g)&&Hb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):z.documentElement.currentStyle&&(Jb=function(a){return a.currentStyle},Kb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Jb(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Ib.test(g)&&!Lb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Mb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h=z.createElement("div"),i="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",j="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";h.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",b=h.getElementsByTagName("a")[0],b.style.cssText="float:left;opacity:.5",l.opacity=/^0.5/.test(b.style.opacity),l.cssFloat=!!b.style.cssFloat,h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,b=h=null,n.extend(l,{reliableHiddenOffsets:function(){if(null!=c)return c;var a,b,d,e=z.createElement("div"),f=z.getElementsByTagName("body")[0];if(f)return e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=z.createElement("div"),a.style.cssText=i,f.appendChild(a).appendChild(e),e.innerHTML="<table><tr><td></td><td>t</td></tr></table>",b=e.getElementsByTagName("td"),b[0].style.cssText="padding:0;margin:0;border:0;display:none",d=0===b[0].offsetHeight,b[0].style.display="",b[1].style.display="none",c=d&&0===b[0].offsetHeight,f.removeChild(a),e=f=null,c},boxSizing:function(){return null==d&&k(),d},boxSizingReliable:function(){return null==e&&k(),e},pixelPosition:function(){return null==f&&k(),f},reliableMarginRight:function(){var b,c,d,e;if(null==g&&a.getComputedStyle){if(b=z.getElementsByTagName("body")[0],!b)return;c=z.createElement("div"),d=z.createElement("div"),c.style.cssText=i,b.appendChild(c).appendChild(d),e=d.appendChild(z.createElement("div")),e.style.cssText=d.style.cssText=j,e.style.marginRight=e.style.width="0",d.style.width="1px",g=!parseFloat((a.getComputedStyle(e,null)||{}).marginRight),b.removeChild(c)}return g}});function k(){var b,c,h=z.getElementsByTagName("body")[0];h&&(b=z.createElement("div"),c=z.createElement("div"),b.style.cssText=i,h.appendChild(b).appendChild(c),c.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",n.swap(h,null!=h.style.zoom?{zoom:1}:{},function(){d=4===c.offsetWidth}),e=!0,f=!1,g=!0,a.getComputedStyle&&(f="1%"!==(a.getComputedStyle(c,null)||{}).top,e="4px"===(a.getComputedStyle(c,null)||{width:"4px"}).width),h.removeChild(b),c=h=null)}}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Nb=/alpha\([^)]*\)/i,Ob=/opacity\s*=\s*([^)]*)/,Pb=/^(none|table(?!-c[ea]).+)/,Qb=new RegExp("^("+T+")(.*)$","i"),Rb=new RegExp("^([+-])=("+T+")","i"),Sb={position:"absolute",visibility:"hidden",display:"block"},Tb={letterSpacing:0,fontWeight:400},Ub=["Webkit","O","Moz","ms"];function Vb(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Ub.length;while(e--)if(b=Ub[e]+c,b in a)return b;return d}function Wb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=n._data(d,"olddisplay",Gb(d.nodeName)))):f[g]||(e=V(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Xb(a,b,c){var d=Qb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Yb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Zb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Jb(a),g=l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Kb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ib.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Yb(a,b,c||(g?"border":"content"),d,f)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Kb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=Vb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Rb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]="",i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Vb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Kb(a,b,d)),"normal"===f&&b in Tb&&(f=Tb[b]),""===c||c?(e=parseFloat(f),c===!0||n.isNumeric(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?0===a.offsetWidth&&Pb.test(n.css(a,"display"))?n.swap(a,Sb,function(){return Zb(a,b,d)}):Zb(a,b,d):void 0},set:function(a,c,d){var e=d&&Jb(a);return Xb(a,c,d?Yb(a,b,d,l.boxSizing()&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Ob.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Nb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Nb.test(f)?f.replace(Nb,e):f+" "+e)}}),n.cssHooks.marginRight=Mb(l.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},Kb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Hb.test(a)||(n.cssHooks[a+b].set=Xb)}),n.fn.extend({css:function(a,b){return W(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Jb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)
+},a,b,arguments.length>1)},show:function(){return Wb(this,!0)},hide:function(){return Wb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function $b(a,b,c,d,e){return new $b.prototype.init(a,b,c,d,e)}n.Tween=$b,$b.prototype={constructor:$b,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=$b.propHooks[this.prop];return a&&a.get?a.get(this):$b.propHooks._default.get(this)},run:function(a){var b,c=$b.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):$b.propHooks._default.set(this),this}},$b.prototype.init.prototype=$b.prototype,$b.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},$b.propHooks.scrollTop=$b.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=$b.prototype.init,n.fx.step={};var _b,ac,bc=/^(?:toggle|show|hide)$/,cc=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),dc=/queueHooks$/,ec=[jc],fc={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=cc.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&cc.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,n.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function gc(){return setTimeout(function(){_b=void 0}),_b=n.now()}function hc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=U[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function ic(a,b,c){for(var d,e=(fc[b]||[]).concat(fc["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function jc(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&V(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k=Gb(a.nodeName),"none"===j&&(j=k),"inline"===j&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==k?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],bc.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}if(!n.isEmptyObject(o)){r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=ic(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function kc(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function lc(a,b,c){var d,e,f=0,g=ec.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=_b||gc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:_b||gc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(kc(k,j.opts.specialEasing);g>f;f++)if(d=ec[f].call(j,a,k,j.opts))return d;return n.map(k,ic,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(lc,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],fc[c]=fc[c]||[],fc[c].unshift(b)},prefilter:function(a,b){b?ec.unshift(a):ec.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=lc(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&dc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(hc(b,!0),a,d,e)}}),n.each({slideDown:hc("show"),slideUp:hc("hide"),slideToggle:hc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(_b=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),_b=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ac||(ac=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(ac),ac=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e=z.createElement("div");e.setAttribute("className","t"),e.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=e.getElementsByTagName("a")[0],c=z.createElement("select"),d=c.appendChild(z.createElement("option")),b=e.getElementsByTagName("input")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==e.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=d.selected,l.enctype=!!z.createElement("form").enctype,c.disabled=!0,l.optDisabled=!d.disabled,b=z.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value,a=b=c=d=e=null}();var mc=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(mc,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.text(a)}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(l.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var nc,oc,pc=n.expr.attrHandle,qc=/^(?:checked|selected)$/i,rc=l.getSetAttribute,sc=l.input;n.fn.extend({attr:function(a,b){return W(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===L?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?oc:nc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(F);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?sc&&rc||!qc.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(rc?c:d)},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),oc={set:function(a,b,c){return b===!1?n.removeAttr(a,c):sc&&rc||!qc.test(c)?a.setAttribute(!rc&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=pc[b]||n.find.attr;pc[b]=sc&&rc||!qc.test(b)?function(a,b,d){var e,f;return d||(f=pc[b],pc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,pc[b]=f),e}:function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),sc&&rc||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):nc&&nc.set(a,b,c)}}),rc||(nc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},pc.id=pc.name=pc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:nc.set},n.attrHooks.contenteditable={set:function(a,b,c){nc.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var tc=/^(?:input|select|textarea|button|object)$/i,uc=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return W(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):tc.test(a.nodeName)||uc.test(a.nodeName)&&a.href?0:-1}}}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var vc=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(F)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(vc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(F)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===L||"boolean"===c)&&(this.className&&n._data(this,"__className__",this.className),this.className=this.className||a===!1?"":n._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(vc," ").indexOf(b)>=0)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var wc=n.now(),xc=/\?/,yc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(yc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var zc,Ac,Bc=/#.*$/,Cc=/([?&])_=[^&]*/,Dc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Ec=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Fc=/^(?:GET|HEAD)$/,Gc=/^\/\//,Hc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ic={},Jc={},Kc="*/".concat("*");try{Ac=location.href}catch(Lc){Ac=z.createElement("a"),Ac.href="",Ac=Ac.href}zc=Hc.exec(Ac.toLowerCase())||[];function Mc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(F)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nc(a,b,c,d){var e={},f=a===Jc;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Oc(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Pc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Qc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ac,type:"GET",isLocal:Ec.test(zc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Oc(Oc(a,n.ajaxSettings),b):Oc(n.ajaxSettings,a)},ajaxPrefilter:Mc(Ic),ajaxTransport:Mc(Jc),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Dc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||Ac)+"").replace(Bc,"").replace(Gc,zc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(F)||[""],null==k.crossDomain&&(c=Hc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===zc[1]&&c[2]===zc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(zc[3]||("http:"===zc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),Nc(Ic,k,b,v),2===t)return v;h=k.global,h&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Fc.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(xc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Cc.test(e)?e.replace(Cc,"$1_="+wc++):e+(xc.test(e)?"&":"?")+"_="+wc++)),k.ifModified&&(n.lastModified[e]&&v.setRequestHeader("If-Modified-Since",n.lastModified[e]),n.etag[e]&&v.setRequestHeader("If-None-Match",n.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Kc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Nc(Jc,k,b,v)){v.readyState=1,h&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Pc(k,v,c)),u=Qc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(n.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!l.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||n.css(a,"display"))},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var Rc=/%20/g,Sc=/\[\]$/,Tc=/\r?\n/g,Uc=/^(?:submit|button|image|reset|file)$/i,Vc=/^(?:input|select|textarea|keygen)/i;function Wc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Sc.test(a)?d(a,e):Wc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Wc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Wc(c,a[c],b,e);return d.join("&").replace(Rc,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Vc.test(this.nodeName)&&!Uc.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Tc,"\r\n")}}):{name:b.name,value:c.replace(Tc,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&$c()||_c()}:$c;var Xc=0,Yc={},Zc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Yc)Yc[a](void 0,!0)}),l.cors=!!Zc&&"withCredentials"in Zc,Zc=l.ajax=!!Zc,Zc&&n.ajaxTransport(function(a){if(!a.crossDomain||l.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Xc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Yc[g],b=void 0,f.onreadystatechange=n.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Yc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function $c(){try{return new a.XMLHttpRequest}catch(b){}}function _c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=z.head||n("head")[0]||z.documentElement;return{send:function(d,e){b=z.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var ad=[],bd=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=ad.pop()||n.expando+"_"+wc++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(bd.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&bd.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(bd,"$1"+e):b.jsonp!==!1&&(b.url+=(xc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,ad.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||z;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var cd=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&cd)return cd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=a.slice(h,a.length),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&n.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var dd=a.document.documentElement;function ed(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?(typeof e.getBoundingClientRect!==L&&(d=e.getBoundingClientRect()),c=ed(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||dd;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||dd})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return W(this,function(a,d,e){var f=ed(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Mb(l.pixelPosition,function(a,c){return c?(c=Kb(a,b),Ib.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return W(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var fd=a.jQuery,gd=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=gd),b&&a.jQuery===n&&(a.jQuery=fd),n},typeof b===L&&(a.jQuery=a.$=n),n});
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..bddd4aef59dea6200ce2e2c43a9ef03d0495e059
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js
@@ -0,0 +1,6 @@
+(function(){function t(e,t){return(new Date(t,e+1,0)).getDate()}function n(e,t,n){return function(r,i,s){var o=e(r),u=[];o<r&&t(o);if(s>1)while(o<i){var a=new Date(+o);n(a)%s===0&&u.push(a),t(o)}else while(o<i)u.push(new Date(+o)),t(o);return u}}var e=window.nv||{};e.version="1.1.15b",e.dev=!0,window.nv=e,e.tooltip=e.tooltip||{},e.utils=e.utils||{},e.models=e.models||{},e.charts={},e.graphs=[],e.logs={},e.dispatch=d3.dispatch("render_start","render_end"),e.dev&&(e.dispatch.on("render_start",function(t){e.logs.startTime=+(new Date)}),e.dispatch.on("render_end",function(t){e.logs.endTime=+(new Date),e.logs.totalTime=e.logs.endTime-e.logs.startTime,e.log("total",e.logs.totalTime)})),e.log=function(){if(e.dev&&console.log&&console.log.apply)console.log.apply(console,arguments);else if(e.dev&&typeof console.log=="function"&&Function.prototype.bind){var t=Function.prototype.bind.call(console.log,console);t.apply(console,arguments)}return arguments[arguments.length-1]},e.render=function(n){n=n||1,e.render.active=!0,e.dispatch.render_start(),setTimeout(function(){var t,r;for(var i=0;i<n&&(r=e.render.queue[i]);i++)t=r.generate(),typeof r.callback==typeof Function&&r.callback(t),e.graphs.push(t);e.render.queue.splice(0,i),e.render.queue.length?setTimeout(arguments.callee,0):(e.dispatch.render_end(),e.render.active=!1)},0)},e.render.active=!1,e.render.queue=[],e.addGraph=function(t){typeof arguments[0]==typeof Function&&(t={generate:arguments[0],callback:arguments[1]}),e.render.queue.push(t),e.render.active||e.render()},e.identity=function(e){return e},e.strip=function(e){return e.replace(/(\s|&)/g,"")},d3.time.monthEnd=function(e){return new Date(e.getFullYear(),e.getMonth(),0)},d3.time.monthEnds=n(d3.time.monthEnd,function(e){e.setUTCDate(e.getUTCDate()+1),e.setDate(t(e.getMonth()+1,e.getFullYear()))},function(e){return e.getMonth()}),e.interactiveGuideline=function(){"use strict";function c(o){o.each(function(o){function g(){var e=d3.mouse(this),n=e[0],r=e[1],o=!0,a=!1;l&&(n=d3.event.offsetX,r=d3.event.offsetY,d3.event.target.tagName!=="svg"&&(o=!1),d3.event.target.className.baseVal.match("nv-legend")&&(a=!0)),o&&(n-=i.left,r-=i.top);if(n<0||r<0||n>p||r>d||d3.event.relatedTarget&&d3.event.relatedTarget.ownerSVGElement===undefined||a){if(l&&d3.event.relatedTarget&&d3.event.relatedTarget.ownerSVGElement===undefined&&d3.event.relatedTarget.className.match(t.nvPointerEventsClass))return;u.elementMouseout({mouseX:n,mouseY:r}),c.renderGuideLine(null);return}var f=s.invert(n);u.elementMousemove({mouseX:n,mouseY:r,pointXValue:f}),d3.event.type==="dblclick"&&u.elementDblclick({mouseX:n,mouseY:r,pointXValue:f})}var h=d3.select(this),p=n||960,d=r||400,v=h.selectAll("g.nv-wrap.nv-interactiveLineLayer").data([o]),m=v.enter().append("g").attr("class"," nv-wrap nv-interactiveLineLayer");m.append("g").attr("class","nv-interactiveGuideLine");if(!f)return;f.on("mousemove",g,!0).on("mouseout",g,!0).on("dblclick",g),c.renderGuideLine=function(t){if(!a)return;var n=v.select(".nv-interactiveGuideLine").selectAll("line").data(t!=null?[e.utils.NaNtoZero(t)]:[],String);n.enter().append("line").attr("class","nv-guideline").attr("x1",function(e){return e}).attr("x2",function(e){return e}).attr("y1",d).attr("y2",0),n.exit().remove()}})}var t=e.models.tooltip(),n=null,r=null,i={left:0,top:0},s=d3.scale.linear(),o=d3.scale.linear(),u=d3.dispatch("elementMousemove","elementMouseout","elementDblclick"),a=!0,f=null,l=navigator.userAgent.indexOf("MSIE")!==-1;return c.dispatch=u,c.tooltip=t,c.margin=function(e){return arguments.length?(i.top=typeof e.top!="undefined"?e.top:i.top,i.left=typeof e.left!="undefined"?e.left:i.left,c):i},c.width=function(e){return arguments.length?(n=e,c):n},c.height=function(e){return arguments.length?(r=e,c):r},c.xScale=function(e){return arguments.length?(s=e,c):s},c.showGuideLine=function(e){return arguments.length?(a=e,c):a},c.svgContainer=function(e){return arguments.length?(f=e,c):f},c},e.interactiveBisect=function(e,t,n){"use strict";if(!e instanceof Array)return null;typeof n!="function"&&(n=function(e,t){return e.x});var r=d3.bisector(n).left,i=d3.max([0,r(e,t)-1]),s=n(e[i],i);typeof s=="undefined"&&(s=i);if(s===t)return i;var o=d3.min([i+1,e.length-1]),u=n(e[o],o);return typeof u=="undefined"&&(u=o),Math.abs(u-t)>=Math.abs(s-t)?i:o},e.nearestValueIndex=function(e,t,n){"use strict";var r=Infinity,i=null;return e.forEach(function(e,s){var o=Math.abs(t-e);o<=r&&o<n&&(r=o,i=s)}),i},function(){"use strict";window.nv.tooltip={},window.nv.models.tooltip=function(){function y(){if(a){var e=d3.select(a);e.node().tagName!=="svg"&&(e=e.select("svg"));var t=e.node()?e.attr("viewBox"):null;if(t){t=t.split(" ");var n=parseInt(e.style("width"))/t[2];l.left=l.left*n,l.top=l.top*n}}}function b(e){var t;a?t=d3.select(a):t=d3.select("body");var n=t.select(".nvtooltip");return n.node()===null&&(n=t.append("div").attr("class","nvtooltip "+(u?u:"xy-tooltip")).attr("id",h)),n.node().innerHTML=e,n.style("top",0).style("left",0).style("opacity",0),n.selectAll("div, table, td, tr").classed(p,!0),n.classed(p,!0),n.node()}function w(){if(!c)return;if(!g(n))return;y();var t=l.left,u=o!=null?o:l.top,h=b(m(n));f=h;if(a){var p=a.getElementsByTagName("svg")[0],d=p?p.getBoundingClientRect():a.getBoundingClientRect(),v={left:0,top:0};if(p){var E=p.getBoundingClientRect(),S=a.getBoundingClientRect(),x=E.top;if(x<0){var T=a.getBoundingClientRect();x=Math.abs(x)>T.height?0:x}v.top=Math.abs(x-S.top),v.left=Math.abs(E.left-S.left)}t+=a.offsetLeft+v.left-2*a.scrollLeft,u+=a.offsetTop+v.top-2*a.scrollTop}return s&&s>0&&(u=Math.floor(u/s)*s),e.tooltip.calcTooltipPosition([t,u],r,i,h),w}var t=null,n=null,r="w",i=50,s=25,o=null,u=null,a=null,f=null,l={left:null,top:null},c=!0,h="nvtooltip-"+Math.floor(Math.random()*1e5),p="nv-pointer-events-none",d=function(e,t){return e},v=function(e){return e},m=function(e){if(t!=null)return t;if(e==null)return"";var n=d3.select(document.createElement("table")),r=n.selectAll("thead").data([e]).enter().append("thead");r.append("tr").append("td").attr("colspan",3).append("strong").classed("x-value",!0).html(v(e.value));var i=n.selectAll("tbody").data([e]).enter().append("tbody"),s=i.selectAll("tr").data(function(e){return e.series}).enter().append("tr").classed("highlight",function(e){return e.highlight});s.append("td").classed("legend-color-guide",!0).append("div").style("background-color",function(e){return e.color}),s.append("td").classed("key",!0).html(function(e){return e.key}),s.append("td").classed("value",!0).html(function(e,t){return d(e.value,t)}),s.selectAll("td").each(function(e){if(e.highlight){var t=d3.scale.linear().domain([0,1]).range(["#fff",e.color]),n=.6;d3.select(this).style("border-bottom-color",t(n)).style("border-top-color",t(n))}});var o=n.node().outerHTML;return e.footer!==undefined&&(o+="<div class='footer'>"+e.footer+"</div>"),o},g=function(e){return e&&e.series&&e.series.length>0?!0:!1};return w.nvPointerEventsClass=p,w.content=function(e){return arguments.length?(t=e,w):t},w.tooltipElem=function(){return f},w.contentGenerator=function(e){return arguments.length?(typeof e=="function"&&(m=e),w):m},w.data=function(e){return arguments.length?(n=e,w):n},w.gravity=function(e){return arguments.length?(r=e,w):r},w.distance=function(e){return arguments.length?(i=e,w):i},w.snapDistance=function(e){return arguments.length?(s=e,w):s},w.classes=function(e){return arguments.length?(u=e,w):u},w.chartContainer=function(e){return arguments.length?(a=e,w):a},w.position=function(e){return arguments.length?(l.left=typeof e.left!="undefined"?e.left:l.left,l.top=typeof e.top!="undefined"?e.top:l.top,w):l},w.fixedTop=function(e){return arguments.length?(o=e,w):o},w.enabled=function(e){return arguments.length?(c=e,w):c},w.valueFormatter=function(e){return arguments.length?(typeof e=="function"&&(d=e),w):d},w.headerFormatter=function(e){return arguments.length?(typeof e=="function"&&(v=e),w):v},w.id=function(){return h},w},e.tooltip.show=function(t,n,r,i,s,o){var u=document.createElement("div");u.className="nvtooltip "+(o?o:"xy-tooltip");var a=s;if(!s||s.tagName.match(/g|svg/i))a=document.getElementsByTagName("body")[0];u.style.left=0,u.style.top=0,u.style.opacity=0,u.innerHTML=n,a.appendChild(u),s&&(t[0]=t[0]-s.scrollLeft,t[1]=t[1]-s.scrollTop),e.tooltip.calcTooltipPosition(t,r,i,u)},e.tooltip.findFirstNonSVGParent=function(e){while(e.tagName.match(/^g|svg$/i)!==null)e=e.parentNode;return e},e.tooltip.findTotalOffsetTop=function(e,t){var n=t;do isNaN(e.offsetTop)||(n+=e.offsetTop);while(e=e.offsetParent);return n},e.tooltip.findTotalOffsetLeft=function(e,t){var n=t;do isNaN(e.offsetLeft)||(n+=e.offsetLeft);while(e=e.offsetParent);return n},e.tooltip.calcTooltipPosition=function(t,n,r,i){var s=parseInt(i.offsetHeight),o=parseInt(i.offsetWidth),u=e.utils.windowSize().width,a=e.utils.windowSize().height,f=window.pageYOffset,l=window.pageXOffset,c,h;a=window.innerWidth>=document.body.scrollWidth?a:a-16,u=window.innerHeight>=document.body.scrollHeight?u:u-16,n=n||"s",r=r||20;var p=function(t){return e.tooltip.findTotalOffsetTop(t,h)},d=function(t){return e.tooltip.findTotalOffsetLeft(t,c)};switch(n){case"e":c=t[0]-o-r,h=t[1]-s/2;var v=d(i),m=p(i);v<l&&(c=t[0]+r>l?t[0]+r:l-v+c),m<f&&(h=f-m+h),m+s>f+a&&(h=f+a-m+h-s);break;case"w":c=t[0]+r,h=t[1]-s/2;var v=d(i),m=p(i);v+o>u&&(c=t[0]-o-r),m<f&&(h=f+5),m+s>f+a&&(h=f+a-m+h-s);break;case"n":c=t[0]-o/2-5,h=t[1]+r;var v=d(i),m=p(i);v<l&&(c=l+5),v+o>u&&(c=c-o/2+5),m+s>f+a&&(h=f+a-m+h-s);break;case"s":c=t[0]-o/2,h=t[1]-s-r;var v=d(i),m=p(i);v<l&&(c=l+5),v+o>u&&(c=c-o/2+5),f>m&&(h=f);break;case"none":c=t[0],h=t[1]-r;var v=d(i),m=p(i)}return i.style.left=c+"px",i.style.top=h+"px",i.style.opacity=1,i.style.position="absolute",i},e.tooltip.cleanup=function(){var e=document.getElementsByClassName("nvtooltip"),t=[];while(e.length)t.push(e[0]),e[0].style.transitionDelay="0 !important",e[0].style.opacity=0,e[0].className="nvtooltip-pending-removal";setTimeout(function(){while(t.length){var e=t.pop();e.parentNode.removeChild(e)}},500)}}(),e.utils.windowSize=function(){var e={width:640,height:480};return document.body&&document.body.offsetWidth&&(e.width=document.body.offsetWidth,e.height=document.body.offsetHeight),document.compatMode=="CSS1Compat"&&document.documentElement&&document.documentElement.offsetWidth&&(e.width=document.documentElement.offsetWidth,e.height=document.documentElement.offsetHeight),window.innerWidth&&window.innerHeight&&(e.width=window.innerWidth,e.height=window.innerHeight),e},e.utils.windowResize=function(e){if(e===undefined)return;var t=window.onresize;window.onresize=function(n){typeof t=="function"&&t(n),e(n)}},e.utils.getColor=function(t){return arguments.length?Object.prototype.toString.call(t)==="[object Array]"?function(e,n){return e.color||t[n%t.length]}:t:e.utils.defaultColor()},e.utils.defaultColor=function(){var e=d3.scale.category20().range();return function(t,n){return t.color||e[n%e.length]}},e.utils.customTheme=function(e,t,n){t=t||function(e){return e.key},n=n||d3.scale.category20().range();var r=n.length;return function(i,s){var o=t(i);return r||(r=n.length),typeof e[o]!="undefined"?typeof e[o]=="function"?e[o]():e[o]:n[--r]}},e.utils.pjax=function(t,n){function r(r){d3.html(r,function(r){var i=d3.select(n).node();i.parentNode.replaceChild(d3.select(r).select(n).node(),i),e.utils.pjax(t,n)})}d3.selectAll(t).on("click",function(){history.pushState(this.href,this.textContent,this.href),r(this.href),d3.event.preventDefault()}),d3.select(window).on("popstate",function(){d3.event.state&&r(d3.event.state)})},e.utils.calcApproxTextWidth=function(e){if(typeof e.style=="function"&&typeof e.text=="function"){var t=parseInt(e.style("font-size").replace("px","")),n=e.text().length;return n*t*.5}return 0},e.utils.NaNtoZero=function(e){return typeof e!="number"||isNaN(e)||e===null||e===Infinity?0:e},e.utils.optionsFunc=function(e){return e&&d3.map(e).forEach(function(e,t){typeof this[e]=="function"&&this[e](t)}.bind(this)),this},e.models.axis=function(){"use strict";function m(e){return e.each(function(e){var i=d3.select(this),m=i.selectAll("g.nv-wrap.nv-axis").data([e]),g=m.enter().append("g").attr("class","nvd3 nv-wrap nv-axis"),y=g.append("g"),b=m.select("g");p!==null?t.ticks(p):(t.orient()=="top"||t.orient()=="bottom")&&t.ticks(Math.abs(s.range()[1]-s.range()[0])/100),b.transition().call(t),v=v||t.scale();var w=t.tickFormat();w==null&&(w=v.tickFormat());var E=b.selectAll("text.nv-axislabel").data([o||null]);E.exit().remove();switch(t.orient()){case"top":E.enter().append("text").attr("class","nv-axislabel");var S=s.range().length==2?s.range()[1]:s.range()[s.range().length-1]+(s.range()[1]-s.range()[0]);E.attr("text-anchor","middle").attr("y",0).attr("x",S/2);if(u){var x=m.selectAll("g.nv-axisMaxMin").data(s.domain());x.enter().append("g").attr("class","nv-axisMaxMin").append("text"),x.exit().remove(),x.attr("transform",function(e,t){return"translate("+s(e)+",0)"}).select("text").attr("dy","-0.5em").attr("y",-t.tickPadding()).attr("text-anchor","middle").text(function(e,t){var n=w(e);return(""+n).match("NaN")?"":n}),x.transition().attr("transform",function(e,t){return"translate("+s.range()[t]+",0)"})}break;case"bottom":var T=36,N=30,C=b.selectAll("g").select("text");if(f%360){C.each(function(e,t){var n=this.getBBox().width;n>N&&(N=n)});var k=Math.abs(Math.sin(f*Math.PI/180)),T=(k?k*N:N)+30;C.attr("transform",function(e,t,n){return"rotate("+f+" 0,0)"}).style("text-anchor",f%360>0?"start":"end")}E.enter().append("text").attr("class","nv-axislabel");var S=s.range().length==2?s.range()[1]:s.range()[s.range().length-1]+(s.range()[1]-s.range()[0]);E.attr("text-anchor","middle").attr("y",T).attr("x",S/2);if(u){var x=m.selectAll("g.nv-axisMaxMin").data([s.domain()[0],s.domain()[s.domain().length-1]]);x.enter().append("g").attr("class","nv-axisMaxMin").append("text"),x.exit().remove(),x.attr("transform",function(e,t){return"translate("+(s(e)+(h?s.rangeBand()/2:0))+",0)"}).select("text").attr("dy",".71em").attr("y",t.tickPadding()).attr("transform",function(e,t,n){return"rotate("+f+" 0,0)"}).style("text-anchor",f?f%360>0?"start":"end":"middle").text(function(e,t){var n=w(e);return(""+n).match("NaN")?"":n}),x.transition().attr("transform",function(e,t){return"translate("+(s(e)+(h?s.rangeBand()/2:0))+",0)"})}c&&C.attr("transform",function(e,t){return"translate(0,"+(t%2==0?"0":"12")+")"});break;case"right":E.enter().append("text").attr("class","nv-axislabel"),E.style("text-anchor",l?"middle":"begin").attr("transform",l?"rotate(90)":"").attr("y",l?-Math.max(n.right,r)+12:-10).attr("x",l?s.range()[0]/2:t.tickPadding());if(u){var x=m.selectAll("g.nv-axisMaxMin").data(s.domain());x.enter().append("g").attr("class","nv-axisMaxMin").append("text").style("opacity",0),x.exit().remove(),x.attr("transform",function(e,t){return"translate(0,"+s(e)+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",t.tickPadding()).style("text-anchor","start").text(function(e,t){var n=w(e);return(""+n).match("NaN")?"":n}),x.transition().attr("transform",function(e,t){return"translate(0,"+s.range()[t]+")"}).select("text").style("opacity",1)}break;case"left":E.enter().append("text").attr("class","nv-axislabel"),E.style("text-anchor",l?"middle":"end").attr("transform",l?"rotate(-90)":"").attr("y",l?-Math.max(n.left,r)+d:-10).attr("x",l?-s.range()[0]/2:-t.tickPadding());if(u){var x=m.selectAll("g.nv-axisMaxMin").data(s.domain());x.enter().append("g").attr("class","nv-axisMaxMin").append("text").style("opacity",0),x.exit().remove(),x.attr("transform",function(e,t){return"translate(0,"+v(e)+")"}).select("text").attr("dy",".32em").attr("y",0).attr("x",-t.tickPadding()).attr("text-anchor","end").text(function(e,t){var n=w(e);return(""+n).match("NaN")?"":n}),x.transition().attr("transform",function(e,t){return"translate(0,"+s.range()[t]+")"}).select("text").style("opacity",1)}}E.text(function(e){return e}),u&&(t.orient()==="left"||t.orient()==="right")&&(b.selectAll("g").each(function(e,t){d3.select(this).select("text").attr("opacity",1);if(s(e)<s.range()[1]+10||s(e)>s.range()[0]-10)(e>1e-10||e<-1e-10)&&d3.select(this).attr("opacity",0),d3.select(this).select("text").attr("opacity",0)}),s.domain()[0]==s.domain()[1]&&s.domain()[0]==0&&m.selectAll("g.nv-axisMaxMin").style("opacity",function(e,t){return t?0:1}));if(u&&(t.orient()==="top"||t.orient()==="bottom")){var L=[];m.selectAll("g.nv-axisMaxMin").each(function(e,t){try{t?L.push(s(e)-this.getBBox().width-4):L.push(s(e)+this.getBBox().width+4)}catch(n){t?L.push(s(e)-4):L.push(s(e)+4)}}),b.selectAll("g").each(function(e,t){if(s(e)<L[0]||s(e)>L[1])e>1e-10||e<-1e-10?d3.select(this).remove():d3.select(this).select("text").remove()})}a&&b.selectAll(".tick").filter(function(e){return!parseFloat(Math.round(e.__data__*1e5)/1e6)&&e.__data__!==undefined}).classed("zero",!0),v=s.copy()}),m}var t=d3.svg.axis(),n={top:0,right:0,bottom:0,left:0},r=75,i=60,s=d3.scale.linear(),o=null,u=!0,a=!0,f=0,l=!0,c=!1,h=!1,p=null,d=12;t.scale(s).orient("bottom").tickFormat(function(e){return e});var v;return m.axis=t,d3.rebind(m,t,"orient","tickValues","tickSubdivide","tickSize","tickPadding","tickFormat"),d3.rebind(m,s,"domain","range","rangeBand","rangeBands"),m.options=e.utils.optionsFunc.bind(m),m.margin=function(e){return arguments.length?(n.top=typeof e.top!="undefined"?e.top:n.top,n.right=typeof e.right!="undefined"?e.right:n.right,n.bottom=typeof e.bottom!="undefined"?e.bottom:n.bottom,n.left=typeof e.left!="undefined"?e.left:n.left,m):n},m.width=function(e){return arguments.length?(r=e,m):r},m.ticks=function(e){return arguments.length?(p=e,m):p},m.height=function(e){return arguments.length?(i=e,m):i},m.axisLabel=function(e){return arguments.length?(o=e,m):o},m.showMaxMin=function(e){return arguments.length?(u=e,m):u},m.highlightZero=function(e){return arguments.length?(a=e,m):a},m.scale=function(e){return arguments.length?(s=e,t.scale(s),h=typeof s.rangeBands=="function",d3.rebind(m,s,"domain","range","rangeBand","rangeBands"),m):s},m.rotateYLabel=function(e){return arguments.length?(l=e,m):l},m.rotateLabels=function(e){return arguments.length?(f=e,m):f},m.staggerLabels=function(e){return arguments.length?(c=e,m):c},m.axisLabelDistance=function(e){return arguments.length?(d=e,m):d},m},e.models.bullet=function(){"use strict";function m(e){return e.each(function(e,n){var p=c-t.left-t.right,m=h-t.top-t.bottom,g=d3.select(this),y=i.call(this,e,n).slice().sort(d3.descending),b=s.call(this,e,n).slice().sort(d3.descending),w=o.call(this,e,n).slice().sort(d3.descending),E=u.call(this,e,n).slice(),S=a.call(this,e,n).slice(),x=f.call(this,e,n).slice(),T=d3.scale.linear().domain(d3.extent(d3.merge([l,y]))).range(r?[p,0]:[0,p]),N=this.__chart__||d3.scale.linear().domain([0,Infinity]).range(T.range());this.__chart__=T;var C=d3.min(y),k=d3.max(y),L=y[1],A=g.selectAll("g.nv-wrap.nv-bullet").data([e]),O=A.enter().append("g").attr("class","nvd3 nv-wrap nv-bullet"),M=O.append("g"),_=A.select("g");M.append("rect").attr("class","nv-range nv-rangeMax"),M.append("rect").attr("class","nv-range nv-rangeAvg"),M.append("rect").attr("class","nv-range nv-rangeMin"),M.append("rect").attr("class","nv-measure"),M.append("path").attr("class","nv-markerTriangle"),A.attr("transform","translate("+t.left+","+t.top+")");var D=function(e){return Math.abs(N(e)-N(0))},P=function(e){return Math.abs(T(e)-T(0))},H=function(e){return e<0?N(e):N(0)},B=function(e){return e<0?T(e):T(0)};_.select("rect.nv-rangeMax").attr("height",m).attr("width",P(k>0?k:C)).attr("x",B(k>0?k:C)).datum(k>0?k:C),_.select("rect.nv-rangeAvg").attr("height",m).attr("width",P(L)).attr("x",B(L)).datum(L),_.select("rect.nv-rangeMin").attr("height",m).attr("width",P(k)).attr("x",B(k)).attr("width",P(k>0?C:k)).attr("x",B(k>0?C:k)).datum(k>0?C:k),_.select("rect.nv-measure").style("fill",d).attr("height",m/3).attr("y",m/3).attr("width",w<0?T(0)-T(w[0]):T(w[0])-T(0)).attr("x",B(w)).on("mouseover",function(){v.elementMouseover({value:w[0],label:x[0]||"Current",pos:[T(w[0]),m/2]})}).on("mouseout",function(){v.elementMouseout({value:w[0],label:x[0]||"Current"})});var j=m/6;b[0]?_.selectAll("path.nv-markerTriangle").attr("transform",function(e){return"translate("+T(b[0])+","+m/2+")"}).attr("d","M0,"+j+"L"+j+","+ -j+" "+ -j+","+ -j+"Z").on("mouseover",function(){v.elementMouseover({value:b[0],label:S[0]||"Previous",pos:[T(b[0]),m/2]})}).on("mouseout",function(){v.elementMouseout({value:b[0],label:S[0]||"Previous"})}):_.selectAll("path.nv-markerTriangle").remove(),A.selectAll(".nv-range").on("mouseover",function(e,t){var n=E[t]||(t?t==1?"Mean":"Minimum":"Maximum");v.elementMouseover({value:e,label:n,pos:[T(e),m/2]})}).on("mouseout",function(e,t){var n=E[t]||(t?t==1?"Mean":"Minimum":"Maximum");v.elementMouseout({value:e,label:n})})}),m}var t={top:0,right:0,bottom:0,left:0},n="left",r=!1,i=function(e){return e.ranges},s=function(e){return e.markers},o=function(e){return e.measures},u=function(e){return e.rangeLabels?e.rangeLabels:[]},a=function(e){return e.markerLabels?e.markerLabels:[]},f=function(e){return e.measureLabels?e.measureLabels:[]},l=[0],c=380,h=30,p=null,d=e.utils.getColor(["#1f77b4"]),v=d3.dispatch("elementMouseover","elementMouseout");return m.dispatch=v,m.options=e.utils.optionsFunc.bind(m),m.orient=function(e){return arguments.length?(n=e,r=n=="right"||n=="bottom",m):n},m.ranges=function(e){return arguments.length?(i=e,m):i},m.markers=function(e){return arguments.length?(s=e,m):s},m.measures=function(e){return arguments.length?(o=e,m):o},m.forceX=function(e){return arguments.length?(l=e,m):l},m.width=function(e){return arguments.length?(c=e,m):c},m.height=function(e){return arguments.length?(h=e,m):h},m.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,m):t},m.tickFormat=function(e){return arguments.length?(p=e,m):p},m.color=function(t){return arguments.length?(d=e.utils.getColor(t),m):d},m},e.models.bulletChart=function(){"use strict";function m(e){return e.each(function(n,h){var g=d3.select(this),y=(a||parseInt(g.style("width"))||960)-i.left-i.right,b=f-i.top-i.bottom,w=this;m.update=function(){m(e)},m.container=this;if(!n||!s.call(this,n,h)){var E=g.selectAll(".nv-noData").data([p]);return E.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),E.attr("x",i.left+y/2).attr("y",18+i.top+b/2).text(function(e){return e}),m}g.selectAll(".nv-noData").remove();var S=s.call(this,n,h).slice().sort(d3.descending),x=o.call(this,n,h).slice().sort(d3.descending),T=u.call(this,n,h).slice().sort(d3.descending),N=g.selectAll("g.nv-wrap.nv-bulletChart").data([n]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-bulletChart"),k=C.append("g"),L=N.select("g");k.append("g").attr("class","nv-bulletWrap"),k.append("g").attr("class","nv-titles"),N.attr("transform","translate("+i.left+","+i.top+")");var A=d3.scale.linear().domain([0,Math.max(S[0],x[0],T[0])]).range(r?[y,0]:[0,y]),O=this.__chart__||d3.scale.linear().domain([0,Infinity]).range(A.range());this.__chart__=A;var M=function(e){return Math.abs(O(e)-O(0))},_=function(e){return Math.abs(A(e)-A(0))},D=k.select(".nv-titles").append("g").attr("text-anchor","end").attr("transform","translate(-6,"+(f-i.top-i.bottom)/2+")");D.append("text").attr("class","nv-title").text(function(e){return e.title}),D.append("text").attr("class","nv-subtitle").attr("dy","1em").text(function(e){return e.subtitle}),t.width(y).height(b);var P=L.select(".nv-bulletWrap");d3.transition(P).call(t);var H=l||A.tickFormat(y/100),B=L.selectAll("g.nv-tick").data(A.ticks(y/50),function(e){return this.textContent||H(e)}),j=B.enter().append("g").attr("class","nv-tick").attr("transform",function(e){return"translate("+O(e)+",0)"}).style("opacity",1e-6);j.append("line").attr("y1",b).attr("y2",b*7/6),j.append("text").attr("text-anchor","middle").attr("dy","1em").attr("y",b*7/6).text(H);var F=d3.transition(B).attr("transform",function(e){return"translate("+A(e)+",0)"}).style("opacity",1);F.select("line").attr("y1",b).attr("y2",b*7/6),F.select("text").attr("y",b*7/6),d3.transition(B.exit()).attr("transform",function(e){return"translate("+A(e)+",0)"}).style("opacity",1e-6).remove(),d.on("tooltipShow",function(e){e.key=n.title,c&&v(e,w.parentNode)})}),d3.timer.flush(),m}var t=e.models.bullet(),n="left",r=!1,i={top:5,right:40,bottom:20,left:120},s=function(e){return e.ranges},o=function(e){return e.markers},u=function(e){return e.measures},a=null,f=55,l=null,c=!0,h=function(e,t,n,r,i){return"<h3>"+t+"</h3>"+"<p>"+n+"</p>"},p="No Data Available.",d=d3.dispatch("tooltipShow","tooltipHide"),v=function(t,n){var r=t.pos[0]+(n.offsetLeft||0)+i.left,s=t.pos[1]+(n.offsetTop||0)+i.top,o=h(t.key,t.label,t.value,t,m);e.tooltip.show([r,s],o,t.value<0?"e":"w",null,n)};return t.dispatch.on("elementMouseover.tooltip",function(e){d.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){d.tooltipHide(e)}),d.on("tooltipHide",function(){c&&e.tooltip.cleanup()}),m.dispatch=d,m.bullet=t,d3.rebind(m,t,"color"),m.options=e.utils.optionsFunc.bind(m),m.orient=function(e){return arguments.length?(n=e,r=n=="right"||n=="bottom",m):n},m.ranges=function(e){return arguments.length?(s=e,m):s},m.markers=function(e){return arguments.length?(o=e,m):o},m.measures=function(e){return arguments.length?(u=e,m):u},m.width=function(e){return arguments.length?(a=e,m):a},m.height=function(e){return arguments.length?(f=e,m):f},m.margin=function(e){return arguments.length?(i.top=typeof e.top!="undefined"?e.top:i.top,i.right=typeof e.right!="undefined"?e.right:i.right,i.bottom=typeof e.bottom!="undefined"?e.bottom:i.bottom,i.left=typeof e.left!="undefined"?e.left:i.left,m):i},m.tickFormat=function(e){return arguments.length?(l=e,m):l},m.tooltips=function(e){return arguments.length?(c=e,m):c},m.tooltipContent=function(e){return arguments.length?(h=e,m):h},m.noData=function(e){return arguments.length?(p=e,m):p},m},e.models.cumulativeLineChart=function(){"use strict";function D(b){return b.each(function(b){function q(e,t){d3.select(D.container).style("cursor","ew-resize")}function R(e,t){M.x=d3.event.x,M.i=Math.round(O.invert(M.x)),rt()}function U(e,t){d3.select(D.container).style("cursor","auto"),x.index=M.i,k.stateChange(x)}function rt(){nt.data([M]);var e=D.transitionDuration();D.transitionDuration(0),D.update(),D.transitionDuration(e)}var A=d3.select(this).classed("nv-chart-"+S,!0),H=this,B=(f||parseInt(A.style("width"))||960)-u.left-u.right,j=(l||parseInt(A.style("height"))||400)-u.top-u.bottom;D.update=function(){A.transition().duration(L).call(D)},D.container=this,x.disabled=b.map(function(e){return!!e.disabled});if(!T){var F;T={};for(F in x)x[F]instanceof Array?T[F]=x[F].slice(0):T[F]=x[F]}var I=d3.behavior.drag().on("dragstart",q).on("drag",R).on("dragend",U);if(!b||!b.length||!b.filter(function(e){return e.values.length}).length){var z=A.selectAll(".nv-noData").data([N]);return z.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),z.attr("x",u.left+B/2).attr("y",u.top+j/2).text(function(e){return e}),D}A.selectAll(".nv-noData").remove(),w=t.xScale(),E=t.yScale();if(!y){var W=b.filter(function(e){return!e.disabled}).map(function(e,n){var r=d3.extent(e.values,t.y());return r[0]<-0.95&&(r[0]=-0.95),[(r[0]-r[1])/(1+r[1]),(r[1]-r[0])/(1+r[0])]}),X=[d3.min(W,function(e){return e[0]}),d3.max(W,function(e){return e[1]})];t.yDomain(X)}else t.yDomain(null);O.domain([0,b[0].values.length-1]).range([0,B]).clamp(!0);var b=P(M.i,b),V=g?"none":"all",$=A.selectAll("g.nv-wrap.nv-cumulativeLine").data([b]),J=$.enter().append("g").attr("class","nvd3 nv-wrap nv-cumulativeLine").append("g"),K=$.select("g");J.append("g").attr("class","nv-interactive"),J.append("g").attr("class","nv-x nv-axis").style("pointer-events","none"),J.append("g").attr("class","nv-y nv-axis"),J.append("g").attr("class","nv-background"),J.append("g").attr("class","nv-linesWrap").style("pointer-events",V),J.append("g").attr("class","nv-avgLinesWrap").style("pointer-events","none"),J.append("g").attr("class","nv-legendWrap"),J.append("g").attr("class","nv-controlsWrap"),c&&(i.width(B),K.select(".nv-legendWrap").datum(b).call(i),u.top!=i.height()&&(u.top=i.height(),j=(l||parseInt(A.style("height"))||400)-u.top-u.bottom),K.select(".nv-legendWrap").attr("transform","translate(0,"+ -u.top+")"));if(m){var Q=[{key:"Re-scale y-axis",disabled:!y}];s.width(140).color(["#444","#444","#444"]).rightAlign(!1).margin({top:5,right:0,bottom:5,left:20}),K.select(".nv-controlsWrap").datum(Q).attr("transform","translate(0,"+ -u.top+")").call(s)}$.attr("transform","translate("+u.left+","+u.top+")"),d&&K.select(".nv-y.nv-axis").attr("transform","translate("+B+",0)");var G=b.filter(function(e){return e.tempDisabled});$.select(".tempDisabled").remove(),G.length&&$.append("text").attr("class","tempDisabled").attr("x",B/2).attr("y","-.71em").style("text-anchor","end").text(G.map(function(e){return e.key}).join(", ")+" values cannot be calculated for this time period."),g&&(o.width(B).height(j).margin({left:u.left,top:u.top}).svgContainer(A).xScale(w),$.select(".nv-interactive").call(o)),J.select(".nv-background").append("rect"),K.select(".nv-background rect").attr("width",B).attr("height",j),t.y(function(e){return e.display.y}).width(B).height(j).color(b.map(function(e,t){return e.color||a(e,t)}).filter(function(e,t){return!b[t].disabled&&!b[t].tempDisabled}));var Y=K.select(".nv-linesWrap").datum(b.filter(function(e){return!e.disabled&&!e.tempDisabled}));Y.call(t),b.forEach(function(e,t){e.seriesIndex=t});var Z=b.filter(function(e){return!e.disabled&&!!C(e)}),et=K.select(".nv-avgLinesWrap").selectAll("line").data(Z,function(e){return e.key}),tt=function(e){var t=E(C(e));return t<0?0:t>j?j:t};et.enter().append("line").style("stroke-width",2).style("stroke-dasharray","10,10").style("stroke",function(e,n){return t.color()(e,e.seriesIndex)}).attr("x1",0).attr("x2",B).attr("y1",tt).attr("y2",tt),et.style("stroke-opacity",function(e){var t=E(C(e));return t<0||t>j?0:1}).attr("x1",0).attr("x2",B).attr("y1",tt).attr("y2",tt),et.exit().remove();var nt=Y.selectAll(".nv-indexLine").data([M]);nt.enter().append("rect").attr("class","nv-indexLine").attr("width",3).attr("x",-2).attr("fill","red").attr("fill-opacity",.5).style("pointer-events","all").call(I),nt.attr("transform",function(e){return"translate("+O(e.i)+",0)"}).attr("height",j),h&&(n.scale(w).ticks(Math.min(b[0].values.length,B/70)).tickSize(-j,0),K.select(".nv-x.nv-axis").attr("transform","translate(0,"+E.range()[0]+")"),d3.transition(K.select(".nv-x.nv-axis")).call(n)),p&&(r.scale(E).ticks(j/36).tickSize(-B,0),d3.transition(K.select(".nv-y.nv-axis")).call(r)),K.select(".nv-background rect").on("click",function(){M.x=d3.mouse(this)[0],M.i=Math.round(O.invert(M.x)),x.index=M.i,k.stateChange(x),rt()}),t.dispatch.on("elementClick",function(e){M.i=e.pointIndex,M.x=O(M.i),x.index=M.i,k.stateChange(x),rt()}),s.dispatch.on("legendClick",function(e,t){e.disabled=!e.disabled,y=!e.disabled,x.rescaleY=y,k.stateChange(x),D.update()}),i.dispatch.on("stateChange",function(e){x.disabled=e.disabled,k.stateChange(x),D.update()}),o.dispatch.on("elementMousemove",function(i){t.clearHighlights();var s,f,l,c=[];b.filter(function(e,t){return e.seriesIndex=t,!e.disabled}).forEach(function(n,r){f=e.interactiveBisect(n.values,i.pointXValue,D.x()),t.highlightPoint(r,f,!0);var o=n.values[f];if(typeof o=="undefined")return;typeof s=="undefined"&&(s=o),typeof l=="undefined"&&(l=D.xScale()(D.x()(o,f))),c.push({key:n.key,value:D.y()(o,f),color:a(n,n.seriesIndex)})});if(c.length>2){var h=D.yScale().invert(i.mouseY),p=Math.abs(D.yScale().domain()[0]-D.yScale().domain()[1]),d=.03*p,m=e.nearestValueIndex(c.map(function(e){return e.value}),h,d);m!==null&&(c[m].highlight=!0)}var g=n.tickFormat()(D.x()(s,f),f);o.tooltip.position({left:l+u.left,top:i.mouseY+u.top}).chartContainer(H.parentNode).enabled(v).valueFormatter(function(e,t){return r.tickFormat()(e)}).data({value:g,series:c})(),o.renderGuideLine(l)}),o.dispatch.on("elementMouseout",function(e){k.tooltipHide(),t.clearHighlights()}),k.on("tooltipShow",function(e){v&&_(e,H.parentNode)}),k.on("changeState",function(e){typeof e.disabled!="undefined"&&(b.forEach(function(t,n){t.disabled=e.disabled[n]}),x.disabled=e.disabled),typeof e.index!="undefined"&&(M.i=e.index,M.x=O(M.i),x.index=e.index,nt.data([M])),typeof e.rescaleY!="undefined"&&(y=e.rescaleY),D.update()})}),D}function P(e,n){return n.map(function(n,r){if(!n.values)return n;var i=t.y()(n.values[e],e);return i<-0.95&&!A?(n.tempDisabled=!0,n):(n.tempDisabled=!1,n.values=
+n.values.map(function(e,n){return e.display={y:(t.y()(e,n)-i)/(1+i)},e}),n)})}var t=e.models.line(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o=e.interactiveGuideline(),u={top:30,right:30,bottom:50,left:60},a=e.utils.defaultColor(),f=null,l=null,c=!0,h=!0,p=!0,d=!1,v=!0,m=!0,g=!1,y=!0,b=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},w,E,S=t.id(),x={index:0,rescaleY:y},T=null,N="No Data Available.",C=function(e){return e.average},k=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),L=250,A=!1;n.orient("bottom").tickPadding(7),r.orient(d?"right":"left"),s.updateState(!1);var O=d3.scale.linear(),M={i:0,x:0},_=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=b(i.series.key,a,f,i,D);e.tooltip.show([o,u],l,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+u.left,e.pos[1]+u.top],k.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){k.tooltipHide(e)}),k.on("tooltipHide",function(){v&&e.tooltip.cleanup()}),D.dispatch=k,D.lines=t,D.legend=i,D.xAxis=n,D.yAxis=r,D.interactiveLayer=o,d3.rebind(D,t,"defined","isArea","x","y","xScale","yScale","size","xDomain","yDomain","xRange","yRange","forceX","forceY","interactive","clipEdge","clipVoronoi","useVoronoi","id"),D.options=e.utils.optionsFunc.bind(D),D.margin=function(e){return arguments.length?(u.top=typeof e.top!="undefined"?e.top:u.top,u.right=typeof e.right!="undefined"?e.right:u.right,u.bottom=typeof e.bottom!="undefined"?e.bottom:u.bottom,u.left=typeof e.left!="undefined"?e.left:u.left,D):u},D.width=function(e){return arguments.length?(f=e,D):f},D.height=function(e){return arguments.length?(l=e,D):l},D.color=function(t){return arguments.length?(a=e.utils.getColor(t),i.color(a),D):a},D.rescaleY=function(e){return arguments.length?(y=e,D):y},D.showControls=function(e){return arguments.length?(m=e,D):m},D.useInteractiveGuideline=function(e){return arguments.length?(g=e,e===!0&&(D.interactive(!1),D.useVoronoi(!1)),D):g},D.showLegend=function(e){return arguments.length?(c=e,D):c},D.showXAxis=function(e){return arguments.length?(h=e,D):h},D.showYAxis=function(e){return arguments.length?(p=e,D):p},D.rightAlignYAxis=function(e){return arguments.length?(d=e,r.orient(e?"right":"left"),D):d},D.tooltips=function(e){return arguments.length?(v=e,D):v},D.tooltipContent=function(e){return arguments.length?(b=e,D):b},D.state=function(e){return arguments.length?(x=e,D):x},D.defaultState=function(e){return arguments.length?(T=e,D):T},D.noData=function(e){return arguments.length?(N=e,D):N},D.average=function(e){return arguments.length?(C=e,D):C},D.transitionDuration=function(e){return arguments.length?(L=e,D):L},D.noErrorCheck=function(e){return arguments.length?(A=e,D):A},D},e.models.discreteBar=function(){"use strict";function E(e){return e.each(function(e){var i=n-t.left-t.right,E=r-t.top-t.bottom,S=d3.select(this);e.forEach(function(e,t){e.values.forEach(function(e){e.series=t})});var T=p&&d?[]:e.map(function(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0}})});s.domain(p||d3.merge(T).map(function(e){return e.x})).rangeBands(v||[0,i],.1),o.domain(d||d3.extent(d3.merge(T).map(function(e){return e.y}).concat(f))),c?o.range(m||[E-(o.domain()[0]<0?12:0),o.domain()[1]>0?12:0]):o.range(m||[E,0]),b=b||s,w=w||o.copy().range([o(0),o(0)]);var N=S.selectAll("g.nv-wrap.nv-discretebar").data([e]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-discretebar"),k=C.append("g"),L=N.select("g");k.append("g").attr("class","nv-groups"),N.attr("transform","translate("+t.left+","+t.top+")");var A=N.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});A.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),A.exit().transition().style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),A.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}),A.transition().style("stroke-opacity",1).style("fill-opacity",.75);var O=A.selectAll("g.nv-bar").data(function(e){return e.values});O.exit().remove();var M=O.enter().append("g").attr("transform",function(e,t,n){return"translate("+(s(u(e,t))+s.rangeBand()*.05)+", "+o(0)+")"}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),g.elementMouseover({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),g.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){g.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){g.elementDblClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(t.series+.5)/e.length,o(a(t,n))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()});M.append("rect").attr("height",0).attr("width",s.rangeBand()*.9/e.length),c?(M.append("text").attr("text-anchor","middle"),O.select("text").text(function(e,t){return h(a(e,t))}).transition().attr("x",s.rangeBand()*.9/2).attr("y",function(e,t){return a(e,t)<0?o(a(e,t))-o(0)+12:-4})):O.selectAll("text").remove(),O.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).style("fill",function(e,t){return e.color||l(e,t)}).style("stroke",function(e,t){return e.color||l(e,t)}).select("rect").attr("class",y).transition().attr("width",s.rangeBand()*.9/e.length),O.transition().attr("transform",function(e,t){var n=s(u(e,t))+s.rangeBand()*.05,r=a(e,t)<0?o(0):o(0)-o(a(e,t))<1?o(0)-1:o(a(e,t));return"translate("+n+", "+r+")"}).select("rect").attr("height",function(e,t){return Math.max(Math.abs(o(a(e,t))-o(d&&d[0]||0))||1)}),b=s.copy(),w=o.copy()}),E}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.ordinal(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=e.utils.defaultColor(),c=!1,h=d3.format(",.2f"),p,d,v,m,g=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),y="discreteBar",b,w;return E.dispatch=g,E.options=e.utils.optionsFunc.bind(E),E.x=function(e){return arguments.length?(u=e,E):u},E.y=function(e){return arguments.length?(a=e,E):a},E.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,E):t},E.width=function(e){return arguments.length?(n=e,E):n},E.height=function(e){return arguments.length?(r=e,E):r},E.xScale=function(e){return arguments.length?(s=e,E):s},E.yScale=function(e){return arguments.length?(o=e,E):o},E.xDomain=function(e){return arguments.length?(p=e,E):p},E.yDomain=function(e){return arguments.length?(d=e,E):d},E.xRange=function(e){return arguments.length?(v=e,E):v},E.yRange=function(e){return arguments.length?(m=e,E):m},E.forceY=function(e){return arguments.length?(f=e,E):f},E.color=function(t){return arguments.length?(l=e.utils.getColor(t),E):l},E.id=function(e){return arguments.length?(i=e,E):i},E.showValues=function(e){return arguments.length?(c=e,E):c},E.valueFormat=function(e){return arguments.length?(h=e,E):h},E.rectClass=function(e){return arguments.length?(y=e,E):y},E},e.models.discreteBarChart=function(){"use strict";function w(e){return e.each(function(e){var u=d3.select(this),p=this,E=(s||parseInt(u.style("width"))||960)-i.left-i.right,S=(o||parseInt(u.style("height"))||400)-i.top-i.bottom;w.update=function(){g.beforeUpdate(),u.transition().duration(y).call(w)},w.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var T=u.selectAll(".nv-noData").data([m]);return T.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),T.attr("x",i.left+E/2).attr("y",i.top+S/2).text(function(e){return e}),w}u.selectAll(".nv-noData").remove(),d=t.xScale(),v=t.yScale().clamp(!0);var N=u.selectAll("g.nv-wrap.nv-discreteBarWithAxes").data([e]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-discreteBarWithAxes").append("g"),k=C.append("defs"),L=N.select("g");C.append("g").attr("class","nv-x nv-axis"),C.append("g").attr("class","nv-y nv-axis").append("g").attr("class","nv-zeroLine").append("line"),C.append("g").attr("class","nv-barsWrap"),L.attr("transform","translate("+i.left+","+i.top+")"),l&&L.select(".nv-y.nv-axis").attr("transform","translate("+E+",0)"),t.width(E).height(S);var A=L.select(".nv-barsWrap").datum(e.filter(function(e){return!e.disabled}));A.transition().call(t),k.append("clipPath").attr("id","nv-x-label-clip-"+t.id()).append("rect"),L.select("#nv-x-label-clip-"+t.id()+" rect").attr("width",d.rangeBand()*(c?2:1)).attr("height",16).attr("x",-d.rangeBand()/(c?1:2));if(a){n.scale(d).ticks(E/100).tickSize(-S,0),L.select(".nv-x.nv-axis").attr("transform","translate(0,"+(v.range()[0]+(t.showValues()&&v.domain()[0]<0?16:0))+")"),L.select(".nv-x.nv-axis").transition().call(n);var O=L.select(".nv-x.nv-axis").selectAll("g");c&&O.selectAll("text").attr("transform",function(e,t,n){return"translate(0,"+(n%2==0?"5":"17")+")"})}f&&(r.scale(v).ticks(S/36).tickSize(-E,0),L.select(".nv-y.nv-axis").transition().call(r)),L.select(".nv-zeroLine line").attr("x1",0).attr("x2",E).attr("y1",v(0)).attr("y2",v(0)),g.on("tooltipShow",function(e){h&&b(e,p.parentNode)})}),w}var t=e.models.discreteBar(),n=e.models.axis(),r=e.models.axis(),i={top:15,right:10,bottom:50,left:60},s=null,o=null,u=e.utils.getColor(),a=!0,f=!0,l=!1,c=!1,h=!0,p=function(e,t,n,r,i){return"<h3>"+t+"</h3>"+"<p>"+n+"</p>"},d,v,m="No Data Available.",g=d3.dispatch("tooltipShow","tooltipHide","beforeUpdate"),y=250;n.orient("bottom").highlightZero(!1).showMaxMin(!1).tickFormat(function(e){return e}),r.orient(l?"right":"left").tickFormat(d3.format(",.1f"));var b=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=p(i.series.key,a,f,i,w);e.tooltip.show([o,u],l,i.value<0?"n":"s",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+i.left,e.pos[1]+i.top],g.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){g.tooltipHide(e)}),g.on("tooltipHide",function(){h&&e.tooltip.cleanup()}),w.dispatch=g,w.discretebar=t,w.xAxis=n,w.yAxis=r,d3.rebind(w,t,"x","y","xDomain","yDomain","xRange","yRange","forceX","forceY","id","showValues","valueFormat"),w.options=e.utils.optionsFunc.bind(w),w.margin=function(e){return arguments.length?(i.top=typeof e.top!="undefined"?e.top:i.top,i.right=typeof e.right!="undefined"?e.right:i.right,i.bottom=typeof e.bottom!="undefined"?e.bottom:i.bottom,i.left=typeof e.left!="undefined"?e.left:i.left,w):i},w.width=function(e){return arguments.length?(s=e,w):s},w.height=function(e){return arguments.length?(o=e,w):o},w.color=function(n){return arguments.length?(u=e.utils.getColor(n),t.color(u),w):u},w.showXAxis=function(e){return arguments.length?(a=e,w):a},w.showYAxis=function(e){return arguments.length?(f=e,w):f},w.rightAlignYAxis=function(e){return arguments.length?(l=e,r.orient(e?"right":"left"),w):l},w.staggerLabels=function(e){return arguments.length?(c=e,w):c},w.tooltips=function(e){return arguments.length?(h=e,w):h},w.tooltipContent=function(e){return arguments.length?(p=e,w):p},w.noData=function(e){return arguments.length?(m=e,w):m},w.transitionDuration=function(e){return arguments.length?(y=e,w):y},w},e.models.distribution=function(){"use strict";function l(e){return e.each(function(e){var a=n-(i==="x"?t.left+t.right:t.top+t.bottom),l=i=="x"?"y":"x",c=d3.select(this);f=f||u;var h=c.selectAll("g.nv-distribution").data([e]),p=h.enter().append("g").attr("class","nvd3 nv-distribution"),d=p.append("g"),v=h.select("g");h.attr("transform","translate("+t.left+","+t.top+")");var m=v.selectAll("g.nv-dist").data(function(e){return e},function(e){return e.key});m.enter().append("g"),m.attr("class",function(e,t){return"nv-dist nv-series-"+t}).style("stroke",function(e,t){return o(e,t)});var g=m.selectAll("line.nv-dist"+i).data(function(e){return e.values});g.enter().append("line").attr(i+"1",function(e,t){return f(s(e,t))}).attr(i+"2",function(e,t){return f(s(e,t))}),m.exit().selectAll("line.nv-dist"+i).transition().attr(i+"1",function(e,t){return u(s(e,t))}).attr(i+"2",function(e,t){return u(s(e,t))}).style("stroke-opacity",0).remove(),g.attr("class",function(e,t){return"nv-dist"+i+" nv-dist"+i+"-"+t}).attr(l+"1",0).attr(l+"2",r),g.transition().attr(i+"1",function(e,t){return u(s(e,t))}).attr(i+"2",function(e,t){return u(s(e,t))}),f=u.copy()}),l}var t={top:0,right:0,bottom:0,left:0},n=400,r=8,i="x",s=function(e){return e[i]},o=e.utils.defaultColor(),u=d3.scale.linear(),a,f;return l.options=e.utils.optionsFunc.bind(l),l.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,l):t},l.width=function(e){return arguments.length?(n=e,l):n},l.axis=function(e){return arguments.length?(i=e,l):i},l.size=function(e){return arguments.length?(r=e,l):r},l.getData=function(e){return arguments.length?(s=d3.functor(e),l):s},l.scale=function(e){return arguments.length?(u=e,l):u},l.color=function(t){return arguments.length?(o=e.utils.getColor(t),l):o},l},e.models.historicalBar=function(){"use strict";function w(E){return E.each(function(w){var E=n-t.left-t.right,S=r-t.top-t.bottom,T=d3.select(this);s.domain(d||d3.extent(w[0].values.map(u).concat(f))),c?s.range(m||[E*.5/w[0].values.length,E*(w[0].values.length-.5)/w[0].values.length]):s.range(m||[0,E]),o.domain(v||d3.extent(w[0].values.map(a).concat(l))).range(g||[S,0]),s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]-s.domain()[0]*.01,s.domain()[1]+s.domain()[1]*.01]):s.domain([-1,1])),o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]+o.domain()[0]*.01,o.domain()[1]-o.domain()[1]*.01]):o.domain([-1,1]));var N=T.selectAll("g.nv-wrap.nv-historicalBar-"+i).data([w[0].values]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-historicalBar-"+i),k=C.append("defs"),L=C.append("g"),A=N.select("g");L.append("g").attr("class","nv-bars"),N.attr("transform","translate("+t.left+","+t.top+")"),T.on("click",function(e,t){y.chartClick({data:e,index:t,pos:d3.event,id:i})}),k.append("clipPath").attr("id","nv-chart-clip-path-"+i).append("rect"),N.select("#nv-chart-clip-path-"+i+" rect").attr("width",E).attr("height",S),A.attr("clip-path",h?"url(#nv-chart-clip-path-"+i+")":"");var O=N.select(".nv-bars").selectAll(".nv-bar").data(function(e){return e},function(e,t){return u(e,t)});O.exit().remove();var M=O.enter().append("rect").attr("x",0).attr("y",function(t,n){return e.utils.NaNtoZero(o(Math.max(0,a(t,n))))}).attr("height",function(t,n){return e.utils.NaNtoZero(Math.abs(o(a(t,n))-o(0)))}).attr("transform",function(e,t){return"translate("+(s(u(e,t))-E/w[0].values.length*.45)+",0)"}).on("mouseover",function(e,t){if(!b)return;d3.select(this).classed("hover",!0),y.elementMouseover({point:e,series:w[0],pos:[s(u(e,t)),o(a(e,t))],pointIndex:t,seriesIndex:0,e:d3.event})}).on("mouseout",function(e,t){if(!b)return;d3.select(this).classed("hover",!1),y.elementMouseout({point:e,series:w[0],pointIndex:t,seriesIndex:0,e:d3.event})}).on("click",function(e,t){if(!b)return;y.elementClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()}).on("dblclick",function(e,t){if(!b)return;y.elementDblClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()});O.attr("fill",function(e,t){return p(e,t)}).attr("class",function(e,t,n){return(a(e,t)<0?"nv-bar negative":"nv-bar positive")+" nv-bar-"+n+"-"+t}).transition().attr("transform",function(e,t){return"translate("+(s(u(e,t))-E/w[0].values.length*.45)+",0)"}).attr("width",E/w[0].values.length*.9),O.transition().attr("y",function(t,n){var r=a(t,n)<0?o(0):o(0)-o(a(t,n))<1?o(0)-1:o(a(t,n));return e.utils.NaNtoZero(r)}).attr("height",function(t,n){return e.utils.NaNtoZero(Math.max(Math.abs(o(a(t,n))-o(0)),1))})}),w}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[],l=[0],c=!1,h=!0,p=e.utils.defaultColor(),d,v,m,g,y=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),b=!0;return w.highlightPoint=function(e,t){d3.select(".nv-historicalBar-"+i).select(".nv-bars .nv-bar-0-"+e).classed("hover",t)},w.clearHighlights=function(){d3.select(".nv-historicalBar-"+i).select(".nv-bars .nv-bar.hover").classed("hover",!1)},w.dispatch=y,w.options=e.utils.optionsFunc.bind(w),w.x=function(e){return arguments.length?(u=e,w):u},w.y=function(e){return arguments.length?(a=e,w):a},w.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,w):t},w.width=function(e){return arguments.length?(n=e,w):n},w.height=function(e){return arguments.length?(r=e,w):r},w.xScale=function(e){return arguments.length?(s=e,w):s},w.yScale=function(e){return arguments.length?(o=e,w):o},w.xDomain=function(e){return arguments.length?(d=e,w):d},w.yDomain=function(e){return arguments.length?(v=e,w):v},w.xRange=function(e){return arguments.length?(m=e,w):m},w.yRange=function(e){return arguments.length?(g=e,w):g},w.forceX=function(e){return arguments.length?(f=e,w):f},w.forceY=function(e){return arguments.length?(l=e,w):l},w.padData=function(e){return arguments.length?(c=e,w):c},w.clipEdge=function(e){return arguments.length?(h=e,w):h},w.color=function(t){return arguments.length?(p=e.utils.getColor(t),w):p},w.id=function(e){return arguments.length?(i=e,w):i},w.interactive=function(e){return arguments.length?(b=!1,w):b},w},e.models.historicalBarChart=function(){"use strict";function x(e){return e.each(function(d){var T=d3.select(this),N=this,C=(u||parseInt(T.style("width"))||960)-s.left-s.right,k=(a||parseInt(T.style("height"))||400)-s.top-s.bottom;x.update=function(){T.transition().duration(E).call(x)},x.container=this,g.disabled=d.map(function(e){return!!e.disabled});if(!y){var L;y={};for(L in g)g[L]instanceof Array?y[L]=g[L].slice(0):y[L]=g[L]}if(!d||!d.length||!d.filter(function(e){return e.values.length}).length){var A=T.selectAll(".nv-noData").data([b]);return A.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),A.attr("x",s.left+C/2).attr("y",s.top+k/2).text(function(e){return e}),x}T.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale();var O=T.selectAll("g.nv-wrap.nv-historicalBarChart").data([d]),M=O.enter().append("g").attr("class","nvd3 nv-wrap nv-historicalBarChart").append("g"),_=O.select("g");M.append("g").attr("class","nv-x nv-axis"),M.append("g").attr("class","nv-y nv-axis"),M.append("g").attr("class","nv-barsWrap"),M.append("g").attr("class","nv-legendWrap"),f&&(i.width(C),_.select(".nv-legendWrap").datum(d).call(i),s.top!=i.height()&&(s.top=i.height(),k=(a||parseInt(T.style("height"))||400)-s.top-s.bottom),O.select(".nv-legendWrap").attr("transform","translate(0,"+ -s.top+")")),O.attr("transform","translate("+s.left+","+s.top+")"),h&&_.select(".nv-y.nv-axis").attr("transform","translate("+C+",0)"),t.width(C).height(k).color(d.map(function(e,t){return e.color||o(e,t)}).filter(function(e,t){return!d[t].disabled}));var D=_.select(".nv-barsWrap").datum(d.filter(function(e){return!e.disabled}));D.transition().call(t),l&&(n.scale(v).tickSize(-k,0),_.select(".nv-x.nv-axis").attr("transform","translate(0,"+m.range()[0]+")"),_.select(".nv-x.nv-axis").transition().call(n)),c&&(r.scale(m).ticks(k/36).tickSize(-C,0),_.select(".nv-y.nv-axis").transition().call(r)),i.dispatch.on("legendClick",function(t,n){t.disabled=!t.disabled,d.filter(function(e){return!e.disabled}).length||d.map(function(e){return e.disabled=!1,O.selectAll(".nv-series").classed("disabled",!1),e}),g.disabled=d.map(function(e){return!!e.disabled}),w.stateChange(g),e.transition().call(x)}),i.dispatch.on("legendDblclick",function(e){d.forEach(function(e){e.disabled=!0}),e.disabled=!1,g.disabled=d.map(function(e){return!!e.disabled}),w.stateChange(g),x.update()}),w.on("tooltipShow",function(e){p&&S(e,N.parentNode)}),w.on("changeState",function(e){typeof e.disabled!="undefined"&&(d.forEach(function(t,n){t.disabled=e.disabled[n]}),g.disabled=e.disabled),x.update()})}),x}var t=e.models.historicalBar(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s={top:30,right:90,bottom:50,left:90},o=e.utils.defaultColor(),u=null,a=null,f=!1,l=!0,c=!0,h=!1,p=!0,d=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},v,m,g={},y=null,b="No Data Available.",w=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),E=250;n.orient("bottom").tickPadding(7),r.orient(h?"right":"left");var S=function(i,s){if(s){var o=d3.select(s).select("svg"),u=o.node()?o.attr("viewBox"):null;if(u){u=u.split(" ");var a=parseInt(o.style("width"))/u[2];i.pos[0]=i.pos[0]*a,i.pos[1]=i.pos[1]*a}}var f=i.pos[0]+(s.offsetLeft||0),l=i.pos[1]+(s.offsetTop||0),c=n.tickFormat()(t.x()(i.point,i.pointIndex)),h=r.tickFormat()(t.y()(i.point,i.pointIndex)),p=d(i.series.key,c,h,i,x);e.tooltip.show([f,l],p,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+s.left,e.pos[1]+s.top],w.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){w.tooltipHide(e)}),w.on("tooltipHide",function(){p&&e.tooltip.cleanup()}),x.dispatch=w,x.bars=t,x.legend=i,x.xAxis=n,x.yAxis=r,d3.rebind(x,t,"defined","isArea","x","y","size","xScale","yScale","xDomain","yDomain","xRange","yRange","forceX","forceY","interactive","clipEdge","clipVoronoi","id","interpolate","highlightPoint","clearHighlights","interactive"),x.options=e.utils.optionsFunc.bind(x),x.margin=function(e){return arguments.length?(s.top=typeof e.top!="undefined"?e.top:s.top,s.right=typeof e.right!="undefined"?e.right:s.right,s.bottom=typeof e.bottom!="undefined"?e.bottom:s.bottom,s.left=typeof e.left!="undefined"?e.left:s.left,x):s},x.width=function(e){return arguments.length?(u=e,x):u},x.height=function(e){return arguments.length?(a=e,x):a},x.color=function(t){return arguments.length?(o=e.utils.getColor(t),i.color(o),x):o},x.showLegend=function(e){return arguments.length?(f=e,x):f},x.showXAxis=function(e){return arguments.length?(l=e,x):l},x.showYAxis=function(e){return arguments.length?(c=e,x):c},x.rightAlignYAxis=function(e){return arguments.length?(h=e,r.orient(e?"right":"left"),x):h},x.tooltips=function(e){return arguments.length?(p=e,x):p},x.tooltipContent=function(e){return arguments.length?(d=e,x):d},x.state=function(e){return arguments.length?(g=e,x):g},x.defaultState=function(e){return arguments.length?(y=e,x):y},x.noData=function(e){return arguments.length?(b=e,x):b},x.transitionDuration=function(e){return arguments.length?(E=e,x):E},x},e.models.indentedTree=function(){"use strict";function g(e){return e.each(function(e){function k(e,t,n){d3.event.stopPropagation();if(d3.event.shiftKey&&!n)return d3.event.shiftKey=!1,e.values&&e.values.forEach(function(e){(e.values||e._values)&&k(e,0,!0)}),!0;if(!O(e))return!0;e.values?(e._values=e.values,e.values=null):(e.values=e._values,e._values=null),g.update()}function L(e){return e._values&&e._values.length?h:e.values&&e.values.length?p:""}function A(e){return e._values&&e._values.length}function O(e){var t=e.values||e._values;return t&&t.length}var t=1,n=d3.select(this),i=d3.layout.tree().children(function(e){return e.values}).size([r,f]);g.update=function(){n.transition().duration(600).call(g)},e[0]||(e[0]={key:a});var s=i.nodes(e[0]),y=d3.select(this).selectAll("div").data([[s]]),b=y.enter().append("div").attr("class","nvd3 nv-wrap nv-indentedtree"),w=b.append("table"),E=y.select("table").attr("width","100%").attr("class",c);if(o){var S=w.append("thead"),x=S.append("tr");l.forEach(function(e){x.append("th").attr("width",e.width?e.width:"10%").style("text-align",e.type=="numeric"?"right":"left").append("span").text(e.label)})}var T=E.selectAll("tbody").data(function(e){return e});T.enter().append("tbody"),t=d3.max(s,function(e){return e.depth}),i.size([r,t*f]);var N=T.selectAll("tr").data(function(e){return e.filter(function(e){return u&&!e.children?u(e):!0})},function(e,t){return e.id||e.id||++m});N.exit().remove(),N.select("img.nv-treeicon").attr("src",L).classed("folded",A);var C=N.enter().append("tr");l.forEach(function(e,t){var n=C.append("td").style("padding-left",function(e){return(t?0:e.depth*f+12+(L(e)?0:16))+"px"},"important").style("text-align",e.type=="numeric"?"right":"left");t==0&&n.append("img").classed("nv-treeicon",!0).classed("nv-folded",A).attr("src",L).style("width","14px").style("height","14px").style("padding","0 1px").style("display",function(e){return L(e)?"inline-block":"none"}).on("click",k),n.each(function(n){!t&&v(n)?d3.select(this).append("a").attr("href",v).attr("class",d3.functor(e.classes)).append("span"):d3.select(this).append("span"),d3.select(this).select("span").attr("class",d3.functor(e.classes)).text(function(t){return e.format?e.format(t):t[e.key]||"-"})}),e.showCount&&(n.append("span").attr("class","nv-childrenCount"),N.selectAll("span.nv-childrenCount").text(function(e){return e.values&&e.values.length||e._values&&e._values.length?"("+(e.values&&e.values.filter(function(e){return u?u(e):!0}).length||e._values&&e._values.filter(function(e){return u?u(e):!0}).length||0)+")":""}))}),N.order().on("click",function(e){d.elementClick({row:this,data:e,pos:[e.x,e.y]})}).on("dblclick",function(e){d.elementDblclick({row:this,data:e,pos:[e.x,e.y]})}).on("mouseover",function(e){d.elementMouseover({row:this,data:e,pos:[e.x,e.y]})}).on("mouseout",function(e){d.elementMouseout({row:this,data:e,pos:[e.x,e.y]})})}),g}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e4),o=!0,u=!1,a="No Data Available.",f=20,l=[{key:"key",label:"Name",type:"text"}],c=null,h="images/grey-plus.png",p="images/grey-minus.png",d=d3.dispatch("elementClick","elementDblclick","elementMouseover","elementMouseout"),v=function(e){return e.url},m=0;return g.options=e.utils.optionsFunc.bind(g),g.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,g):t},g.width=function(e){return arguments.length?(n=e,g):n},g.height=function(e){return arguments.length?(r=e,g):r},g.color=function(t){return arguments.length?(i=e.utils.getColor(t),scatter.color(i),g):i},g.id=function(e){return arguments.length?(s=e,g):s},g.header=function(e){return arguments.length?(o=e,g):o},g.noData=function(e){return arguments.length?(a=e,g):a},g.filterZero=function(e){return arguments.length?(u=e,g):u},g.columns=function(e){return arguments.length?(l=e,g):l},g.tableClass=function(e){return arguments.length?(c=e,g):c},g.iconOpen=function(e){return arguments.length?(h=e,g):h},g.iconClose=function(e){return arguments.length?(p=e,g):p},g.getUrl=function(e){return arguments.length?(v=e,g):v},g},e.models.legend=function(){"use strict";function c(h){return h.each(function(c){var h=n-t.left-t.right,p=d3.select(this),d=p.selectAll("g.nv-legend").data([c]),v=d.enter().append("g").attr("class","nvd3 nv-legend").append("g"),m=d.select("g");d.attr("transform","translate("+t.left+","+t.top+")");var g=m.selectAll(".nv-series").data(function(e){return e}),y=g.enter().append("g").attr("class","nv-series").on("mouseover",function(e,t){l.legendMouseover(e,t)}).on("mouseout",function(e,t){l.legendMouseout(e,t)}).on("click",function(e,t){l.legendClick(e,t),a&&(f?(c.forEach(function(e){e.disabled=!0}),e.disabled=!1):(e.disabled=!e.disabled,c.every(function(e){return e.disabled})&&c.forEach(function(e){e.disabled=!1})),l.stateChange({disabled:c.map(function(e){return!!e.disabled})}))}).on("dblclick",function(e,t){l.legendDblclick(e,t),a&&(c.forEach(function(e){e.disabled=!0}),e.disabled=!1,l.stateChange({disabled:c.map(function(e){return!!e.disabled})}))});y.append("circle").style("stroke-width",2).attr("class","nv-legend-symbol").attr("r",5),y.append("text").attr("text-anchor","start").attr("class","nv-legend-text").attr("dy",".32em").attr("dx","8"),g.classed("disabled",function(e){return e.disabled}),g.exit().remove(),g.select("circle").style("fill",function(e,t){return e.color||s(e,t)}).style("stroke",function(e,t){return e.color||s(e,t)}),g.select("text").text(i);if(o){var b=[];g.each(function(t,n){var r=d3.select(this).select("text"),i;try{i=r.getComputedTextLength();if(i<=0)throw Error()}catch(s){i=e.utils.calcApproxTextWidth(r)}b.push(i+28)});var w=0,E=0,S=[];while(E<h&&w<b.length)S[w]=b[w],E+=b[w++];w===0&&(w=1);while(E>h&&w>1){S=[],w--;for(var x=0;x<b.length;x++)b[x]>(S[x%w]||0)&&(S[x%w]=b[x]);E=S.reduce(function(e,t,n,r){return e+t})}var T=[];for(var N=0,C=0;N<w;N++)T[N]=C,C+=S[N];g.attr("transform",function(e,t){return"translate("+T[t%w]+","+(5+Math.floor(t/w)*20)+")"}),u?m.attr("transform","translate("+(n-t.right-E)+","+t.top+")"):m.attr("transform","translate(0,"+t.top+")"),r=t.top+t.bottom+Math.ceil(b.length/w)*20}else{var k=5,L=5,A=0,O;g.attr("transform",function(e,r){var i=d3.select(this).select("text").node().getComputedTextLength()+28;return O=L,n<t.left+t.right+O+i&&(L=O=5,k+=20),L+=i,L>A&&(A=L),"translate("+O+","+k+")"}),m.attr("transform","translate("+(n-t.right-A)+","+t.top+")"),r=t.top+t.bottom+k+15}}),c}var t={top:5,right:0,bottom:5,left:0},n=400,r=20,i=function(e){return e.key},s=e.utils.defaultColor(),o=!0,u=!0,a=!0,f=!1,l=d3.dispatch("legendClick","legendDblclick","legendMouseover","legendMouseout","stateChange");return c.dispatch=l,c.options=e.utils.optionsFunc.bind(c),c.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,c):t},c.width=function(e){return arguments.length?(n=e,c):n},c.height=function(e){return arguments.length?(r=e,c):r},c.key=function(e){return arguments.length?(i=e,c):i},c.color=function(t){return arguments.length?(s=e.utils.getColor(t),c):s},c.align=function(e){return arguments.length?(o=e,c):o},c.rightAlign=function(e){return arguments.length?(u=e,c):u},c.updateState=function(e){return arguments.length?(a=e,c):a},c.radioButtonMode=function(e){return arguments.length?(f=e,c):f},c},e.models.line=function(){"use strict";function m(g){return g.each(function(m){var g=r-n.left-n.right,b=i-n.top-n.bottom,w=d3.select(this);c=t.xScale(),h=t.yScale(),d=d||c,v=v||h;var E=w.selectAll("g.nv-wrap.nv-line").data([m]),S=E.enter().append("g").attr("class","nvd3 nv-wrap nv-line"),T=S.append("defs"),N=S.append("g"),C=E.select("g");N.append("g").attr("class","nv-groups"),N.append("g").attr("class","nv-scatterWrap"),E.attr("transform","translate("+n.left+","+n.top+")"),t.width(g).height(b);var k=E.select(".nv-scatterWrap");k.transition().call(t),T.append("clipPath").attr("id","nv-edge-clip-"+t.id()).append("rect"),E.select("#nv-edge-clip-"+t.id()+" rect").attr("width",g).attr("height",b),C.attr("clip-path",l?"url(#nv-edge-clip-"+t.id()+")":""),k.attr("clip-path",l?"url(#nv-edge-clip-"+t.id()+")":"");var L=E.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});L.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),L.exit().remove(),L.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return s(e,t)}).style("stroke",function(e,t){return s(e,t)}),L.transition().style("stroke-opacity",1).style("fill-opacity",.5);var A=L.selectAll("path.nv-area").data(function(e){return f(e)?[e]:[]});A.enter().append("path").attr("class","nv-area").attr("d",function(t){return d3.svg.area().interpolate(p).defined(a).x(function(t,n){return e.
+utils.NaNtoZero(d(o(t,n)))}).y0(function(t,n){return e.utils.NaNtoZero(v(u(t,n)))}).y1(function(e,t){return v(h.domain()[0]<=0?h.domain()[1]>=0?0:h.domain()[1]:h.domain()[0])}).apply(this,[t.values])}),L.exit().selectAll("path.nv-area").remove(),A.transition().attr("d",function(t){return d3.svg.area().interpolate(p).defined(a).x(function(t,n){return e.utils.NaNtoZero(c(o(t,n)))}).y0(function(t,n){return e.utils.NaNtoZero(h(u(t,n)))}).y1(function(e,t){return h(h.domain()[0]<=0?h.domain()[1]>=0?0:h.domain()[1]:h.domain()[0])}).apply(this,[t.values])});var O=L.selectAll("path.nv-line").data(function(e){return[e.values]});O.enter().append("path").attr("class","nv-line").attr("d",d3.svg.line().interpolate(p).defined(a).x(function(t,n){return e.utils.NaNtoZero(d(o(t,n)))}).y(function(t,n){return e.utils.NaNtoZero(v(u(t,n)))})),O.transition().attr("d",d3.svg.line().interpolate(p).defined(a).x(function(t,n){return e.utils.NaNtoZero(c(o(t,n)))}).y(function(t,n){return e.utils.NaNtoZero(h(u(t,n)))})),d=c.copy(),v=h.copy()}),m}var t=e.models.scatter(),n={top:0,right:0,bottom:0,left:0},r=960,i=500,s=e.utils.defaultColor(),o=function(e){return e.x},u=function(e){return e.y},a=function(e,t){return!isNaN(u(e,t))&&u(e,t)!==null},f=function(e){return e.area},l=!1,c,h,p="linear";t.size(16).sizeDomain([16,256]);var d,v;return m.dispatch=t.dispatch,m.scatter=t,d3.rebind(m,t,"id","interactive","size","xScale","yScale","zScale","xDomain","yDomain","xRange","yRange","sizeDomain","forceX","forceY","forceSize","clipVoronoi","useVoronoi","clipRadius","padData","highlightPoint","clearHighlights"),m.options=e.utils.optionsFunc.bind(m),m.margin=function(e){return arguments.length?(n.top=typeof e.top!="undefined"?e.top:n.top,n.right=typeof e.right!="undefined"?e.right:n.right,n.bottom=typeof e.bottom!="undefined"?e.bottom:n.bottom,n.left=typeof e.left!="undefined"?e.left:n.left,m):n},m.width=function(e){return arguments.length?(r=e,m):r},m.height=function(e){return arguments.length?(i=e,m):i},m.x=function(e){return arguments.length?(o=e,t.x(e),m):o},m.y=function(e){return arguments.length?(u=e,t.y(e),m):u},m.clipEdge=function(e){return arguments.length?(l=e,m):l},m.color=function(n){return arguments.length?(s=e.utils.getColor(n),t.color(s),m):s},m.interpolate=function(e){return arguments.length?(p=e,m):p},m.defined=function(e){return arguments.length?(a=e,m):a},m.isArea=function(e){return arguments.length?(f=d3.functor(e),m):f},m},e.models.lineChart=function(){"use strict";function N(m){return m.each(function(m){var C=d3.select(this),k=this,L=(a||parseInt(C.style("width"))||960)-o.left-o.right,A=(f||parseInt(C.style("height"))||400)-o.top-o.bottom;N.update=function(){C.transition().duration(x).call(N)},N.container=this,b.disabled=m.map(function(e){return!!e.disabled});if(!w){var O;w={};for(O in b)b[O]instanceof Array?w[O]=b[O].slice(0):w[O]=b[O]}if(!m||!m.length||!m.filter(function(e){return e.values.length}).length){var M=C.selectAll(".nv-noData").data([E]);return M.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),M.attr("x",o.left+L/2).attr("y",o.top+A/2).text(function(e){return e}),N}C.selectAll(".nv-noData").remove(),g=t.xScale(),y=t.yScale();var _=C.selectAll("g.nv-wrap.nv-lineChart").data([m]),D=_.enter().append("g").attr("class","nvd3 nv-wrap nv-lineChart").append("g"),P=_.select("g");D.append("rect").style("opacity",0),D.append("g").attr("class","nv-x nv-axis"),D.append("g").attr("class","nv-y nv-axis"),D.append("g").attr("class","nv-linesWrap"),D.append("g").attr("class","nv-legendWrap"),D.append("g").attr("class","nv-interactive"),P.select("rect").attr("width",L).attr("height",A>0?A:0),l&&(i.width(L),P.select(".nv-legendWrap").datum(m).call(i),o.top!=i.height()&&(o.top=i.height(),A=(f||parseInt(C.style("height"))||400)-o.top-o.bottom),_.select(".nv-legendWrap").attr("transform","translate(0,"+ -o.top+")")),_.attr("transform","translate("+o.left+","+o.top+")"),p&&P.select(".nv-y.nv-axis").attr("transform","translate("+L+",0)"),d&&(s.width(L).height(A).margin({left:o.left,top:o.top}).svgContainer(C).xScale(g),_.select(".nv-interactive").call(s)),t.width(L).height(A).color(m.map(function(e,t){return e.color||u(e,t)}).filter(function(e,t){return!m[t].disabled}));var H=P.select(".nv-linesWrap").datum(m.filter(function(e){return!e.disabled}));H.transition().call(t),c&&(n.scale(g).ticks(L/100).tickSize(-A,0),P.select(".nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),P.select(".nv-x.nv-axis").transition().call(n)),h&&(r.scale(y).ticks(A/36).tickSize(-L,0),P.select(".nv-y.nv-axis").transition().call(r)),i.dispatch.on("stateChange",function(e){b=e,S.stateChange(b),N.update()}),s.dispatch.on("elementMousemove",function(i){t.clearHighlights();var a,f,l,c=[];m.filter(function(e,t){return e.seriesIndex=t,!e.disabled}).forEach(function(n,r){f=e.interactiveBisect(n.values,i.pointXValue,N.x()),t.highlightPoint(r,f,!0);var s=n.values[f];if(typeof s=="undefined")return;typeof a=="undefined"&&(a=s),typeof l=="undefined"&&(l=N.xScale()(N.x()(s,f))),c.push({key:n.key,value:N.y()(s,f),color:u(n,n.seriesIndex)})});if(c.length>2){var h=N.yScale().invert(i.mouseY),p=Math.abs(N.yScale().domain()[0]-N.yScale().domain()[1]),d=.03*p,g=e.nearestValueIndex(c.map(function(e){return e.value}),h,d);g!==null&&(c[g].highlight=!0)}var y=n.tickFormat()(N.x()(a,f));s.tooltip.position({left:l+o.left,top:i.mouseY+o.top}).chartContainer(k.parentNode).enabled(v).valueFormatter(function(e,t){return r.tickFormat()(e)}).data({value:y,series:c})(),s.renderGuideLine(l)}),s.dispatch.on("elementMouseout",function(e){S.tooltipHide(),t.clearHighlights()}),S.on("tooltipShow",function(e){v&&T(e,k.parentNode)}),S.on("changeState",function(e){typeof e.disabled!="undefined"&&m.length===e.disabled.length&&(m.forEach(function(t,n){t.disabled=e.disabled[n]}),b.disabled=e.disabled),N.update()})}),N}var t=e.models.line(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.interactiveGuideline(),o={top:30,right:20,bottom:50,left:60},u=e.utils.defaultColor(),a=null,f=null,l=!0,c=!0,h=!0,p=!1,d=!1,v=!0,m=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},g,y,b={},w=null,E="No Data Available.",S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),x=250;n.orient("bottom").tickPadding(7),r.orient(p?"right":"left");var T=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=m(i.series.key,a,f,i,N);e.tooltip.show([o,u],l,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){v&&e.tooltip.cleanup()}),N.dispatch=S,N.lines=t,N.legend=i,N.xAxis=n,N.yAxis=r,N.interactiveLayer=s,d3.rebind(N,t,"defined","isArea","x","y","size","xScale","yScale","xDomain","yDomain","xRange","yRange","forceX","forceY","interactive","clipEdge","clipVoronoi","useVoronoi","id","interpolate"),N.options=e.utils.optionsFunc.bind(N),N.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,N):o},N.width=function(e){return arguments.length?(a=e,N):a},N.height=function(e){return arguments.length?(f=e,N):f},N.color=function(t){return arguments.length?(u=e.utils.getColor(t),i.color(u),N):u},N.showLegend=function(e){return arguments.length?(l=e,N):l},N.showXAxis=function(e){return arguments.length?(c=e,N):c},N.showYAxis=function(e){return arguments.length?(h=e,N):h},N.rightAlignYAxis=function(e){return arguments.length?(p=e,r.orient(e?"right":"left"),N):p},N.useInteractiveGuideline=function(e){return arguments.length?(d=e,e===!0&&(N.interactive(!1),N.useVoronoi(!1)),N):d},N.tooltips=function(e){return arguments.length?(v=e,N):v},N.tooltipContent=function(e){return arguments.length?(m=e,N):m},N.state=function(e){return arguments.length?(b=e,N):b},N.defaultState=function(e){return arguments.length?(w=e,N):w},N.noData=function(e){return arguments.length?(E=e,N):E},N.transitionDuration=function(e){return arguments.length?(x=e,N):x},N},e.models.linePlusBarChart=function(){"use strict";function T(e){return e.each(function(e){var l=d3.select(this),c=this,v=(a||parseInt(l.style("width"))||960)-u.left-u.right,N=(f||parseInt(l.style("height"))||400)-u.top-u.bottom;T.update=function(){l.transition().call(T)},b.disabled=e.map(function(e){return!!e.disabled});if(!w){var C;w={};for(C in b)b[C]instanceof Array?w[C]=b[C].slice(0):w[C]=b[C]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var k=l.selectAll(".nv-noData").data([E]);return k.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),k.attr("x",u.left+v/2).attr("y",u.top+N/2).text(function(e){return e}),T}l.selectAll(".nv-noData").remove();var L=e.filter(function(e){return!e.disabled&&e.bar}),A=e.filter(function(e){return!e.bar});m=A.filter(function(e){return!e.disabled}).length&&A.filter(function(e){return!e.disabled})[0].values.length?t.xScale():n.xScale(),g=n.yScale(),y=t.yScale();var O=d3.select(this).selectAll("g.nv-wrap.nv-linePlusBar").data([e]),M=O.enter().append("g").attr("class","nvd3 nv-wrap nv-linePlusBar").append("g"),_=O.select("g");M.append("g").attr("class","nv-x nv-axis"),M.append("g").attr("class","nv-y1 nv-axis"),M.append("g").attr("class","nv-y2 nv-axis"),M.append("g").attr("class","nv-barsWrap"),M.append("g").attr("class","nv-linesWrap"),M.append("g").attr("class","nv-legendWrap"),p&&(o.width(v/2),_.select(".nv-legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.bar?" (left axis)":" (right axis)"),e})).call(o),u.top!=o.height()&&(u.top=o.height(),N=(f||parseInt(l.style("height"))||400)-u.top-u.bottom),_.select(".nv-legendWrap").attr("transform","translate("+v/2+","+ -u.top+")")),O.attr("transform","translate("+u.left+","+u.top+")"),t.width(v).height(N).color(e.map(function(e,t){return e.color||h(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar})),n.width(v).height(N).color(e.map(function(e,t){return e.color||h(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n].bar}));var D=_.select(".nv-barsWrap").datum(L.length?L:[{values:[]}]),P=_.select(".nv-linesWrap").datum(A[0]&&!A[0].disabled?A:[{values:[]}]);d3.transition(D).call(n),d3.transition(P).call(t),r.scale(m).ticks(v/100).tickSize(-N,0),_.select(".nv-x.nv-axis").attr("transform","translate(0,"+g.range()[0]+")"),d3.transition(_.select(".nv-x.nv-axis")).call(r),i.scale(g).ticks(N/36).tickSize(-v,0),d3.transition(_.select(".nv-y1.nv-axis")).style("opacity",L.length?1:0).call(i),s.scale(y).ticks(N/36).tickSize(L.length?0:-v,0),_.select(".nv-y2.nv-axis").style("opacity",A.length?1:0).attr("transform","translate("+v+",0)"),d3.transition(_.select(".nv-y2.nv-axis")).call(s),o.dispatch.on("stateChange",function(e){b=e,S.stateChange(b),T.update()}),S.on("tooltipShow",function(e){d&&x(e,c.parentNode)}),S.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),b.disabled=t.disabled),T.update()})}),T}var t=e.models.line(),n=e.models.historicalBar(),r=e.models.axis(),i=e.models.axis(),s=e.models.axis(),o=e.models.legend(),u={top:30,right:60,bottom:50,left:60},a=null,f=null,l=function(e){return e.x},c=function(e){return e.y},h=e.utils.defaultColor(),p=!0,d=!0,v=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},m,g,y,b={},w=null,E="No Data Available.",S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState");n.padData(!0),t.clipEdge(!1).padData(!0),r.orient("bottom").tickPadding(7).highlightZero(!1),i.orient("left"),s.orient("right");var x=function(n,o){var u=n.pos[0]+(o.offsetLeft||0),a=n.pos[1]+(o.offsetTop||0),f=r.tickFormat()(t.x()(n.point,n.pointIndex)),l=(n.series.bar?i:s).tickFormat()(t.y()(n.point,n.pointIndex)),c=v(n.series.key,f,l,n,T);e.tooltip.show([u,a],c,n.value<0?"n":"s",null,o)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+u.left,e.pos[1]+u.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),n.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+u.left,e.pos[1]+u.top],S.tooltipShow(e)}),n.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){d&&e.tooltip.cleanup()}),T.dispatch=S,T.legend=o,T.lines=t,T.bars=n,T.xAxis=r,T.y1Axis=i,T.y2Axis=s,d3.rebind(T,t,"defined","size","clipVoronoi","interpolate"),T.options=e.utils.optionsFunc.bind(T),T.x=function(e){return arguments.length?(l=e,t.x(e),n.x(e),T):l},T.y=function(e){return arguments.length?(c=e,t.y(e),n.y(e),T):c},T.margin=function(e){return arguments.length?(u.top=typeof e.top!="undefined"?e.top:u.top,u.right=typeof e.right!="undefined"?e.right:u.right,u.bottom=typeof e.bottom!="undefined"?e.bottom:u.bottom,u.left=typeof e.left!="undefined"?e.left:u.left,T):u},T.width=function(e){return arguments.length?(a=e,T):a},T.height=function(e){return arguments.length?(f=e,T):f},T.color=function(t){return arguments.length?(h=e.utils.getColor(t),o.color(h),T):h},T.showLegend=function(e){return arguments.length?(p=e,T):p},T.tooltips=function(e){return arguments.length?(d=e,T):d},T.tooltipContent=function(e){return arguments.length?(v=e,T):v},T.state=function(e){return arguments.length?(b=e,T):b},T.defaultState=function(e){return arguments.length?(w=e,T):w},T.noData=function(e){return arguments.length?(E=e,T):E},T},e.models.lineWithFocusChart=function(){"use strict";function k(e){return e.each(function(e){function U(e){var t=+(e=="e"),n=t?1:-1,r=M/3;return"M"+.5*n+","+r+"A6,6 0 0 "+t+" "+6.5*n+","+(r+6)+"V"+(2*r-6)+"A6,6 0 0 "+t+" "+.5*n+","+2*r+"Z"+"M"+2.5*n+","+(r+8)+"V"+(2*r-8)+"M"+4.5*n+","+(r+8)+"V"+(2*r-8)}function z(){a.empty()||a.extent(w),I.data([a.empty()?g.domain():w]).each(function(e,t){var n=g(e[0])-v.range()[0],r=v.range()[1]-g(e[1]);d3.select(this).select(".left").attr("width",n<0?0:n),d3.select(this).select(".right").attr("x",g(e[1])).attr("width",r<0?0:r)})}function W(){w=a.empty()?null:a.extent();var n=a.empty()?g.domain():a.extent();if(Math.abs(n[0]-n[1])<=1)return;T.brush({extent:n,brush:a}),z();var s=H.select(".nv-focus .nv-linesWrap").datum(e.filter(function(e){return!e.disabled}).map(function(e,r){return{key:e.key,values:e.values.filter(function(e,r){return t.x()(e,r)>=n[0]&&t.x()(e,r)<=n[1]})}}));s.transition().duration(N).call(t),H.select(".nv-focus .nv-x.nv-axis").transition().duration(N).call(r),H.select(".nv-focus .nv-y.nv-axis").transition().duration(N).call(i)}var S=d3.select(this),L=this,A=(h||parseInt(S.style("width"))||960)-f.left-f.right,O=(p||parseInt(S.style("height"))||400)-f.top-f.bottom-d,M=d-l.top-l.bottom;k.update=function(){S.transition().duration(N).call(k)},k.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var _=S.selectAll(".nv-noData").data([x]);return _.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),_.attr("x",f.left+A/2).attr("y",f.top+O/2).text(function(e){return e}),k}S.selectAll(".nv-noData").remove(),v=t.xScale(),m=t.yScale(),g=n.xScale(),y=n.yScale();var D=S.selectAll("g.nv-wrap.nv-lineWithFocusChart").data([e]),P=D.enter().append("g").attr("class","nvd3 nv-wrap nv-lineWithFocusChart").append("g"),H=D.select("g");P.append("g").attr("class","nv-legendWrap");var B=P.append("g").attr("class","nv-focus");B.append("g").attr("class","nv-x nv-axis"),B.append("g").attr("class","nv-y nv-axis"),B.append("g").attr("class","nv-linesWrap");var j=P.append("g").attr("class","nv-context");j.append("g").attr("class","nv-x nv-axis"),j.append("g").attr("class","nv-y nv-axis"),j.append("g").attr("class","nv-linesWrap"),j.append("g").attr("class","nv-brushBackground"),j.append("g").attr("class","nv-x nv-brush"),b&&(u.width(A),H.select(".nv-legendWrap").datum(e).call(u),f.top!=u.height()&&(f.top=u.height(),O=(p||parseInt(S.style("height"))||400)-f.top-f.bottom-d),H.select(".nv-legendWrap").attr("transform","translate(0,"+ -f.top+")")),D.attr("transform","translate("+f.left+","+f.top+")"),t.width(A).height(O).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),n.defined(t.defined()).width(A).height(M).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),H.select(".nv-context").attr("transform","translate(0,"+(O+f.bottom+l.top)+")");var F=H.select(".nv-context .nv-linesWrap").datum(e.filter(function(e){return!e.disabled}));d3.transition(F).call(n),r.scale(v).ticks(A/100).tickSize(-O,0),i.scale(m).ticks(O/36).tickSize(-A,0),H.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+O+")"),a.x(g).on("brush",function(){var e=k.transitionDuration();k.transitionDuration(0),W(),k.transitionDuration(e)}),w&&a.extent(w);var I=H.select(".nv-brushBackground").selectAll("g").data([w||a.extent()]),q=I.enter().append("g");q.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",M),q.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",M);var R=H.select(".nv-x.nv-brush").call(a);R.selectAll("rect").attr("height",M),R.selectAll(".resize").append("path").attr("d",U),W(),s.scale(g).ticks(A/100).tickSize(-M,0),H.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),d3.transition(H.select(".nv-context .nv-x.nv-axis")).call(s),o.scale(y).ticks(M/36).tickSize(-A,0),d3.transition(H.select(".nv-context .nv-y.nv-axis")).call(o),H.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+y.range()[0]+")"),u.dispatch.on("stateChange",function(e){k.update()}),T.on("tooltipShow",function(e){E&&C(e,L.parentNode)})}),k}var t=e.models.line(),n=e.models.line(),r=e.models.axis(),i=e.models.axis(),s=e.models.axis(),o=e.models.axis(),u=e.models.legend(),a=d3.svg.brush(),f={top:30,right:30,bottom:30,left:60},l={top:0,right:30,bottom:20,left:60},c=e.utils.defaultColor(),h=null,p=null,d=100,v,m,g,y,b=!0,w=null,E=!0,S=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},x="No Data Available.",T=d3.dispatch("tooltipShow","tooltipHide","brush"),N=250;t.clipEdge(!0),n.interactive(!1),r.orient("bottom").tickPadding(5),i.orient("left"),s.orient("bottom").tickPadding(5),o.orient("left");var C=function(n,s){var o=n.pos[0]+(s.offsetLeft||0),u=n.pos[1]+(s.offsetTop||0),a=r.tickFormat()(t.x()(n.point,n.pointIndex)),f=i.tickFormat()(t.y()(n.point,n.pointIndex)),l=S(n.series.key,a,f,n,k);e.tooltip.show([o,u],l,null,null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+f.left,e.pos[1]+f.top],T.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),T.on("tooltipHide",function(){E&&e.tooltip.cleanup()}),k.dispatch=T,k.legend=u,k.lines=t,k.lines2=n,k.xAxis=r,k.yAxis=i,k.x2Axis=s,k.y2Axis=o,d3.rebind(k,t,"defined","isArea","size","xDomain","yDomain","xRange","yRange","forceX","forceY","interactive","clipEdge","clipVoronoi","id"),k.options=e.utils.optionsFunc.bind(k),k.x=function(e){return arguments.length?(t.x(e),n.x(e),k):t.x},k.y=function(e){return arguments.length?(t.y(e),n.y(e),k):t.y},k.margin=function(e){return arguments.length?(f.top=typeof e.top!="undefined"?e.top:f.top,f.right=typeof e.right!="undefined"?e.right:f.right,f.bottom=typeof e.bottom!="undefined"?e.bottom:f.bottom,f.left=typeof e.left!="undefined"?e.left:f.left,k):f},k.margin2=function(e){return arguments.length?(l=e,k):l},k.width=function(e){return arguments.length?(h=e,k):h},k.height=function(e){return arguments.length?(p=e,k):p},k.height2=function(e){return arguments.length?(d=e,k):d},k.color=function(t){return arguments.length?(c=e.utils.getColor(t),u.color(c),k):c},k.showLegend=function(e){return arguments.length?(b=e,k):b},k.tooltips=function(e){return arguments.length?(E=e,k):E},k.tooltipContent=function(e){return arguments.length?(S=e,k):S},k.interpolate=function(e){return arguments.length?(t.interpolate(e),n.interpolate(e),k):t.interpolate()},k.noData=function(e){return arguments.length?(x=e,k):x},k.xTickFormat=function(e){return arguments.length?(r.tickFormat(e),s.tickFormat(e),k):r.tickFormat()},k.yTickFormat=function(e){return arguments.length?(i.tickFormat(e),o.tickFormat(e),k):i.tickFormat()},k.brushExtent=function(e){return arguments.length?(w=e,k):w},k.transitionDuration=function(e){return arguments.length?(N=e,k):N},k},e.models.linePlusBarWithFocusChart=function(){"use strict";function B(e){return e.each(function(e){function nt(e){var t=+(e=="e"),n=t?1:-1,r=q/3;return"M"+.5*n+","+r+"A6,6 0 0 "+t+" "+6.5*n+","+(r+6)+"V"+(2*r-6)+"A6,6 0 0 "+t+" "+.5*n+","+2*r+"Z"+"M"+2.5*n+","+(r+8)+"V"+(2*r-8)+"M"+4.5*n+","+(r+8)+"V"+(2*r-8)}function rt(){h.empty()||h.extent(x),Z.data([h.empty()?k.domain():x]).each(function(e,t){var n=k(e[0])-k.range()[0],r=k.range()[1]-k(e[1]);d3.select(this).select(".left").attr("width",n<0?0:n),d3.select(this).select(".right").attr("x",k(e[1])).attr("width",r<0?0:r)})}function it(){x=h.empty()?null:h.extent(),S=h.empty()?k.domain():h.extent(),D.brush({extent:S,brush:h}),rt(),r.width(F).height(I).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n].bar})),t.width(F).height(I).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar}));var n=J.select(".nv-focus .nv-barsWrap").datum(U.length?U.map(function(e,t){return{key:e.key,values:e.values.filter(function(e,t){return r.x()(e,t)>=S[0]&&r.x()(e,t)<=S[1]})}}):[{values:[]}]),i=J.select(".nv-focus .nv-linesWrap").datum(z[0].disabled?[{values:[]}]:z.map(function(e,n){return{key:e.key,values:e.values.filter(function(e,n){return t.x()(e,n)>=S[0]&&t.x()(e,n)<=S[1]})}}));U.length?C=r.xScale():C=t.xScale(),s.scale(C).ticks(F/100).tickSize(-I,0),s.domain([Math.ceil(S[0]),Math.floor(S[1])]),J.select(".nv-x.nv-axis").transition().duration(P).call(s),n.transition().duration(P).call(r),i.transition().duration(P).call(t),J.select(".nv-focus .nv-x.nv-axis").attr("transform","translate(0,"+L.range()[0]+")"),u.scale(L).ticks(I/36).tickSize(-F,0),J.select(".nv-focus .nv-y1.nv-axis").style("opacity",U.length?1:0),a.scale(A).ticks(I/36).tickSize(U.length?0:-F,0),J.select(".nv-focus .nv-y2.nv-axis").style("opacity",z.length?1:0).attr("transform","translate("+C.range()[1]+",0)"),J.select(".nv-focus .nv-y1.nv-axis").transition().duration(P).call(u),J.select(".nv-focus .nv-y2.nv-axis").transition().duration(P).call(a)}var N=d3.select(this),j=this,F=(v||parseInt(N.style("width"))||960)-p.left-p.right,I=(m||parseInt(N.style("height"))||400)-p.top-p.bottom-g,q=g-d.top-d.bottom;B.update=function(){N.transition().duration(P).call(B)},B.container=this;if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var R=N.selectAll(".nv-noData").data([_]);return R.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),R.attr("x",p.left+F/2).attr("y",p.top+I/2).text(function(e){return e}),B}N.selectAll(".nv-noData").remove();var U=e.filter(function(e){return!e.disabled&&e.bar}),z=e.filter(function(e){return!e.bar});C=r.xScale(),k=o.scale(),L=r.yScale(),A=t.yScale(),O=i.yScale(),M=n.yScale();var W=e.filter(function(e){return!e.disabled&&e.bar}).map(function(e){return e.values.map(function(e,t){return{x:y(e,t),y:b(e,t)}})}),X=e.filter(function(e){return!e.disabled&&!e.bar}).map(function(e){return e.values.map(function(e,t){return{x:y(e,t),y:b(e,t)}})});C.range([0,F]),k.domain(d3.extent(d3.merge(W.concat(X)),function(e){return e.x})).range([0,F]);var V=N.selectAll("g.nv-wrap.nv-linePlusBar").data([e]),$=V.enter().append("g").attr("class","nvd3 nv-wrap nv-linePlusBar").append("g"),J=V.select("g");$.append("g").attr("class","nv-legendWrap");var K=$.append("g").attr("class","nv-focus");K.append("g").attr("class","nv-x nv-axis"),K.append("g").attr("class","nv-y1 nv-axis"),K.append("g").attr("class","nv-y2 nv-axis"),K.append("g").attr("class","nv-barsWrap"),K.append("g").attr("class","nv-linesWrap");var Q=$.append("g").attr("class","nv-context");Q.append("g").attr("class","nv-x nv-axis"),Q.append("g").attr("class","nv-y1 nv-axis"),Q.append("g").attr("class","nv-y2 nv-axis"),Q.append("g").attr("class","nv-barsWrap"),Q.append("g").attr("class","nv-linesWrap"),Q.append("g").attr("class","nv-brushBackground"),Q.append("g").attr("class","nv-x nv-brush"),E&&(c.width(F/2),J.select(".nv-legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.bar?" (left axis)":" (right axis)"),e})).call(c),p.top!=c.height()&&(p.top=c.height(),I=(m||parseInt(N.style("height"))||400)-p.top-p.bottom-g),J.select(".nv-legendWrap").attr("transform","translate("+F/2+","+ -p.top+")")),V.attr("transform","translate("+p.left+","+p.top+")"),i.width(F).height(q).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&e[n].bar})),n.width(F).height(q).color(e.map(function(e,t){return e.color||w(e,t)}).filter(function(t,n){return!e[n].disabled&&!e[n].bar}));var G=J.select(".nv-context .nv-barsWrap").datum(U.length?U:[{values:[]}]),Y=J.select(".nv-context .nv-linesWrap").datum(z[0].disabled?[{values:[]}]:z);J.select(".nv-context").attr("transform","translate(0,"+(I+p.bottom+d.top)+")"),G.transition().call(i),Y.transition().call(n),h.x(k).on("brush",it),x&&h.extent(x);var Z=J.select(".nv-brushBackground").selectAll("g").data([x||h.extent()]),et=Z.enter().append("g");et.append("rect").attr("class","left").attr("x",0).attr("y",0).attr("height",q),et.append("rect").attr("class","right").attr("x",0).attr("y",0).attr("height",q);var tt=J.select(".nv-x.nv-brush").call(h);tt.selectAll("rect").attr("height",q),tt.selectAll(".resize").append("path").attr("d",nt),o.ticks(F/100).tickSize(-q,0),J.select(".nv-context .nv-x.nv-axis").attr("transform","translate(0,"+O.range()[0]+")"),J.select(".nv-context .nv-x.nv-axis").transition().call(o),f.scale(O).ticks(q/36).tickSize(-F,0),J.select(".nv-context .nv-y1.nv-axis").style("opacity",U.length?1:0).attr("transform","translate(0,"+k.range()[0]+")"),J.select(".nv-context .nv-y1.nv-axis").transition().call(f),l.scale(M).ticks(q/36).tickSize(U.length?0:-F,0),J.select(".nv-context .nv-y2.nv-axis").style("opacity",z.length?1:0).attr("transform","translate("+k.range()[1]+",0)"),J.select(".nv-context .nv-y2.nv-axis").transition().call(l),c.dispatch.on("stateChange",function(e){B.update()}),D.on("tooltipShow",function(e){T&&H(e,j.parentNode)}),it()}),B}var t=e.models.line(),n=e.models.line(),r=e.models.historicalBar(),i=e.models.historicalBar(),s=e.models.axis(),o=e.models.axis(),u=e.models.axis(),a=e.models.axis(),f=e.models.axis(),l=e.models.axis(),c=e.models.legend(),h=d3.svg.brush(),p={top:30,right:30,bottom:30,left:60},d={top:0,right:30,bottom:20,left:60},v=null,m=null,g=100,y=function(e){return e.x},b=function(e){return e.y},w=e.utils.defaultColor(),E=!0,S,x=null,T=!0,N=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},C,k,L,A,O,M,_="No Data Available.",D=d3.dispatch("tooltipShow","tooltipHide","brush"),P=0;t.clipEdge(!0),n.interactive(!1),s.orient("bottom").tickPadding(5),u.orient("left"),a.orient("right"),o.orient("bottom").tickPadding(5),f.orient("left"),l.orient("right");var H=function(n,r){S&&(n.pointIndex+=Math.ceil(S[0]));var i=n.pos[0]+(r.offsetLeft||0),o=n.pos[1]+(r.offsetTop||0),f=s.tickFormat()(t.x()(n.point,n.pointIndex)),l=(n.series.bar?u:a).tickFormat()(t.y()(n.point,n.pointIndex)),c=N(n.series.key,f,l,n,B);e.tooltip.show([i,o],c,n.value<0?"n":"s",null,r)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+p.left,e.pos[1]+p.top],D.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){D.tooltipHide(e)}),r.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+p.left,e.pos[1]+p.top],D.tooltipShow(e)}),r.dispatch.on("elementMouseout.tooltip",function(e){D.tooltipHide(e)}),D.on("tooltipHide",function(){T&&e.tooltip.cleanup()}),B.dispatch=D,B.legend=c,B.lines=t,B.lines2=n,B.bars=r,B.bars2=i,B.xAxis=s,B.x2Axis=o,B.y1Axis=u,B.y2Axis=a,B.y3Axis=f,B.y4Axis=l,d3.rebind(B,t,"defined","size","clipVoronoi","interpolate"),B.options=e.utils.optionsFunc.bind(B),B.x=function(e){return arguments.length?(y=e,t.x(e),r.x(e),B):y},B.y=function(e){return arguments.length?(b=e,t.y(e),r.y(e),B):b},B.margin=function(e){return arguments.length?(p.top=typeof e.top!="undefined"?e.top:p.top,p.right=typeof e.right!="undefined"?e.right:p.right,p.bottom=typeof e.bottom!="undefined"?e.bottom:p.bottom,p.left=typeof e.left!="undefined"?e.left:p.left,B):p},B.width=function(e){return arguments.length?(v=e,B):v},B.height=function(e){return arguments.length?(m=e,B):m},B.color=function(t){return arguments.length?(w=e.utils.getColor(t),c.color(w),B):w},B.showLegend=function(e){return arguments.length?(E=e,B):E},B.tooltips=function(e){return arguments.length?(T=e,B):T},B.tooltipContent=function(e){return arguments.length?(N=e,B):N},B.noData=function(e){return arguments.length?(_=e,B):_},B.brushExtent=function(e){return arguments.length?(x=e,B):x},B},e.models.multiBar=function(){"use strict";function C(e){return e.each(function(e){var C=n-t.left-t.right,k=r-t.top-t.bottom,L=d3.select(this);d&&e.length&&(d=[{values:e[0].values.map(function(e){return{x:e.x,y:0,series:e.series,size:.01}})}]),c&&(e=d3.layout.stack().offset(h).values(function(e){return e.values}).y(a)(!e.length&&d?d:e)),e.forEach(function(e,t){e.values.forEach(function(e){e.series=t})}),c&&e[0].values.map(function(t,n){var r=0,i=0;e.map(function(e){var t=e.values[n];t.size=Math.abs(t.y),t.y<0?(t.y1=i,i-=t.size):(t.y1=t.size+r,r+=t.size)})});var A=y&&b?[]:e.map(function(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0,y1:e.y1}})});i.domain(y||d3.merge(A).map(function(e){return e.x})).rangeBands(w||[0,C],S),s.domain(b||d3.extent(d3.merge(A).map(function(e){return c?e.y>0?e.y1:e.y1+e.y:e.y}).concat(f))).range(E||[k,0]),i.domain()[0]===i.domain()[1]&&(i.domain()[0]?i.domain([i.domain()[0]-i.domain()[0]*.01,i.domain()[1]+i.domain()[1]*.01]):i.domain([-1,1])),s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]+s.domain()[0]*.01,s.domain()[1]-s.domain()[1]*.01]):s.domain([-1,1])),T=T||i,N=N||s;var O=L.selectAll("g.nv-wrap.nv-multibar").data([e]),M=O.enter().append("g").attr("class","nvd3 nv-wrap nv-multibar"),_=M.append("defs"),D=M.append("g"),P=O.select("g");D.append("g").attr("class","nv-groups"),O.attr("transform","translate("+t.left+","+t.top+")"),_.append("clipPath").attr("id","nv-edge-clip-"+o).append("rect"),O.select("#nv-edge-clip-"+o+" rect").attr("width",C).attr("height",k),P.attr("clip-path",l?"url(#nv-edge-clip-"+o+")":"");var H=O.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e,t){return t});H.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),H.exit().transition().selectAll("rect.nv-bar").delay(function(t,n){return n*g/e[0].values.length}).attr("y",function(e){return c?N(e.y0):N(0)}).attr("height",0).remove(),H.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return p(e,t)}).style("stroke",function(e,t){return p(e,t)}),H.transition().style("stroke-opacity",1).style("fill-opacity",.75);var B=H.selectAll("rect.nv-bar").data(function(t){return d&&!e.length?d.values:t.values});B.exit().remove();var j=B.enter().append("rect").attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).attr("x",function(t,n,r){return c?0:r*i.rangeBand()/e.length}).attr("y",function(e){return N(c?e.y0:0)}).attr("height",0).attr("width",i.rangeBand()/(c?1:e.length)).attr("transform",function(e,t){return"translate("+i(u(e,t))+",0)"});B.style("fill",function(e,t,n){return p(e,n,t)}).style("stroke",function(e,t,n){return p(e,n,t)}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),x.elementMouseover({value:a(t,n),point:t,series:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),x.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){x.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length
+,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){x.elementDblClick({value:a(t,n),point:t,series:e[t.series],pos:[i(u(t,n))+i.rangeBand()*(c?e.length/2:t.series+.5)/e.length,s(a(t,n)+(c?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}),B.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}).transition().attr("transform",function(e,t){return"translate("+i(u(e,t))+",0)"}),v&&(m||(m=e.map(function(){return!0})),B.style("fill",function(e,t,n){return d3.rgb(v(e,t)).darker(m.map(function(e,t){return t}).filter(function(e,t){return!m[t]})[n]).toString()}).style("stroke",function(e,t,n){return d3.rgb(v(e,t)).darker(m.map(function(e,t){return t}).filter(function(e,t){return!m[t]})[n]).toString()})),c?B.transition().delay(function(t,n){return n*g/e[0].values.length}).attr("y",function(e,t){return s(c?e.y1:0)}).attr("height",function(e,t){return Math.max(Math.abs(s(e.y+(c?e.y0:0))-s(c?e.y0:0)),1)}).attr("x",function(t,n){return c?0:t.series*i.rangeBand()/e.length}).attr("width",i.rangeBand()/(c?1:e.length)):B.transition().delay(function(t,n){return n*g/e[0].values.length}).attr("x",function(t,n){return t.series*i.rangeBand()/e.length}).attr("width",i.rangeBand()/e.length).attr("y",function(e,t){return a(e,t)<0?s(0):s(0)-s(a(e,t))<1?s(0)-1:s(a(e,t))||0}).attr("height",function(e,t){return Math.max(Math.abs(s(a(e,t))-s(0)),1)||0}),T=i.copy(),N=s.copy()}),C}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=d3.scale.ordinal(),s=d3.scale.linear(),o=Math.floor(Math.random()*1e4),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=!0,c=!1,h="zero",p=e.utils.defaultColor(),d=!1,v=null,m,g=1200,y,b,w,E,S=.1,x=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),T,N;return C.dispatch=x,C.options=e.utils.optionsFunc.bind(C),C.x=function(e){return arguments.length?(u=e,C):u},C.y=function(e){return arguments.length?(a=e,C):a},C.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,C):t},C.width=function(e){return arguments.length?(n=e,C):n},C.height=function(e){return arguments.length?(r=e,C):r},C.xScale=function(e){return arguments.length?(i=e,C):i},C.yScale=function(e){return arguments.length?(s=e,C):s},C.xDomain=function(e){return arguments.length?(y=e,C):y},C.yDomain=function(e){return arguments.length?(b=e,C):b},C.xRange=function(e){return arguments.length?(w=e,C):w},C.yRange=function(e){return arguments.length?(E=e,C):E},C.forceY=function(e){return arguments.length?(f=e,C):f},C.stacked=function(e){return arguments.length?(c=e,C):c},C.stackOffset=function(e){return arguments.length?(h=e,C):h},C.clipEdge=function(e){return arguments.length?(l=e,C):l},C.color=function(t){return arguments.length?(p=e.utils.getColor(t),C):p},C.barColor=function(t){return arguments.length?(v=e.utils.getColor(t),C):v},C.disabled=function(e){return arguments.length?(m=e,C):m},C.id=function(e){return arguments.length?(o=e,C):o},C.hideable=function(e){return arguments.length?(d=e,C):d},C.delay=function(e){return arguments.length?(g=e,C):g},C.groupSpacing=function(e){return arguments.length?(S=e,C):S},C},e.models.multiBarChart=function(){"use strict";function A(e){return e.each(function(e){var b=d3.select(this),O=this,M=(u||parseInt(b.style("width"))||960)-o.left-o.right,_=(a||parseInt(b.style("height"))||400)-o.top-o.bottom;A.update=function(){b.transition().duration(k).call(A)},A.container=this,S.disabled=e.map(function(e){return!!e.disabled});if(!x){var D;x={};for(D in S)S[D]instanceof Array?x[D]=S[D].slice(0):x[D]=S[D]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var P=b.selectAll(".nv-noData").data([T]);return P.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),P.attr("x",o.left+M/2).attr("y",o.top+_/2).text(function(e){return e}),A}b.selectAll(".nv-noData").remove(),w=t.xScale(),E=t.yScale();var H=b.selectAll("g.nv-wrap.nv-multiBarWithLegend").data([e]),B=H.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarWithLegend").append("g"),j=H.select("g");B.append("g").attr("class","nv-x nv-axis"),B.append("g").attr("class","nv-y nv-axis"),B.append("g").attr("class","nv-barsWrap"),B.append("g").attr("class","nv-legendWrap"),B.append("g").attr("class","nv-controlsWrap"),c&&(i.width(M-C()),t.barColor()&&e.forEach(function(e,t){e.color=d3.rgb("#ccc").darker(t*1.5).toString()}),j.select(".nv-legendWrap").datum(e).call(i),o.top!=i.height()&&(o.top=i.height(),_=(a||parseInt(b.style("height"))||400)-o.top-o.bottom),j.select(".nv-legendWrap").attr("transform","translate("+C()+","+ -o.top+")"));if(l){var F=[{key:"Grouped",disabled:t.stacked()},{key:"Stacked",disabled:!t.stacked()}];s.width(C()).color(["#444","#444","#444"]),j.select(".nv-controlsWrap").datum(F).attr("transform","translate(0,"+ -o.top+")").call(s)}H.attr("transform","translate("+o.left+","+o.top+")"),d&&j.select(".nv-y.nv-axis").attr("transform","translate("+M+",0)"),t.disabled(e.map(function(e){return e.disabled})).width(M).height(_).color(e.map(function(e,t){return e.color||f(e,t)}).filter(function(t,n){return!e[n].disabled}));var I=j.select(".nv-barsWrap").datum(e.filter(function(e){return!e.disabled}));I.transition().call(t);if(h){n.scale(w).ticks(M/100).tickSize(-_,0),j.select(".nv-x.nv-axis").attr("transform","translate(0,"+E.range()[0]+")"),j.select(".nv-x.nv-axis").transition().call(n);var q=j.select(".nv-x.nv-axis > g").selectAll("g");q.selectAll("line, text").style("opacity",1);if(m){var R=function(e,t){return"translate("+e+","+t+")"},U=5,z=17;q.selectAll("text").attr("transform",function(e,t,n){return R(0,n%2==0?U:z)});var W=d3.selectAll(".nv-x.nv-axis .nv-wrap g g text")[0].length;j.selectAll(".nv-x.nv-axis .nv-axisMaxMin text").attr("transform",function(e,t){return R(0,t===0||W%2!==0?z:U)})}v&&q.filter(function(t,n){return n%Math.ceil(e[0].values.length/(M/100))!==0}).selectAll("text, line").style("opacity",0),g&&q.selectAll(".tick text").attr("transform","rotate("+g+" 0,0)").style("text-anchor",g>0?"start":"end"),j.select(".nv-x.nv-axis").selectAll("g.nv-axisMaxMin text").style("opacity",1)}p&&(r.scale(E).ticks(_/36).tickSize(-M,0),j.select(".nv-y.nv-axis").transition().call(r)),i.dispatch.on("stateChange",function(e){S=e,N.stateChange(S),A.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;F=F.map(function(e){return e.disabled=!0,e}),e.disabled=!1;switch(e.key){case"Grouped":t.stacked(!1);break;case"Stacked":t.stacked(!0)}S.stacked=t.stacked(),N.stateChange(S),A.update()}),N.on("tooltipShow",function(e){y&&L(e,O.parentNode)}),N.on("changeState",function(n){typeof n.disabled!="undefined"&&(e.forEach(function(e,t){e.disabled=n.disabled[t]}),S.disabled=n.disabled),typeof n.stacked!="undefined"&&(t.stacked(n.stacked),S.stacked=n.stacked),A.update()})}),A}var t=e.models.multiBar(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o={top:30,right:20,bottom:50,left:60},u=null,a=null,f=e.utils.defaultColor(),l=!0,c=!0,h=!0,p=!0,d=!1,v=!0,m=!1,g=0,y=!0,b=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" on "+t+"</p>"},w,E,S={stacked:!1},x=null,T="No Data Available.",N=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),C=function(){return l?180:0},k=250;t.stacked(!1),n.orient("bottom").tickPadding(7).highlightZero(!0).showMaxMin(!1).tickFormat(function(e){return e}),r.orient(d?"right":"left").tickFormat(d3.format(",.1f")),s.updateState(!1);var L=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=b(i.series.key,a,f,i,A);e.tooltip.show([o,u],l,i.value<0?"n":"s",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],N.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){N.tooltipHide(e)}),N.on("tooltipHide",function(){y&&e.tooltip.cleanup()}),A.dispatch=N,A.multibar=t,A.legend=i,A.xAxis=n,A.yAxis=r,d3.rebind(A,t,"x","y","xDomain","yDomain","xRange","yRange","forceX","forceY","clipEdge","id","stacked","stackOffset","delay","barColor","groupSpacing"),A.options=e.utils.optionsFunc.bind(A),A.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,A):o},A.width=function(e){return arguments.length?(u=e,A):u},A.height=function(e){return arguments.length?(a=e,A):a},A.color=function(t){return arguments.length?(f=e.utils.getColor(t),i.color(f),A):f},A.showControls=function(e){return arguments.length?(l=e,A):l},A.showLegend=function(e){return arguments.length?(c=e,A):c},A.showXAxis=function(e){return arguments.length?(h=e,A):h},A.showYAxis=function(e){return arguments.length?(p=e,A):p},A.rightAlignYAxis=function(e){return arguments.length?(d=e,r.orient(e?"right":"left"),A):d},A.reduceXTicks=function(e){return arguments.length?(v=e,A):v},A.rotateLabels=function(e){return arguments.length?(g=e,A):g},A.staggerLabels=function(e){return arguments.length?(m=e,A):m},A.tooltip=function(e){return arguments.length?(b=e,A):b},A.tooltips=function(e){return arguments.length?(y=e,A):y},A.tooltipContent=function(e){return arguments.length?(b=e,A):b},A.state=function(e){return arguments.length?(S=e,A):S},A.defaultState=function(e){return arguments.length?(x=e,A):x},A.noData=function(e){return arguments.length?(T=e,A):T},A.transitionDuration=function(e){return arguments.length?(k=e,A):k},A},e.models.multiBarHorizontal=function(){"use strict";function C(e){return e.each(function(e){var i=n-t.left-t.right,y=r-t.top-t.bottom,C=d3.select(this);p&&(e=d3.layout.stack().offset("zero").values(function(e){return e.values}).y(a)(e)),e.forEach(function(e,t){e.values.forEach(function(e){e.series=t})}),p&&e[0].values.map(function(t,n){var r=0,i=0;e.map(function(e){var t=e.values[n];t.size=Math.abs(t.y),t.y<0?(t.y1=i-t.size,i-=t.size):(t.y1=r,r+=t.size)})});var k=b&&w?[]:e.map(function(e){return e.values.map(function(e,t){return{x:u(e,t),y:a(e,t),y0:e.y0,y1:e.y1}})});s.domain(b||d3.merge(k).map(function(e){return e.x})).rangeBands(E||[0,y],.1),o.domain(w||d3.extent(d3.merge(k).map(function(e){return p?e.y>0?e.y1+e.y:e.y1:e.y}).concat(f))),d&&!p?o.range(S||[o.domain()[0]<0?m:0,i-(o.domain()[1]>0?m:0)]):o.range(S||[0,i]),T=T||s,N=N||d3.scale.linear().domain(o.domain()).range([o(0),o(0)]);var L=d3.select(this).selectAll("g.nv-wrap.nv-multibarHorizontal").data([e]),A=L.enter().append("g").attr("class","nvd3 nv-wrap nv-multibarHorizontal"),O=A.append("defs"),M=A.append("g"),_=L.select("g");M.append("g").attr("class","nv-groups"),L.attr("transform","translate("+t.left+","+t.top+")");var D=L.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e,t){return t});D.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),D.exit().transition().style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),D.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}).style("fill",function(e,t){return l(e,t)}).style("stroke",function(e,t){return l(e,t)}),D.transition().style("stroke-opacity",1).style("fill-opacity",.75);var P=D.selectAll("g.nv-bar").data(function(e){return e.values});P.exit().remove();var H=P.enter().append("g").attr("transform",function(t,n,r){return"translate("+N(p?t.y0:0)+","+(p?0:r*s.rangeBand()/e.length+s(u(t,n)))+")"});H.append("rect").attr("width",0).attr("height",s.rangeBand()/(p?1:e.length)),P.on("mouseover",function(t,n){d3.select(this).classed("hover",!0),x.elementMouseover({value:a(t,n),point:t,series:e[t.series],pos:[o(a(t,n)+(p?t.y0:0)),s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),x.elementMouseout({value:a(t,n),point:t,series:e[t.series],pointIndex:n,seriesIndex:t.series,e:d3.event})}).on("click",function(t,n){x.elementClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length,o(a(t,n)+(p?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}).on("dblclick",function(t,n){x.elementDblClick({value:a(t,n),point:t,series:e[t.series],pos:[s(u(t,n))+s.rangeBand()*(p?e.length/2:t.series+.5)/e.length,o(a(t,n)+(p?t.y0:0))],pointIndex:n,seriesIndex:t.series,e:d3.event}),d3.event.stopPropagation()}),H.append("text"),d&&!p?(P.select("text").attr("text-anchor",function(e,t){return a(e,t)<0?"end":"start"}).attr("y",s.rangeBand()/(e.length*2)).attr("dy",".32em").text(function(e,t){return g(a(e,t))}),P.transition().select("text").attr("x",function(e,t){return a(e,t)<0?-4:o(a(e,t))-o(0)+4})):P.selectAll("text").text(""),v&&!p?(H.append("text").classed("nv-bar-label",!0),P.select("text.nv-bar-label").attr("text-anchor",function(e,t){return a(e,t)<0?"start":"end"}).attr("y",s.rangeBand()/(e.length*2)).attr("dy",".32em").text(function(e,t){return u(e,t)}),P.transition().select("text.nv-bar-label").attr("x",function(e,t){return a(e,t)<0?o(0)-o(a(e,t))+4:-4})):P.selectAll("text.nv-bar-label").text(""),P.attr("class",function(e,t){return a(e,t)<0?"nv-bar negative":"nv-bar positive"}),c&&(h||(h=e.map(function(){return!0})),P.style("fill",function(e,t,n){return d3.rgb(c(e,t)).darker(h.map(function(e,t){return t}).filter(function(e,t){return!h[t]})[n]).toString()}).style("stroke",function(e,t,n){return d3.rgb(c(e,t)).darker(h.map(function(e,t){return t}).filter(function(e,t){return!h[t]})[n]).toString()})),p?P.transition().attr("transform",function(e,t){return"translate("+o(e.y1)+","+s(u(e,t))+")"}).select("rect").attr("width",function(e,t){return Math.abs(o(a(e,t)+e.y0)-o(e.y0))}).attr("height",s.rangeBand()):P.transition().attr("transform",function(t,n){return"translate("+(a(t,n)<0?o(a(t,n)):o(0))+","+(t.series*s.rangeBand()/e.length+s(u(t,n)))+")"}).select("rect").attr("height",s.rangeBand()/e.length).attr("width",function(e,t){return Math.max(Math.abs(o(a(e,t))-o(0)),1)}),T=s.copy(),N=o.copy()}),C}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.ordinal(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=[0],l=e.utils.defaultColor(),c=null,h,p=!1,d=!1,v=!1,m=60,g=d3.format(",.2f"),y=1200,b,w,E,S,x=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout"),T,N;return C.dispatch=x,C.options=e.utils.optionsFunc.bind(C),C.x=function(e){return arguments.length?(u=e,C):u},C.y=function(e){return arguments.length?(a=e,C):a},C.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,C):t},C.width=function(e){return arguments.length?(n=e,C):n},C.height=function(e){return arguments.length?(r=e,C):r},C.xScale=function(e){return arguments.length?(s=e,C):s},C.yScale=function(e){return arguments.length?(o=e,C):o},C.xDomain=function(e){return arguments.length?(b=e,C):b},C.yDomain=function(e){return arguments.length?(w=e,C):w},C.xRange=function(e){return arguments.length?(E=e,C):E},C.yRange=function(e){return arguments.length?(S=e,C):S},C.forceY=function(e){return arguments.length?(f=e,C):f},C.stacked=function(e){return arguments.length?(p=e,C):p},C.color=function(t){return arguments.length?(l=e.utils.getColor(t),C):l},C.barColor=function(t){return arguments.length?(c=e.utils.getColor(t),C):c},C.disabled=function(e){return arguments.length?(h=e,C):h},C.id=function(e){return arguments.length?(i=e,C):i},C.delay=function(e){return arguments.length?(y=e,C):y},C.showValues=function(e){return arguments.length?(d=e,C):d},C.showBarLabels=function(e){return arguments.length?(v=e,C):v},C.valueFormat=function(e){return arguments.length?(g=e,C):g},C.valuePadding=function(e){return arguments.length?(m=e,C):m},C},e.models.multiBarHorizontalChart=function(){"use strict";function C(e){return e.each(function(e){var d=d3.select(this),m=this,k=(u||parseInt(d.style("width"))||960)-o.left-o.right,L=(a||parseInt(d.style("height"))||400)-o.top-o.bottom;C.update=function(){d.transition().duration(T).call(C)},C.container=this,b.disabled=e.map(function(e){return!!e.disabled});if(!w){var A;w={};for(A in b)b[A]instanceof Array?w[A]=b[A].slice(0):w[A]=b[A]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var O=d.selectAll(".nv-noData").data([E]);return O.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),O.attr("x",o.left+k/2).attr("y",o.top+L/2).text(function(e){return e}),C}d.selectAll(".nv-noData").remove(),g=t.xScale(),y=t.yScale();var M=d.selectAll("g.nv-wrap.nv-multiBarHorizontalChart").data([e]),_=M.enter().append("g").attr("class","nvd3 nv-wrap nv-multiBarHorizontalChart").append("g"),D=M.select("g");_.append("g").attr("class","nv-x nv-axis"),_.append("g").attr("class","nv-y nv-axis").append("g").attr("class","nv-zeroLine").append("line"),_.append("g").attr("class","nv-barsWrap"),_.append("g").attr("class","nv-legendWrap"),_.append("g").attr("class","nv-controlsWrap"),c&&(i.width(k-x()),t.barColor()&&e.forEach(function(e,t){e.color=d3.rgb("#ccc").darker(t*1.5).toString()}),D.select(".nv-legendWrap").datum(e).call(i),o.top!=i.height()&&(o.top=i.height(),L=(a||parseInt(d.style("height"))||400)-o.top-o.bottom),D.select(".nv-legendWrap").attr("transform","translate("+x()+","+ -o.top+")"));if(l){var P=[{key:"Grouped",disabled:t.stacked()},{key:"Stacked",disabled:!t.stacked()}];s.width(x()).color(["#444","#444","#444"]),D.select(".nv-controlsWrap").datum(P).attr("transform","translate(0,"+ -o.top+")").call(s)}M.attr("transform","translate("+o.left+","+o.top+")"),t.disabled(e.map(function(e){return e.disabled})).width(k).height(L).color(e.map(function(e,t){return e.color||f(e,t)}).filter(function(t,n){return!e[n].disabled}));var H=D.select(".nv-barsWrap").datum(e.filter(function(e){return!e.disabled}));H.transition().call(t);if(h){n.scale(g).ticks(L/24).tickSize(-k,0),D.select(".nv-x.nv-axis").transition().call(n);var B=D.select(".nv-x.nv-axis").selectAll("g");B.selectAll("line, text")}p&&(r.scale(y).ticks(k/100).tickSize(-L,0),D.select(".nv-y.nv-axis").attr("transform","translate(0,"+L+")"),D.select(".nv-y.nv-axis").transition().call(r)),D.select(".nv-zeroLine line").attr("x1",y(0)).attr("x2",y(0)).attr("y1",0).attr("y2",-L),i.dispatch.on("stateChange",function(e){b=e,S.stateChange(b),C.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;P=P.map(function(e){return e.disabled=!0,e}),e.disabled=!1;switch(e.key){case"Grouped":t.stacked(!1);break;case"Stacked":t.stacked(!0)}b.stacked=t.stacked(),S.stateChange(b),C.update()}),S.on("tooltipShow",function(e){v&&N(e,m.parentNode)}),S.on("changeState",function(n){typeof n.disabled!="undefined"&&(e.forEach(function(e,t){e.disabled=n.disabled[t]}),b.disabled=n.disabled),typeof n.stacked!="undefined"&&(t.stacked(n.stacked),b.stacked=n.stacked),C.update()})}),C}var t=e.models.multiBarHorizontal(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend().height(30),s=e.models.legend().height(30),o={top:30,right:20,bottom:50,left:60},u=null,a=null,f=e.utils.defaultColor(),l=!0,c=!0,h=!0,p=!0,d=!1,v=!0,m=function(e,t,n,r,i){return"<h3>"+e+" - "+t+"</h3>"+"<p>"+n+"</p>"},g,y,b={stacked:d},w=null,E="No Data Available.",S=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),x=function(){return l?180:0},T=250;t.stacked(d),n.orient("left").tickPadding(5).highlightZero(!1).showMaxMin(!1).tickFormat(function(e){return e}),r.orient("bottom").tickFormat(d3.format(",.1f")),s.updateState(!1);var N=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=m(i.series.key,a,f,i,C);e.tooltip.show([o,u],l,i.value<0?"e":"w",null,s)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+o.left,e.pos[1]+o.top],S.tooltipShow(e)}),t.dispatch.on("elementMouseout.tooltip",function(e){S.tooltipHide(e)}),S.on("tooltipHide",function(){v&&e.tooltip.cleanup()}),C.dispatch=S,C.multibar=t,C.legend=i,C.xAxis=n,C.yAxis=r,d3.rebind(C,t,"x","y","xDomain","yDomain","xRange","yRange","forceX","forceY","clipEdge","id","delay","showValues","showBarLabels","valueFormat","stacked","barColor"),C.options=e.utils.optionsFunc.bind(C),C.margin=function(e){return arguments.length?(o.top=typeof e.top!="undefined"?e.top:o.top,o.right=typeof e.right!="undefined"?e.right:o.right,o.bottom=typeof e.bottom!="undefined"?e.bottom:o.bottom,o.left=typeof e.left!="undefined"?e.left:o.left,C):o},C.width=function(e){return arguments.length?(u=e,C):u},C.height=function(e){return arguments.length?(a=e,C):a},C.color=function(t){return arguments.length?(f=e.utils.getColor(t),i.color(f),C):f},C.showControls=function(e){return arguments.length?(l=e,C):l},C.showLegend=function(e){return arguments.length?(c=e,C):c},C.showXAxis=function(e){return arguments.length?(h=e,C):h},C.showYAxis=function(e){return arguments.length?(p=e,C):p},C.tooltip=function(e){return arguments.length?(m=e,C):m},C.tooltips=function(e){return arguments.length?(v=e,C):v},C.tooltipContent=function(e){return arguments.length?(m=e,C):m},C.state=function(e){return arguments.length?(b=e,C):b},C.defaultState=function(e){return arguments.length?(w=e,C):w},C.noData=function(e){return arguments.length?(E=e,C):E},C.transitionDuration=function(e){return arguments.length?(T=e,C):T},C},e.models.multiChart=function(){"use strict";function C(e){return e.each(function(e){var u=d3.select(this),f=this;C.update=function(){u.transition().call(C)},C.container=this;var k=(r||parseInt(u.style("width"))||960)-t.left-t.right,L=(i||parseInt(u.style("height"))||400)-t.top-t.bottom,A=e.filter(function(e){return!e.disabled&&e.type=="line"&&e.yAxis==1}),O=e.filter(function(e){return!e.disabled&&e.type=="line"&&e.yAxis==2}),M=e.filter(function(e){return!e.disabled&&e.type=="bar"&&e.yAxis==1}),_=e.filter(function(e){return!e.disabled&&e.type=="bar"&&e.yAxis==2}),D=e.filter(function(e){return!e.disabled&&e.type=="area"&&e.yAxis==1}),P=e.filter(function(e){return!e.disabled&&e.type=="area"&&e.yAxis==2}),H=e.filter(function(e){return!e.disabled&&e.yAxis==1}).map(function(e){return e.values.map(function(e,t){return{x:e.x,y:e.y}})}),B=e.filter(function(e){return!e.disabled&&e.yAxis==2}).map(function(e){return e.values.map(function(e,t){return{x:e.x,y:e.y}})});a.domain(d3.extent(d3.merge(H.concat(B)),function(e){return e.x})).range([0,k]);var j=u.selectAll("g.wrap.multiChart").data([e]),F=j.enter().append("g").attr("class","wrap nvd3 multiChart").append("g");F.append("g").attr("class","x axis"),F.append("g").attr("class","y1 axis"),F.append("g").attr("class","y2 axis"),F.append("g").attr("class","lines1Wrap"),F.append("g").attr("class","lines2Wrap"),F.append("g").attr("class","bars1Wrap"),F.append("g").attr("class","bars2Wrap"),F.append("g").attr("class","stack1Wrap"),F.append("g").attr("class","stack2Wrap"),F.append("g").attr("class","legendWrap");var I=j.select("g");s&&(x.width(k/2),I.select(".legendWrap").datum(e.map(function(e){return e.originalKey=e.originalKey===undefined?e.key:e.originalKey,e.key=e.originalKey+(e.yAxis==1?"":" (right axis)"),e})).call(x),t.top!=x.height()&&(t.top=x.height(),L=(i||parseInt(u.style("height"))||400)-t.top-t.bottom),I.select(".legendWrap").attr("transform","translate("+k/2+","+ -t.top+")")),d.width(k).height(L).interpolate("monotone").color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="line"})),v.width(k).height(L).interpolate("monotone").color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type=="line"})),m.width(k).height(L).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="bar"})),g.width(k).height(L).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type=="bar"})),y.width(k).height(L).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==1&&e[n].type=="area"})),b.width(k).height(L).color(e.map(function(e,t){return e.color||n[t%n.length]}).filter(function(t,n){return!e[n].disabled&&e[n].yAxis==2&&e[n].type=="area"})),I.attr("transform","translate("+t.left+","+t.top+")");var q=I.select(".lines1Wrap").datum(A),R=I.select(".bars1Wrap").datum(M),U=I.select(".stack1Wrap").datum(D),z=I.select(".lines2Wrap").datum(O),W=I.select(".bars2Wrap").datum(_),X=I.select(".stack2Wrap").datum(P),V=D.length?D.map(function(e){return e.values}).reduce(function(e,t){return e.map(function(e,n){return{x:e.x,y:e.y+t[n].y}})}).concat([{x:0,y:0}]):[],$=P.length?P.map(function(e){return e.values}).reduce(function(e,t){return e.map(function(e,n){return{x:e.x,y:e.y+t[n].y}})}).concat([{x:0,y:0}]):[];h.domain(l||d3.extent(d3.merge(H).concat(V),function(e){return e.y})).range([0,L]),p.domain(c||d3.extent(d3.merge(B).concat($),function(e){return e.y})).range([0,L]),d.yDomain(h.domain()),m.yDomain(h.domain()),y.yDomain(h.domain()),v.yDomain(p.domain()),g.yDomain(p.domain()),b.yDomain(p.domain()),D.length&&d3.transition(U).call(y),P.length&&d3.transition(X).call(b),M.length&&d3.transition(R).call(m),_.length&&d3.transition(W).call(g),A.length&&d3.transition(q).call(d),O.length&&d3.transition(z).call(v),w.ticks(k/100).tickSize(-L,0),I.select(".x.axis").attr("transform","translate(0,"+L+")"),d3.transition(I.select(".x.axis")).call(w),E.ticks(L/36).tickSize(-k,0),d3.transition(I.select(".y1.axis")).call(E),S.ticks(L/36).tickSize(-k,0),d3.transition(I.select(".y2.axis")).call(S),I.select(".y2.axis").style("opacity",B.length?1:0).attr("transform","translate("+a.range()[1]+",0)"),x.dispatch.on("stateChange",function(e){C.update()}),T.on("tooltipShow",function(e){o&&N(e,f.parentNode)})}),C}var t={top:30,right:20,bottom:50,left:60},n=d3.scale.category20().range(),r=null,i=null,s=!0,o=!0,u=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" at "+t+"</p>"},a,f,l,c,a=d3.scale.linear(),h=d3.scale.linear(),p=d3.scale.linear(),d=e.models.line().yScale(h),v=e.models.line().yScale(p),m=e.models.multiBar().stacked(!1).yScale(h),g=e.models.multiBar().stacked(!1).yScale(p),y=e.models.stackedArea().yScale(h),b=e.models.stackedArea().yScale(p),w=e.models.axis().scale(a).orient("bottom").tickPadding(5),E=e.models.axis().scale(h).orient("left"),S=e.models.axis().scale(p).orient("right"),x=e.models.legend().height(30),T=d3.dispatch("tooltipShow","tooltipHide"),N=function(t,n){var r=t.pos[0]+(n.offsetLeft||0),i=t.pos[1]+(n.offsetTop||0),s=w.tickFormat()(d.x()(t.point,t.pointIndex)),o=(t.series.yAxis==2?S:E).tickFormat()(d.y()(t.point,t.pointIndex)),a=u(t.series.key,s,o,t,C);e.tooltip.show([r,i],a,undefined,undefined,n.offsetParent)};return d.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],T.tooltipShow(e)}),d.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),v.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],T.tooltipShow(e)}),v.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),m.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],T.tooltipShow(e)}),m.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),g.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],T.tooltipShow(e)}),g.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),y.dispatch.on("tooltipShow",function(e){if(!Math.round(y.y()(e.point)*100))return setTimeout(function(){d3.selectAll(".point.hover").classed("hover",!1)},0),!1;e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],T.tooltipShow(e)}),y.dispatch.on("tooltipHide",function(e){T.tooltipHide(e)}),b.dispatch.on("tooltipShow",function(e){if(!Math.round(b.y()(e.point)*100))return setTimeout(function(){d3.selectAll(".point.hover").classed("hover",!1)},0),!1;e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],T.tooltipShow(e)}),b.dispatch.on("tooltipHide",function(e){T.tooltipHide(e)}),d.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],T.tooltipShow(e)}),d.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),v.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],T.tooltipShow(e)}),v.dispatch.on("elementMouseout.tooltip",function(e){T.tooltipHide(e)}),T.on("tooltipHide",function(){o&&e.tooltip.cleanup()}),C.dispatch=T,C.lines1=d,C.lines2=v,C.bars1=m,C.bars2=g,C.stack1=y,C.stack2=b,C.xAxis=w,C.yAxis1=E,C.yAxis2=S,C.options=e.utils.optionsFunc.bind(C),C.x=function(e){return arguments.length?(getX=e,d.x(e),m.x(e),C):getX},C.y=function(e){return arguments.length?(getY=e,d.y(e),m.y(e),C):getY},C.yDomain1=function(e){return arguments.length?(l=e,C):l},C.yDomain2=function(e){return arguments.length?(c=e,C):c},C.margin=function(e){return arguments.length?(t=e,C):t},C.width=function(e){return arguments.length?(r=e,C):r},C.height=function(e){return arguments.length?(i=e,C):i},C.color=function(e){return arguments.length?(n=e,x.color(e),C):n},C.showLegend=function(e){return arguments.length?(s=e,C):s},C.tooltips=function(e){return arguments.length?(o=e,C):o},C.tooltipContent=function(e){return arguments.length?(u=e,C):u},C},e.models.ohlcBar=function(){"use strict";function x(e){return e.each(function(e){var g=n-t.left-t.right,x=r-t.top-t.bottom,T=d3.select(this);s.domain(y||d3.extent(e[0].values.map(u).concat(p))),v?s.range(w||[g*.5/e[0].values.length,g*(e[0].values.length-.5)/e[0].values.length]):s.range(w||[0,g]),o.domain(b||[d3.min(e[0].values.map(h).concat(d)),d3.max(e[0].values.map(c).concat(d))]).range(E||[x,0]),s.domain()[0]===s.domain()[1]&&(s.domain()[0]?s.domain([s.domain()[0]-s.domain()[0]*.01,s.domain()[1]+s.domain()[1]*.01]):s.domain([-1,1])),o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]+o.domain()[0]*.01,o.domain()[1]-o.domain()[1]*.01]):o.domain([-1,1]));var N=d3.select(this).selectAll("g.nv-wrap.nv-ohlcBar").data([e[0].values]),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-ohlcBar"),k=C.append("defs"),L=C.append("g"),A=N.select("g");L.append("g").attr("class","nv-ticks"),N.attr("transform","translate("+t.left+","+t.top+")"),T.on("click",function(e,t){S.chartClick({data:e,index:t,pos:d3.event,id:i})}),k.append("clipPath").attr("id","nv-chart-clip-path-"+i).append("rect"),N.select("#nv-chart-clip-path-"+i+" rect").attr("width",g).attr("height",x),A.attr("clip-path",m?"url(#nv-chart-clip-path-"+i+")":"");var O=N.select(".nv-ticks").selectAll(".nv-tick").data(function(e){return e});O.exit().remove();var M=O.enter().append("path").attr("class",function(e,t,n){return(f(e,t)>l(e,t)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+n+"-"+t}).attr("d",function(t,n){var r=g/e[0].values.length*.9;return"m0,0l0,"+(o(f(t,n))-o(c(t,n)))+"l"+ -r/2+",0l"+r/2+",0l0,"+(o(h(t,n))-o(f(t,n)))+"l0,"+(o(l(t,n))-o(h(t,n)))+"l"+r/2+",0l"+ -r/2+",0z"}).attr("transform",function(e,t){return"translate("+s(u(e,t))+","+o(c(e,t))+")"}).on("mouseover",function(t,n){d3.select(this).classed("hover",!0),S.elementMouseover({point:t,series:e[0],pos:[s(u(t,n)),o(a(t,n))],pointIndex:n,seriesIndex:0,e:d3.event})}).on("mouseout",function(t,n){d3.select(this).classed("hover",!1),S.elementMouseout({point:t,series:e[0],pointIndex:n,seriesIndex:0,e:d3.event})}).on("click",function(e,t){S.elementClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()}).on("dblclick",function(e,t){S.elementDblClick({value:a(e,t),data:e,index:t,pos:[s(u(e,t)),o(a(e,t))],e:d3.event,id:i}),d3.event.stopPropagation()});O.attr("class",function(e,t,n){return(f(e,t)>l(e,t)?"nv-tick negative":"nv-tick positive")+" nv-tick-"+n+"-"+t}),d3.transition(O).attr("transform",function(e,t){return"translate("+s(u(e,t))+","+o(c(e,t))+")"}).attr("d",function(t,n){var r=g/e[0].values.length*.9;return"m0,0l0,"+(o(f(t,n))-o(c(t,n)))+"l"+ -r/2+",0l"+r/2+",0l0,"+(o(h(t,n))-o(f(t,n)))+"l0,"+(o(l(t,n))-o(h(t,n)))+"l"+r/2+",0l"+ -r/2+",0z"})}),x}var t={top:0
+,right:0,bottom:0,left:0},n=960,r=500,i=Math.floor(Math.random()*1e4),s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=function(e){return e.open},l=function(e){return e.close},c=function(e){return e.high},h=function(e){return e.low},p=[],d=[],v=!1,m=!0,g=e.utils.defaultColor(),y,b,w,E,S=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout");return x.dispatch=S,x.options=e.utils.optionsFunc.bind(x),x.x=function(e){return arguments.length?(u=e,x):u},x.y=function(e){return arguments.length?(a=e,x):a},x.open=function(e){return arguments.length?(f=e,x):f},x.close=function(e){return arguments.length?(l=e,x):l},x.high=function(e){return arguments.length?(c=e,x):c},x.low=function(e){return arguments.length?(h=e,x):h},x.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,x):t},x.width=function(e){return arguments.length?(n=e,x):n},x.height=function(e){return arguments.length?(r=e,x):r},x.xScale=function(e){return arguments.length?(s=e,x):s},x.yScale=function(e){return arguments.length?(o=e,x):o},x.xDomain=function(e){return arguments.length?(y=e,x):y},x.yDomain=function(e){return arguments.length?(b=e,x):b},x.xRange=function(e){return arguments.length?(w=e,x):w},x.yRange=function(e){return arguments.length?(E=e,x):E},x.forceX=function(e){return arguments.length?(p=e,x):p},x.forceY=function(e){return arguments.length?(d=e,x):d},x.padData=function(e){return arguments.length?(v=e,x):v},x.clipEdge=function(e){return arguments.length?(m=e,x):m},x.color=function(t){return arguments.length?(g=e.utils.getColor(t),x):g},x.id=function(e){return arguments.length?(i=e,x):i},x},e.models.pie=function(){"use strict";function S(e){return e.each(function(e){function q(e){var t=(e.startAngle+e.endAngle)*90/Math.PI-90;return t>90?t-180:t}function R(e){e.endAngle=isNaN(e.endAngle)?0:e.endAngle,e.startAngle=isNaN(e.startAngle)?0:e.startAngle,m||(e.innerRadius=0);var t=d3.interpolate(this._current,e);return this._current=t(0),function(e){return A(t(e))}}function U(e){e.innerRadius=0;var t=d3.interpolate({startAngle:0,endAngle:0},e);return function(e){return A(t(e))}}var o=n-t.left-t.right,f=r-t.top-t.bottom,S=Math.min(o,f)/2,x=S-S/5,T=d3.select(this),N=T.selectAll(".nv-wrap.nv-pie").data(e),C=N.enter().append("g").attr("class","nvd3 nv-wrap nv-pie nv-chart-"+u),k=C.append("g"),L=N.select("g");k.append("g").attr("class","nv-pie"),k.append("g").attr("class","nv-pieLabels"),N.attr("transform","translate("+t.left+","+t.top+")"),L.select(".nv-pie").attr("transform","translate("+o/2+","+f/2+")"),L.select(".nv-pieLabels").attr("transform","translate("+o/2+","+f/2+")"),T.on("click",function(e,t){E.chartClick({data:e,index:t,pos:d3.event,id:u})});var A=d3.svg.arc().outerRadius(x);y&&A.startAngle(y),b&&A.endAngle(b),m&&A.innerRadius(S*w);var O=d3.layout.pie().sort(null).value(function(e){return e.disabled?0:s(e)}),M=N.select(".nv-pie").selectAll(".nv-slice").data(O),_=N.select(".nv-pieLabels").selectAll(".nv-label").data(O);M.exit().remove(),_.exit().remove();var D=M.enter().append("g").attr("class","nv-slice").on("mouseover",function(e,t){d3.select(this).classed("hover",!0),E.elementMouseover({label:i(e.data),value:s(e.data),point:e.data,pointIndex:t,pos:[d3.event.pageX,d3.event.pageY],id:u})}).on("mouseout",function(e,t){d3.select(this).classed("hover",!1),E.elementMouseout({label:i(e.data),value:s(e.data),point:e.data,index:t,id:u})}).on("click",function(e,t){E.elementClick({label:i(e.data),value:s(e.data),point:e.data,index:t,pos:d3.event,id:u}),d3.event.stopPropagation()}).on("dblclick",function(e,t){E.elementDblClick({label:i(e.data),value:s(e.data),point:e.data,index:t,pos:d3.event,id:u}),d3.event.stopPropagation()});M.attr("fill",function(e,t){return a(e,t)}).attr("stroke",function(e,t){return a(e,t)});var P=D.append("path").each(function(e){this._current=e});M.select("path").transition().attr("d",A).attrTween("d",R);if(l){var H=d3.svg.arc().innerRadius(0);c&&(H=A),h&&(H=d3.svg.arc().outerRadius(A.outerRadius())),_.enter().append("g").classed("nv-label",!0).each(function(e,t){var n=d3.select(this);n.attr("transform",function(e){if(g){e.outerRadius=x+10,e.innerRadius=x+15;var t=(e.startAngle+e.endAngle)/2*(180/Math.PI);return(e.startAngle+e.endAngle)/2<Math.PI?t-=90:t+=90,"translate("+H.centroid(e)+") rotate("+t+")"}return e.outerRadius=S+10,e.innerRadius=S+15,"translate("+H.centroid(e)+")"}),n.append("rect").style("stroke","#fff").style("fill","#fff").attr("rx",3).attr("ry",3),n.append("text").style("text-anchor",g?(e.startAngle+e.endAngle)/2<Math.PI?"start":"end":"middle").style("fill","#000")});var B={},j=14,F=140,I=function(e){return Math.floor(e[0]/F)*F+","+Math.floor(e[1]/j)*j};_.transition().attr("transform",function(e){if(g){e.outerRadius=x+10,e.innerRadius=x+15;var t=(e.startAngle+e.endAngle)/2*(180/Math.PI);return(e.startAngle+e.endAngle)/2<Math.PI?t-=90:t+=90,"translate("+H.centroid(e)+") rotate("+t+")"}e.outerRadius=S+10,e.innerRadius=S+15;var n=H.centroid(e),r=I(n);return B[r]&&(n[1]-=j),B[I(n)]=!0,"translate("+n+")"}),_.select(".nv-label text").style("text-anchor",g?(d.startAngle+d.endAngle)/2<Math.PI?"start":"end":"middle").text(function(e,t){var n=(e.endAngle-e.startAngle)/(2*Math.PI),r={key:i(e.data),value:s(e.data),percent:d3.format("%")(n)};return e.value&&n>v?r[p]:""})}}),S}var t={top:0,right:0,bottom:0,left:0},n=500,r=500,i=function(e){return e.x},s=function(e){return e.y},o=function(e){return e.description},u=Math.floor(Math.random()*1e4),a=e.utils.defaultColor(),f=d3.format(",.2f"),l=!0,c=!0,h=!1,p="key",v=.02,m=!1,g=!1,y=!1,b=!1,w=.5,E=d3.dispatch("chartClick","elementClick","elementDblClick","elementMouseover","elementMouseout");return S.dispatch=E,S.options=e.utils.optionsFunc.bind(S),S.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,S):t},S.width=function(e){return arguments.length?(n=e,S):n},S.height=function(e){return arguments.length?(r=e,S):r},S.values=function(t){return e.log("pie.values() is no longer supported."),S},S.x=function(e){return arguments.length?(i=e,S):i},S.y=function(e){return arguments.length?(s=d3.functor(e),S):s},S.description=function(e){return arguments.length?(o=e,S):o},S.showLabels=function(e){return arguments.length?(l=e,S):l},S.labelSunbeamLayout=function(e){return arguments.length?(g=e,S):g},S.donutLabelsOutside=function(e){return arguments.length?(h=e,S):h},S.pieLabelsOutside=function(e){return arguments.length?(c=e,S):c},S.labelType=function(e){return arguments.length?(p=e,p=p||"key",S):p},S.donut=function(e){return arguments.length?(m=e,S):m},S.donutRatio=function(e){return arguments.length?(w=e,S):w},S.startAngle=function(e){return arguments.length?(y=e,S):y},S.endAngle=function(e){return arguments.length?(b=e,S):b},S.id=function(e){return arguments.length?(u=e,S):u},S.color=function(t){return arguments.length?(a=e.utils.getColor(t),S):a},S.valueFormat=function(e){return arguments.length?(f=e,S):f},S.labelThreshold=function(e){return arguments.length?(v=e,S):v},S},e.models.pieChart=function(){"use strict";function v(e){return e.each(function(e){var u=d3.select(this),a=this,f=(i||parseInt(u.style("width"))||960)-r.left-r.right,d=(s||parseInt(u.style("height"))||400)-r.top-r.bottom;v.update=function(){u.transition().call(v)},v.container=this,l.disabled=e.map(function(e){return!!e.disabled});if(!c){var m;c={};for(m in l)l[m]instanceof Array?c[m]=l[m].slice(0):c[m]=l[m]}if(!e||!e.length){var g=u.selectAll(".nv-noData").data([h]);return g.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),g.attr("x",r.left+f/2).attr("y",r.top+d/2).text(function(e){return e}),v}u.selectAll(".nv-noData").remove();var y=u.selectAll("g.nv-wrap.nv-pieChart").data([e]),b=y.enter().append("g").attr("class","nvd3 nv-wrap nv-pieChart").append("g"),w=y.select("g");b.append("g").attr("class","nv-pieWrap"),b.append("g").attr("class","nv-legendWrap"),o&&(n.width(f).key(t.x()),y.select(".nv-legendWrap").datum(e).call(n),r.top!=n.height()&&(r.top=n.height(),d=(s||parseInt(u.style("height"))||400)-r.top-r.bottom),y.select(".nv-legendWrap").attr("transform","translate(0,"+ -r.top+")")),y.attr("transform","translate("+r.left+","+r.top+")"),t.width(f).height(d);var E=w.select(".nv-pieWrap").datum([e]);d3.transition(E).call(t),n.dispatch.on("stateChange",function(e){l=e,p.stateChange(l),v.update()}),t.dispatch.on("elementMouseout.tooltip",function(e){p.tooltipHide(e)}),p.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),l.disabled=t.disabled),v.update()})}),v}var t=e.models.pie(),n=e.models.legend(),r={top:30,right:20,bottom:20,left:20},i=null,s=null,o=!0,u=e.utils.defaultColor(),a=!0,f=function(e,t,n,r){return"<h3>"+e+"</h3>"+"<p>"+t+"</p>"},l={},c=null,h="No Data Available.",p=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),d=function(n,r){var i=t.description()(n.point)||t.x()(n.point),s=n.pos[0]+(r&&r.offsetLeft||0),o=n.pos[1]+(r&&r.offsetTop||0),u=t.valueFormat()(t.y()(n.point)),a=f(i,u,n,v);e.tooltip.show([s,o],a,n.value<0?"n":"s",null,r)};return t.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+r.left,e.pos[1]+r.top],p.tooltipShow(e)}),p.on("tooltipShow",function(e){a&&d(e)}),p.on("tooltipHide",function(){a&&e.tooltip.cleanup()}),v.legend=n,v.dispatch=p,v.pie=t,d3.rebind(v,t,"valueFormat","values","x","y","description","id","showLabels","donutLabelsOutside","pieLabelsOutside","labelType","donut","donutRatio","labelThreshold"),v.options=e.utils.optionsFunc.bind(v),v.margin=function(e){return arguments.length?(r.top=typeof e.top!="undefined"?e.top:r.top,r.right=typeof e.right!="undefined"?e.right:r.right,r.bottom=typeof e.bottom!="undefined"?e.bottom:r.bottom,r.left=typeof e.left!="undefined"?e.left:r.left,v):r},v.width=function(e){return arguments.length?(i=e,v):i},v.height=function(e){return arguments.length?(s=e,v):s},v.color=function(r){return arguments.length?(u=e.utils.getColor(r),n.color(u),t.color(u),v):u},v.showLegend=function(e){return arguments.length?(o=e,v):o},v.tooltips=function(e){return arguments.length?(a=e,v):a},v.tooltipContent=function(e){return arguments.length?(f=e,v):f},v.state=function(e){return arguments.length?(l=e,v):l},v.defaultState=function(e){return arguments.length?(c=e,v):c},v.noData=function(e){return arguments.length?(h=e,v):h},v},e.models.scatter=function(){"use strict";function I(q){return q.each(function(I){function Q(){if(!g)return!1;var e,i=d3.merge(I.map(function(e,t){return e.values.map(function(e,n){var r=f(e,n),i=l(e,n);return[o(r)+Math.random()*1e-7,u(i)+Math.random()*1e-7,t,n,e]}).filter(function(e,t){return b(e[4],t)})}));if(D===!0){if(x){var a=X.select("defs").selectAll(".nv-point-clips").data([s]).enter();a.append("clipPath").attr("class","nv-point-clips").attr("id","nv-points-clip-"+s);var c=X.select("#nv-points-clip-"+s).selectAll("circle").data(i);c.enter().append("circle").attr("r",T),c.exit().remove(),c.attr("cx",function(e){return e[0]}).attr("cy",function(e){return e[1]}),X.select(".nv-point-paths").attr("clip-path","url(#nv-points-clip-"+s+")")}i.length&&(i.push([o.range()[0]-20,u.range()[0]-20,null,null]),i.push([o.range()[1]+20,u.range()[1]+20,null,null]),i.push([o.range()[0]-20,u.range()[0]+20,null,null]),i.push([o.range()[1]+20,u.range()[1]-20,null,null]));var h=d3.geom.polygon([[-10,-10],[-10,r+10],[n+10,r+10],[n+10,-10]]),p=d3.geom.voronoi(i).map(function(e,t){return{data:h.clip(e),series:i[t][2],point:i[t][3]}}),d=X.select(".nv-point-paths").selectAll("path").data(p);d.enter().append("path").attr("class",function(e,t){return"nv-path-"+t}),d.exit().remove(),d.attr("d",function(e){return e.data.length===0?"M 0 0":"M"+e.data.join("L")+"Z"});var v=function(e,n){if(F)return 0;var r=I[e.series];if(typeof r=="undefined")return;var i=r.values[e.point];n({point:i,series:r,pos:[o(f(i,e.point))+t.left,u(l(i,e.point))+t.top],seriesIndex:e.series,pointIndex:e.point})};d.on("click",function(e){v(e,_.elementClick)}).on("mouseover",function(e){v(e,_.elementMouseover)}).on("mouseout",function(e,t){v(e,_.elementMouseout)})}else X.select(".nv-groups").selectAll(".nv-group").selectAll(".nv-point").on("click",function(e,n){if(F||!I[e.series])return 0;var r=I[e.series],i=r.values[n];_.elementClick({point:i,series:r,pos:[o(f(i,n))+t.left,u(l(i,n))+t.top],seriesIndex:e.series,pointIndex:n})}).on("mouseover",function(e,n){if(F||!I[e.series])return 0;var r=I[e.series],i=r.values[n];_.elementMouseover({point:i,series:r,pos:[o(f(i,n))+t.left,u(l(i,n))+t.top],seriesIndex:e.series,pointIndex:n})}).on("mouseout",function(e,t){if(F||!I[e.series])return 0;var n=I[e.series],r=n.values[t];_.elementMouseout({point:r,series:n,seriesIndex:e.series,pointIndex:t})});F=!1}var q=n-t.left-t.right,R=r-t.top-t.bottom,U=d3.select(this);I.forEach(function(e,t){e.values.forEach(function(e){e.series=t})});var W=N&&C&&A?[]:d3.merge(I.map(function(e){return e.values.map(function(e,t){return{x:f(e,t),y:l(e,t),size:c(e,t)}})}));o.domain(N||d3.extent(W.map(function(e){return e.x}).concat(d))),w&&I[0]?o.range(k||[(q*E+q)/(2*I[0].values.length),q-q*(1+E)/(2*I[0].values.length)]):o.range(k||[0,q]),u.domain(C||d3.extent(W.map(function(e){return e.y}).concat(v))).range(L||[R,0]),a.domain(A||d3.extent(W.map(function(e){return e.size}).concat(m))).range(O||[16,256]);if(o.domain()[0]===o.domain()[1]||u.domain()[0]===u.domain()[1])M=!0;o.domain()[0]===o.domain()[1]&&(o.domain()[0]?o.domain([o.domain()[0]-o.domain()[0]*.01,o.domain()[1]+o.domain()[1]*.01]):o.domain([-1,1])),u.domain()[0]===u.domain()[1]&&(u.domain()[0]?u.domain([u.domain()[0]-u.domain()[0]*.01,u.domain()[1]+u.domain()[1]*.01]):u.domain([-1,1])),isNaN(o.domain()[0])&&o.domain([-1,1]),isNaN(u.domain()[0])&&u.domain([-1,1]),P=P||o,H=H||u,B=B||a;var X=U.selectAll("g.nv-wrap.nv-scatter").data([I]),V=X.enter().append("g").attr("class","nvd3 nv-wrap nv-scatter nv-chart-"+s+(M?" nv-single-point":"")),$=V.append("defs"),J=V.append("g"),K=X.select("g");J.append("g").attr("class","nv-groups"),J.append("g").attr("class","nv-point-paths"),X.attr("transform","translate("+t.left+","+t.top+")"),$.append("clipPath").attr("id","nv-edge-clip-"+s).append("rect"),X.select("#nv-edge-clip-"+s+" rect").attr("width",q).attr("height",R>0?R:0),K.attr("clip-path",S?"url(#nv-edge-clip-"+s+")":""),F=!0;var G=X.select(".nv-groups").selectAll(".nv-group").data(function(e){return e},function(e){return e.key});G.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),G.exit().remove(),G.attr("class",function(e,t){return"nv-group nv-series-"+t}).classed("hover",function(e){return e.hover}),G.transition().style("fill",function(e,t){return i(e,t)}).style("stroke",function(e,t){return i(e,t)}).style("stroke-opacity",1).style("fill-opacity",.5);if(p){var Y=G.selectAll("circle.nv-point").data(function(e){return e.values},y);Y.enter().append("circle").style("fill",function(e,t){return e.color}).style("stroke",function(e,t){return e.color}).attr("cx",function(t,n){return e.utils.NaNtoZero(P(f(t,n)))}).attr("cy",function(t,n){return e.utils.NaNtoZero(H(l(t,n)))}).attr("r",function(e,t){return Math.sqrt(a(c(e,t))/Math.PI)}),Y.exit().remove(),G.exit().selectAll("path.nv-point").transition().attr("cx",function(t,n){return e.utils.NaNtoZero(o(f(t,n)))}).attr("cy",function(t,n){return e.utils.NaNtoZero(u(l(t,n)))}).remove(),Y.each(function(e,t){d3.select(this).classed("nv-point",!0).classed("nv-point-"+t,!0).classed("hover",!1)}),Y.transition().attr("cx",function(t,n){return e.utils.NaNtoZero(o(f(t,n)))}).attr("cy",function(t,n){return e.utils.NaNtoZero(u(l(t,n)))}).attr("r",function(e,t){return Math.sqrt(a(c(e,t))/Math.PI)})}else{var Y=G.selectAll("path.nv-point").data(function(e){return e.values});Y.enter().append("path").style("fill",function(e,t){return e.color}).style("stroke",function(e,t){return e.color}).attr("transform",function(e,t){return"translate("+P(f(e,t))+","+H(l(e,t))+")"}).attr("d",d3.svg.symbol().type(h).size(function(e,t){return a(c(e,t))})),Y.exit().remove(),G.exit().selectAll("path.nv-point").transition().attr("transform",function(e,t){return"translate("+o(f(e,t))+","+u(l(e,t))+")"}).remove(),Y.each(function(e,t){d3.select(this).classed("nv-point",!0).classed("nv-point-"+t,!0).classed("hover",!1)}),Y.transition().attr("transform",function(e,t){return"translate("+o(f(e,t))+","+u(l(e,t))+")"}).attr("d",d3.svg.symbol().type(h).size(function(e,t){return a(c(e,t))}))}clearTimeout(j),j=setTimeout(Q,300),P=o.copy(),H=u.copy(),B=a.copy()}),I}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e5),o=d3.scale.linear(),u=d3.scale.linear(),a=d3.scale.linear(),f=function(e){return e.x},l=function(e){return e.y},c=function(e){return e.size||1},h=function(e){return e.shape||"circle"},p=!0,d=[],v=[],m=[],g=!0,y=null,b=function(e){return!e.notActive},w=!1,E=.1,S=!1,x=!0,T=function(){return 25},N=null,C=null,k=null,L=null,A=null,O=null,M=!1,_=d3.dispatch("elementClick","elementMouseover","elementMouseout"),D=!0,P,H,B,j,F=!1;return I.clearHighlights=function(){d3.selectAll(".nv-chart-"+s+" .nv-point.hover").classed("hover",!1)},I.highlightPoint=function(e,t,n){d3.select(".nv-chart-"+s+" .nv-series-"+e+" .nv-point-"+t).classed("hover",n)},_.on("elementMouseover.point",function(e){g&&I.highlightPoint(e.seriesIndex,e.pointIndex,!0)}),_.on("elementMouseout.point",function(e){g&&I.highlightPoint(e.seriesIndex,e.pointIndex,!1)}),I.dispatch=_,I.options=e.utils.optionsFunc.bind(I),I.x=function(e){return arguments.length?(f=d3.functor(e),I):f},I.y=function(e){return arguments.length?(l=d3.functor(e),I):l},I.size=function(e){return arguments.length?(c=d3.functor(e),I):c},I.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,I):t},I.width=function(e){return arguments.length?(n=e,I):n},I.height=function(e){return arguments.length?(r=e,I):r},I.xScale=function(e){return arguments.length?(o=e,I):o},I.yScale=function(e){return arguments.length?(u=e,I):u},I.zScale=function(e){return arguments.length?(a=e,I):a},I.xDomain=function(e){return arguments.length?(N=e,I):N},I.yDomain=function(e){return arguments.length?(C=e,I):C},I.sizeDomain=function(e){return arguments.length?(A=e,I):A},I.xRange=function(e){return arguments.length?(k=e,I):k},I.yRange=function(e){return arguments.length?(L=e,I):L},I.sizeRange=function(e){return arguments.length?(O=e,I):O},I.forceX=function(e){return arguments.length?(d=e,I):d},I.forceY=function(e){return arguments.length?(v=e,I):v},I.forceSize=function(e){return arguments.length?(m=e,I):m},I.interactive=function(e){return arguments.length?(g=e,I):g},I.pointKey=function(e){return arguments.length?(y=e,I):y},I.pointActive=function(e){return arguments.length?(b=e,I):b},I.padData=function(e){return arguments.length?(w=e,I):w},I.padDataOuter=function(e){return arguments.length?(E=e,I):E},I.clipEdge=function(e){return arguments.length?(S=e,I):S},I.clipVoronoi=function(e){return arguments.length?(x=e,I):x},I.useVoronoi=function(e){return arguments.length?(D=e,D===!1&&(x=!1),I):D},I.clipRadius=function(e){return arguments.length?(T=e,I):T},I.color=function(t){return arguments.length?(i=e.utils.getColor(t),I):i},I.shape=function(e){return arguments.length?(h=e,I):h},I.onlyCircles=function(e){return arguments.length?(p=e,I):p},I.id=function(e){return arguments.length?(s=e,I):s},I.singlePoint=function(e){return arguments.length?(M=e,I):M},I},e.models.scatterChart=function(){"use strict";function F(e){return e.each(function(e){function K(){if(T)return X.select(".nv-point-paths").style("pointer-events","all"),!1;X.select(".nv-point-paths").style("pointer-events","none");var i=d3.mouse(this);h.distortion(x).focus(i[0]),p.distortion(x).focus(i[1]),X.select(".nv-scatterWrap").call(t),b&&X.select(".nv-x.nv-axis").call(n),w&&X.select(".nv-y.nv-axis").call(r),X.select(".nv-distributionX").datum(e.filter(function(e){return!e.disabled})).call(o),X.select(".nv-distributionY").datum(e.filter(function(e){return!e.disabled})).call(u)}var C=d3.select(this),k=this,L=(f||parseInt(C.style("width"))||960)-a.left-a.right,I=(l||parseInt(C.style("height"))||400)-a.top-a.bottom;F.update=function(){C.transition().duration(D).call(F)},F.container=this,A.disabled=e.map(function(e){return!!e.disabled});if(!O){var q;O={};for(q in A)A[q]instanceof Array?O[q]=A[q].slice(0):O[q]=A[q]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var R=C.selectAll(".nv-noData").data([_]);return R.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),R.attr("x",a.left+L/2).attr("y",a.top+I/2).text(function(e){return e}),F}C.selectAll(".nv-noData").remove(),P=P||h,H=H||p;var U=C.selectAll("g.nv-wrap.nv-scatterChart").data([e]),z=U.enter().append("g").attr("class","nvd3 nv-wrap nv-scatterChart nv-chart-"+t.id()),W=z.append("g"),X=U.select("g");W.append("rect").attr("class","nvd3 nv-background"),W.append("g").attr("class","nv-x nv-axis"),W.append("g").attr("class","nv-y nv-axis"),W.append("g").attr("class","nv-scatterWrap"),W.append("g").attr("class","nv-distWrap"),W.append("g").attr("class","nv-legendWrap"),W.append("g").attr("class","nv-controlsWrap");if(y){var V=S?L/2:L;i.width(V),U.select(".nv-legendWrap").datum(e).call(i),a.top!=i.height()&&(a.top=i.height(),I=(l||parseInt(C.style("height"))||400)-a.top-a.bottom),U.select(".nv-legendWrap").attr("transform","translate("+(L-V)+","+ -a.top+")")}S&&(s.width(180).color(["#444"]),X.select(".nv-controlsWrap").datum(j).attr("transform","translate(0,"+ -a.top+")").call(s)),U.attr("transform","translate("+a.left+","+a.top+")"),E&&X.select(".nv-y.nv-axis").attr("transform","translate("+L+",0)"),t.width(L).height(I).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),d!==0&&t.xDomain(null),v!==0&&t.yDomain(null),U.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t);if(d!==0){var $=h.domain()[1]-h.domain()[0];t.xDomain([h.domain()[0]-d*$,h.domain()[1]+d*$])}if(v!==0){var J=p.domain()[1]-p.domain()[0];t.yDomain([p.domain()[0]-v*J,p.domain()[1]+v*J])}(v!==0||d!==0)&&U.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),b&&(n.scale(h).ticks(n.ticks()&&n.ticks().length?n.ticks():L/100).tickSize(-I,0),X.select(".nv-x.nv-axis").attr("transform","translate(0,"+p.range()[0]+")").call(n)),w&&(r.scale(p).ticks(r.ticks()&&r.ticks().length?r.ticks():I/36).tickSize(-L,0),X.select(".nv-y.nv-axis").call(r)),m&&(o.getData(t.x()).scale(h).width(L).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),W.select(".nv-distWrap").append("g").attr("class","nv-distributionX"),X.select(".nv-distributionX").attr("transform","translate(0,"+p.range()[0]+")").datum(e.filter(function(e){return!e.disabled})).call(o)),g&&(u.getData(t.y()).scale(p).width(I).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),W.select(".nv-distWrap").append("g").attr("class","nv-distributionY"),X.select(".nv-distributionY").attr("transform","translate("+(E?L:-u.size())+",0)").datum(e.filter(function(e){return!e.disabled})).call(u)),d3.fisheye&&(X.select(".nv-background").attr("width",L).attr("height",I),X.select(".nv-background").on("mousemove",K),X.select(".nv-background").on("click",function(){T=!T}),t.dispatch.on("elementClick.freezeFisheye",function(){T=!T})),s.dispatch.on("legendClick",function(e,i){e.disabled=!e.disabled,x=e.disabled?0:2.5,X.select(".nv-background").style("pointer-events",e.disabled?"none":"all"),X.select(".nv-point-paths").style("pointer-events",e.disabled?"all":"none"),e.disabled?(h.distortion(x).focus(0),p.distortion(x).focus(0),X.select(".nv-scatterWrap").call(t),X.select(".nv-x.nv-axis").call(n),X.select(".nv-y.nv-axis").call(r)):T=!1,F.update()}),i.dispatch.on("stateChange",function(e){A.disabled=e.disabled,M.stateChange(A),F.update()}),t.dispatch.on("elementMouseover.tooltip",function(e){d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",function(t,n){return e.pos[1]-I}),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",e.pos[0]+o.size()),e.pos=[e.pos[0]+a.left,e.pos[1]+a.top],M.tooltipShow(e)}),M.on("tooltipShow",function(e){N&&B(e,k.parentNode)}),M.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),A.disabled=t.disabled),F.update()}),P=h.copy(),H=p.copy()}),F}var t=e.models.scatter(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o=e.models.distribution(),u=e.models.distribution(),a={top:30,right:20,bottom:50,left:75},f=null,l=null,c=e.utils.defaultColor(),h=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.xScale(),p=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.yScale(),d=0,v=0,m=!1,g=!1,y=!0,b=!0,w=!0,E=!1,S=!!d3.fisheye,x=0,T=!1,N=!0,C=function(e,t,n){return"<strong>"+t+"</strong>"},k=function(e,t,n){return"<strong>"+n+"</strong>"},L=null,A={},O=null,M=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),_="No Data Available.",D=250;t.xScale(h).yScale(p),n.orient("bottom").tickPadding(10),r.orient(E?"right":"left").tickPadding(10),o.axis("x"),u.axis("y"),s.updateState(!1);var P,H,B=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),f=i.pos[0]+(s.offsetLeft||0),l=p.range()[0]+a.top+(s.offsetTop||0),c=h.range()[0]+a.left+(s.offsetLeft||0),d=i.pos[1]+(s.offsetTop||0),v=n.tickFormat()(t.x()(i.point,i.pointIndex)),m=r.tickFormat()(t.y()(i.point,i.pointIndex));C!=null&&e.tooltip.show([f,l],C(i.series.key,v,m,i,F),"n",1,s,"x-nvtooltip"),k!=null&&e.tooltip.show([c,d],k(i.series.key,v,m,i,F),"e",1,s,"y-nvtooltip"),L!=null&&e.tooltip.show([o,u],L(i.series.key,v,m,i,F),i.value<0?"n":"s",null,s)},j=[{key:"Magnify",disabled:!0}];return t.dispatch.on("elementMouseout.tooltip",function(e){M.tooltipHide(e),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",0),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",u.size())}),M.on("tooltipHide",function(){N&&e.tooltip.cleanup()}),F.dispatch=M,F.scatter=t,F.legend=i,F.controls=s,F.xAxis=n,F.yAxis=r,F.distX=o,F.distY=u,d3.rebind(F,t,"id","interactive","pointActive","x","y","shape","size","xScale","yScale","zScale","xDomain","yDomain","xRange","yRange","sizeDomain","sizeRange","forceX","forceY","forceSize","clipVoronoi","clipRadius","useVoronoi"),F.options=e.utils.optionsFunc.bind(F),F.margin=function(e){return arguments.length?(a.top=typeof e.top!="undefined"?e.top:a.top,a.right=typeof e.right!="undefined"?e.right:a.right,a.bottom=typeof e.bottom!="undefined"?e.bottom:a.bottom,a.left=typeof e.left!="undefined"?e.left:a.left,F):a},F.width=function(e){return arguments.length?(f=e,F):f},F.height=function(e){return arguments.length?(l=e,F):l},F.color=function(t){return arguments.length?(c=e.utils.getColor(t),i.color(c),o.color(c),u.color(c),F):c},F.showDistX=function(e){return arguments.length?(m=e,F):m},F.showDistY=function(e){return arguments.length?(g=e,F):g},F.showControls=function(e){return arguments.length?(S=e,F):S},F.showLegend=function(e){return arguments.length?(y=e,F):y},F.showXAxis=function(e){return arguments.length?(b=e,F):b},F.showYAxis=function(e){return arguments.length?(w=e,F):w},F.rightAlignYAxis=function(e){return arguments.length?(E=e,r.orient(e?"right":"left"),F):E},F.fisheye=function(e){return arguments.length?(x=e,F):x},F.xPadding=function(e){return arguments.length?(d=e,F):d},F.yPadding=function(e){return arguments.length?(v=e,F):v},F.tooltips=function(e){return arguments.length?(N=e,F):N},F.tooltipContent=function(e){return arguments.length?(L=e,F):L},F.tooltipXContent=function(e){return arguments.length?(C=e,F):C},F.tooltipYContent=function(e){return arguments.length?(k=e,F):k},F.state=function(e){return arguments.length?(A=e,F):A},F.defaultState=function(e){return arguments.length?(O=e,F):O},F.noData=function(e){return arguments.length?(_=e,F):_},F.transitionDuration=function(e){return arguments.length?(D=e,F):D},F},e.models.scatterPlusLineChart=function(){"use strict";function B(e){return e.each(function(e){function $(){if(S)return z.select(".nv-point-paths").style("pointer-events","all"),!1;z.select(".nv-point-paths").style("pointer-events","none");var i=d3.mouse(this);h.distortion(E).focus(i[0]),p.distortion(E).focus(i[1]),z.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),g&&z.select(".nv-x.nv-axis").call(n),y&&z.select(".nv-y.nv-axis").call(r),z.select(".nv-distributionX").datum(e.filter(function(e){return!e.disabled})).call(o),z.select(".nv-distributionY").datum(e.filter(function(e){return!e.disabled})).call(u)}var T=d3.select(this),N=this,C=(f||parseInt(T.style("width"))||960)-a.left-a.right,j=(l||parseInt(T.style("height"))||400)-a.top-a.bottom;B.update=function(){T.transition().duration(M).call(B)},B.container=this,k.disabled=e.map(function(e){return!!e.disabled});if(!L){var F;L={};for(F in k)k[F]instanceof Array?L[F]=k[F].slice(0):L[F]=k[F]}if(!e||!e.length||!e.filter(function(e){return e.values.length}).length){var I=T.selectAll(".nv-noData").data([O]);return I.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),I.attr("x",a.left+C/2).attr("y",a.top+j/2).text(function(e){return e}),B}T.selectAll(".nv-noData").remove(),h=t.xScale(),p=t.yScale(),_=_||h,D=D||p;var q=T.selectAll("g.nv-wrap.nv-scatterChart").data([e]),R=q.enter().append("g").attr("class","nvd3 nv-wrap nv-scatterChart nv-chart-"+t.id()),U=R.append("g"),z=q.select("g");U.append("rect").attr("class","nvd3 nv-background").style("pointer-events","none"),U.append("g").attr("class","nv-x nv-axis"),U.append("g").attr("class","nv-y nv-axis"),U.append("g").attr("class","nv-scatterWrap"),U.append("g").attr("class","nv-regressionLinesWrap"),U.append("g").attr("class","nv-distWrap"),U.append("g").attr("class","nv-legendWrap"),U.append("g").attr("class","nv-controlsWrap"),q.attr("transform","translate("+a.left+","+a.top+")"),b&&z.select(".nv-y.nv-axis").attr("transform","translate("+C+",0)"),m&&(i.width(C/2),q.select(".nv-legendWrap").datum(e).call(i),a.top!=i.height()&&(a.top=i.height(),j=(l||parseInt(T.style("height"))||400)-a.top-a.bottom),q.select(".nv-legendWrap").attr("transform","translate("+C/2+","+ -a.top+")")),w&&(s.width(180).color(["#444"]),z.select(".nv-controlsWrap").datum(H).attr("transform","translate(0,"+ -a.top+")").call(s)),t.width(C).height(j).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),q.select(".nv-scatterWrap").datum(e.filter(function(e){return!e.disabled})).call(t),q.select(".nv-regressionLinesWrap").attr("clip-path","url(#nv-edge-clip-"+t.id()+")");var W=q.select(".nv-regressionLinesWrap").selectAll(".nv-regLines").data(function(e){return e});W.enter().append("g").attr("class","nv-regLines");var X=W.selectAll(".nv-regLine").data(function(e){return[e]}),V=X.enter().append("line").attr("class","nv-regLine").style("stroke-opacity",0);X.transition().attr("x1",h.range()[0]).attr("x2",h.range()[1]).attr("y1",function(e,t){return p(h.domain()[0]*e.slope+e.intercept)}).attr("y2",function(e,t){return p(h.domain()[1]*e.slope+e.intercept)}).style("stroke",function(e,t,n){return c(e,n)}).style("stroke-opacity",function(e,t){return e.disabled||typeof e.slope=="undefined"||typeof e.intercept=="undefined"?0:1}),g&&(n.scale(h).ticks(n.ticks()?n.ticks():C/100).tickSize(-j,0),z.select(".nv-x.nv-axis").attr("transform","translate(0,"+p.range()[0]+")").call(n)),y&&(r.scale(p).ticks(r.ticks()?r.ticks():j/36).tickSize(-C,0),z.select(".nv-y.nv-axis").call(r)),d&&(o.getData(t.x()).scale(h).width(C).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),U.select(".nv-distWrap").append("g").attr("class","nv-distributionX"),z.select(".nv-distributionX").attr("transform","translate(0,"+p.range()[0]+")").datum(e.filter(function(e){return!e.disabled})).call(o)),v&&(u.getData(t.y()).scale(p).width(
+j).color(e.map(function(e,t){return e.color||c(e,t)}).filter(function(t,n){return!e[n].disabled})),U.select(".nv-distWrap").append("g").attr("class","nv-distributionY"),z.select(".nv-distributionY").attr("transform","translate("+(b?C:-u.size())+",0)").datum(e.filter(function(e){return!e.disabled})).call(u)),d3.fisheye&&(z.select(".nv-background").attr("width",C).attr("height",j),z.select(".nv-background").on("mousemove",$),z.select(".nv-background").on("click",function(){S=!S}),t.dispatch.on("elementClick.freezeFisheye",function(){S=!S})),s.dispatch.on("legendClick",function(e,i){e.disabled=!e.disabled,E=e.disabled?0:2.5,z.select(".nv-background").style("pointer-events",e.disabled?"none":"all"),z.select(".nv-point-paths").style("pointer-events",e.disabled?"all":"none"),e.disabled?(h.distortion(E).focus(0),p.distortion(E).focus(0),z.select(".nv-scatterWrap").call(t),z.select(".nv-x.nv-axis").call(n),z.select(".nv-y.nv-axis").call(r)):S=!1,B.update()}),i.dispatch.on("stateChange",function(e){k=e,A.stateChange(k),B.update()}),t.dispatch.on("elementMouseover.tooltip",function(e){d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",e.pos[1]-j),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",e.pos[0]+o.size()),e.pos=[e.pos[0]+a.left,e.pos[1]+a.top],A.tooltipShow(e)}),A.on("tooltipShow",function(e){x&&P(e,N.parentNode)}),A.on("changeState",function(t){typeof t.disabled!="undefined"&&(e.forEach(function(e,n){e.disabled=t.disabled[n]}),k.disabled=t.disabled),B.update()}),_=h.copy(),D=p.copy()}),B}var t=e.models.scatter(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o=e.models.distribution(),u=e.models.distribution(),a={top:30,right:20,bottom:50,left:75},f=null,l=null,c=e.utils.defaultColor(),h=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.xScale(),p=d3.fisheye?d3.fisheye.scale(d3.scale.linear).distortion(0):t.yScale(),d=!1,v=!1,m=!0,g=!0,y=!0,b=!1,w=!!d3.fisheye,E=0,S=!1,x=!0,T=function(e,t,n){return"<strong>"+t+"</strong>"},N=function(e,t,n){return"<strong>"+n+"</strong>"},C=function(e,t,n,r){return"<h3>"+e+"</h3>"+"<p>"+r+"</p>"},k={},L=null,A=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),O="No Data Available.",M=250;t.xScale(h).yScale(p),n.orient("bottom").tickPadding(10),r.orient(b?"right":"left").tickPadding(10),o.axis("x"),u.axis("y"),s.updateState(!1);var _,D,P=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),f=i.pos[0]+(s.offsetLeft||0),l=p.range()[0]+a.top+(s.offsetTop||0),c=h.range()[0]+a.left+(s.offsetLeft||0),d=i.pos[1]+(s.offsetTop||0),v=n.tickFormat()(t.x()(i.point,i.pointIndex)),m=r.tickFormat()(t.y()(i.point,i.pointIndex));T!=null&&e.tooltip.show([f,l],T(i.series.key,v,m,i,B),"n",1,s,"x-nvtooltip"),N!=null&&e.tooltip.show([c,d],N(i.series.key,v,m,i,B),"e",1,s,"y-nvtooltip"),C!=null&&e.tooltip.show([o,u],C(i.series.key,v,m,i.point.tooltip,i,B),i.value<0?"n":"s",null,s)},H=[{key:"Magnify",disabled:!0}];return t.dispatch.on("elementMouseout.tooltip",function(e){A.tooltipHide(e),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-distx-"+e.pointIndex).attr("y1",0),d3.select(".nv-chart-"+t.id()+" .nv-series-"+e.seriesIndex+" .nv-disty-"+e.pointIndex).attr("x2",u.size())}),A.on("tooltipHide",function(){x&&e.tooltip.cleanup()}),B.dispatch=A,B.scatter=t,B.legend=i,B.controls=s,B.xAxis=n,B.yAxis=r,B.distX=o,B.distY=u,d3.rebind(B,t,"id","interactive","pointActive","x","y","shape","size","xScale","yScale","zScale","xDomain","yDomain","xRange","yRange","sizeDomain","sizeRange","forceX","forceY","forceSize","clipVoronoi","clipRadius","useVoronoi"),B.options=e.utils.optionsFunc.bind(B),B.margin=function(e){return arguments.length?(a.top=typeof e.top!="undefined"?e.top:a.top,a.right=typeof e.right!="undefined"?e.right:a.right,a.bottom=typeof e.bottom!="undefined"?e.bottom:a.bottom,a.left=typeof e.left!="undefined"?e.left:a.left,B):a},B.width=function(e){return arguments.length?(f=e,B):f},B.height=function(e){return arguments.length?(l=e,B):l},B.color=function(t){return arguments.length?(c=e.utils.getColor(t),i.color(c),o.color(c),u.color(c),B):c},B.showDistX=function(e){return arguments.length?(d=e,B):d},B.showDistY=function(e){return arguments.length?(v=e,B):v},B.showControls=function(e){return arguments.length?(w=e,B):w},B.showLegend=function(e){return arguments.length?(m=e,B):m},B.showXAxis=function(e){return arguments.length?(g=e,B):g},B.showYAxis=function(e){return arguments.length?(y=e,B):y},B.rightAlignYAxis=function(e){return arguments.length?(b=e,r.orient(e?"right":"left"),B):b},B.fisheye=function(e){return arguments.length?(E=e,B):E},B.tooltips=function(e){return arguments.length?(x=e,B):x},B.tooltipContent=function(e){return arguments.length?(C=e,B):C},B.tooltipXContent=function(e){return arguments.length?(T=e,B):T},B.tooltipYContent=function(e){return arguments.length?(N=e,B):N},B.state=function(e){return arguments.length?(k=e,B):k},B.defaultState=function(e){return arguments.length?(L=e,B):L},B.noData=function(e){return arguments.length?(O=e,B):O},B.transitionDuration=function(e){return arguments.length?(M=e,B):M},B},e.models.sparkline=function(){"use strict";function d(e){return e.each(function(e){var i=n-t.left-t.right,d=r-t.top-t.bottom,v=d3.select(this);s.domain(l||d3.extent(e,u)).range(h||[0,i]),o.domain(c||d3.extent(e,a)).range(p||[d,0]);var m=v.selectAll("g.nv-wrap.nv-sparkline").data([e]),g=m.enter().append("g").attr("class","nvd3 nv-wrap nv-sparkline"),b=g.append("g"),w=m.select("g");m.attr("transform","translate("+t.left+","+t.top+")");var E=m.selectAll("path").data(function(e){return[e]});E.enter().append("path"),E.exit().remove(),E.style("stroke",function(e,t){return e.color||f(e,t)}).attr("d",d3.svg.line().x(function(e,t){return s(u(e,t))}).y(function(e,t){return o(a(e,t))}));var S=m.selectAll("circle.nv-point").data(function(e){function n(t){if(t!=-1){var n=e[t];return n.pointIndex=t,n}return null}var t=e.map(function(e,t){return a(e,t)}),r=n(t.lastIndexOf(o.domain()[1])),i=n(t.indexOf(o.domain()[0])),s=n(t.length-1);return[i,r,s].filter(function(e){return e!=null})});S.enter().append("circle"),S.exit().remove(),S.attr("cx",function(e,t){return s(u(e,e.pointIndex))}).attr("cy",function(e,t){return o(a(e,e.pointIndex))}).attr("r",2).attr("class",function(e,t){return u(e,e.pointIndex)==s.domain()[1]?"nv-point nv-currentValue":a(e,e.pointIndex)==o.domain()[0]?"nv-point nv-minValue":"nv-point nv-maxValue"})}),d}var t={top:2,right:0,bottom:2,left:0},n=400,r=32,i=!0,s=d3.scale.linear(),o=d3.scale.linear(),u=function(e){return e.x},a=function(e){return e.y},f=e.utils.getColor(["#000"]),l,c,h,p;return d.options=e.utils.optionsFunc.bind(d),d.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,d):t},d.width=function(e){return arguments.length?(n=e,d):n},d.height=function(e){return arguments.length?(r=e,d):r},d.x=function(e){return arguments.length?(u=d3.functor(e),d):u},d.y=function(e){return arguments.length?(a=d3.functor(e),d):a},d.xScale=function(e){return arguments.length?(s=e,d):s},d.yScale=function(e){return arguments.length?(o=e,d):o},d.xDomain=function(e){return arguments.length?(l=e,d):l},d.yDomain=function(e){return arguments.length?(c=e,d):c},d.xRange=function(e){return arguments.length?(h=e,d):h},d.yRange=function(e){return arguments.length?(p=e,d):p},d.animate=function(e){return arguments.length?(i=e,d):i},d.color=function(t){return arguments.length?(f=e.utils.getColor(t),d):f},d},e.models.sparklinePlus=function(){"use strict";function v(e){return e.each(function(c){function O(){if(a)return;var e=C.selectAll(".nv-hoverValue").data(u),r=e.enter().append("g").attr("class","nv-hoverValue").style("stroke-opacity",0).style("fill-opacity",0);e.exit().transition().duration(250).style("stroke-opacity",0).style("fill-opacity",0).remove(),e.attr("transform",function(e){return"translate("+s(t.x()(c[e],e))+",0)"}).transition().duration(250).style("stroke-opacity",1).style("fill-opacity",1);if(!u.length)return;r.append("line").attr("x1",0).attr("y1",-n.top).attr("x2",0).attr("y2",b),r.append("text").attr("class","nv-xValue").attr("x",-6).attr("y",-n.top).attr("text-anchor","end").attr("dy",".9em"),C.select(".nv-hoverValue .nv-xValue").text(f(t.x()(c[u[0]],u[0]))),r.append("text").attr("class","nv-yValue").attr("x",6).attr("y",-n.top).attr("text-anchor","start").attr("dy",".9em"),C.select(".nv-hoverValue .nv-yValue").text(l(t.y()(c[u[0]],u[0])))}function M(){function r(e,n){var r=Math.abs(t.x()(e[0],0)-n),i=0;for(var s=0;s<e.length;s++)Math.abs(t.x()(e[s],s)-n)<r&&(r=Math.abs(t.x()(e[s],s)-n),i=s);return i}if(a)return;var e=d3.mouse(this)[0]-n.left;u=[r(c,Math.round(s.invert(e)))],O()}var m=d3.select(this),g=(r||parseInt(m.style("width"))||960)-n.left-n.right,b=(i||parseInt(m.style("height"))||400)-n.top-n.bottom;v.update=function(){v(e)},v.container=this;if(!c||!c.length){var w=m.selectAll(".nv-noData").data([d]);return w.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),w.attr("x",n.left+g/2).attr("y",n.top+b/2).text(function(e){return e}),v}m.selectAll(".nv-noData").remove();var E=t.y()(c[c.length-1],c.length-1);s=t.xScale(),o=t.yScale();var S=m.selectAll("g.nv-wrap.nv-sparklineplus").data([c]),T=S.enter().append("g").attr("class","nvd3 nv-wrap nv-sparklineplus"),N=T.append("g"),C=S.select("g");N.append("g").attr("class","nv-sparklineWrap"),N.append("g").attr("class","nv-valueWrap"),N.append("g").attr("class","nv-hoverArea"),S.attr("transform","translate("+n.left+","+n.top+")");var k=C.select(".nv-sparklineWrap");t.width(g).height(b),k.call(t);var L=C.select(".nv-valueWrap"),A=L.selectAll(".nv-currentValue").data([E]);A.enter().append("text").attr("class","nv-currentValue").attr("dx",p?-8:8).attr("dy",".9em").style("text-anchor",p?"end":"start"),A.attr("x",g+(p?n.right:0)).attr("y",h?function(e){return o(e)}:0).style("fill",t.color()(c[c.length-1],c.length-1)).text(l(E)),N.select(".nv-hoverArea").append("rect").on("mousemove",M).on("click",function(){a=!a}).on("mouseout",function(){u=[],O()}),C.select(".nv-hoverArea rect").attr("transform",function(e){return"translate("+ -n.left+","+ -n.top+")"}).attr("width",g+n.left+n.right).attr("height",b+n.top)}),v}var t=e.models.sparkline(),n={top:15,right:100,bottom:10,left:50},r=null,i=null,s,o,u=[],a=!1,f=d3.format(",r"),l=d3.format(",.2f"),c=!0,h=!0,p=!1,d="No Data Available.";return v.sparkline=t,d3.rebind(v,t,"x","y","xScale","yScale","color"),v.options=e.utils.optionsFunc.bind(v),v.margin=function(e){return arguments.length?(n.top=typeof e.top!="undefined"?e.top:n.top,n.right=typeof e.right!="undefined"?e.right:n.right,n.bottom=typeof e.bottom!="undefined"?e.bottom:n.bottom,n.left=typeof e.left!="undefined"?e.left:n.left,v):n},v.width=function(e){return arguments.length?(r=e,v):r},v.height=function(e){return arguments.length?(i=e,v):i},v.xTickFormat=function(e){return arguments.length?(f=e,v):f},v.yTickFormat=function(e){return arguments.length?(l=e,v):l},v.showValue=function(e){return arguments.length?(c=e,v):c},v.alignValue=function(e){return arguments.length?(h=e,v):h},v.rightAlignValue=function(e){return arguments.length?(p=e,v):p},v.noData=function(e){return arguments.length?(d=e,v):d},v},e.models.stackedArea=function(){"use strict";function g(e){return e.each(function(e){var a=n-t.left-t.right,b=r-t.top-t.bottom,w=d3.select(this);p=v.xScale(),d=v.yScale();var E=e;e.forEach(function(e,t){e.seriesIndex=t,e.values=e.values.map(function(e,n){return e.index=n,e.seriesIndex=t,e})});var S=e.filter(function(e){return!e.disabled});e=d3.layout.stack().order(l).offset(f).values(function(e){return e.values}).x(o).y(u).out(function(e,t,n){var r=u(e)===0?0:n;e.display={y:r,y0:t}})(S);var T=w.selectAll("g.nv-wrap.nv-stackedarea").data([e]),N=T.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedarea"),C=N.append("defs"),k=N.append("g"),L=T.select("g");k.append("g").attr("class","nv-areaWrap"),k.append("g").attr("class","nv-scatterWrap"),T.attr("transform","translate("+t.left+","+t.top+")"),v.width(a).height(b).x(o).y(function(e){return e.display.y+e.display.y0}).forceY([0]).color(e.map(function(e,t){return e.color||i(e,e.seriesIndex)}));var A=L.select(".nv-scatterWrap").datum(e);A.call(v),C.append("clipPath").attr("id","nv-edge-clip-"+s).append("rect"),T.select("#nv-edge-clip-"+s+" rect").attr("width",a).attr("height",b),L.attr("clip-path",h?"url(#nv-edge-clip-"+s+")":"");var O=d3.svg.area().x(function(e,t){return p(o(e,t))}).y0(function(e){return d(e.display.y0)}).y1(function(e){return d(e.display.y+e.display.y0)}).interpolate(c),M=d3.svg.area().x(function(e,t){return p(o(e,t))}).y0(function(e){return d(e.display.y0)}).y1(function(e){return d(e.display.y0)}),_=L.select(".nv-areaWrap").selectAll("path.nv-area").data(function(e){return e});_.enter().append("path").attr("class",function(e,t){return"nv-area nv-area-"+t}).attr("d",function(e,t){return M(e.values,e.seriesIndex)}).on("mouseover",function(e,t){d3.select(this).classed("hover",!0),m.areaMouseover({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:e.seriesIndex})}).on("mouseout",function(e,t){d3.select(this).classed("hover",!1),m.areaMouseout({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:e.seriesIndex})}).on("click",function(e,t){d3.select(this).classed("hover",!1),m.areaClick({point:e,series:e.key,pos:[d3.event.pageX,d3.event.pageY],seriesIndex:e.seriesIndex})}),_.exit().remove(),_.style("fill",function(e,t){return e.color||i(e,e.seriesIndex)}).style("stroke",function(e,t){return e.color||i(e,e.seriesIndex)}),_.transition().attr("d",function(e,t){return O(e.values,t)}),v.dispatch.on("elementMouseover.area",function(e){L.select(".nv-chart-"+s+" .nv-area-"+e.seriesIndex).classed("hover",!0)}),v.dispatch.on("elementMouseout.area",function(e){L.select(".nv-chart-"+s+" .nv-area-"+e.seriesIndex).classed("hover",!1)}),g.d3_stackedOffset_stackPercent=function(e){var t=e.length,n=e[0].length,r=1/t,i,s,o,a=[];for(s=0;s<n;++s){for(i=0,o=0;i<E.length;i++)o+=u(E[i].values[s]);if(o)for(i=0;i<t;i++)e[i][s][1]/=o;else for(i=0;i<t;i++)e[i][s][1]=r}for(s=0;s<n;++s)a[s]=0;return a}}),g}var t={top:0,right:0,bottom:0,left:0},n=960,r=500,i=e.utils.defaultColor(),s=Math.floor(Math.random()*1e5),o=function(e){return e.x},u=function(e){return e.y},a="stack",f="zero",l="default",c="linear",h=!1,p,d,v=e.models.scatter(),m=d3.dispatch("tooltipShow","tooltipHide","areaClick","areaMouseover","areaMouseout");return v.size(2.2).sizeDomain([2.2,2.2]),v.dispatch.on("elementClick.area",function(e){m.areaClick(e)}),v.dispatch.on("elementMouseover.tooltip",function(e){e.pos=[e.pos[0]+t.left,e.pos[1]+t.top],m.tooltipShow(e)}),v.dispatch.on("elementMouseout.tooltip",function(e){m.tooltipHide(e)}),g.dispatch=m,g.scatter=v,d3.rebind(g,v,"interactive","size","xScale","yScale","zScale","xDomain","yDomain","xRange","yRange","sizeDomain","forceX","forceY","forceSize","clipVoronoi","useVoronoi","clipRadius","highlightPoint","clearHighlights"),g.options=e.utils.optionsFunc.bind(g),g.x=function(e){return arguments.length?(o=d3.functor(e),g):o},g.y=function(e){return arguments.length?(u=d3.functor(e),g):u},g.margin=function(e){return arguments.length?(t.top=typeof e.top!="undefined"?e.top:t.top,t.right=typeof e.right!="undefined"?e.right:t.right,t.bottom=typeof e.bottom!="undefined"?e.bottom:t.bottom,t.left=typeof e.left!="undefined"?e.left:t.left,g):t},g.width=function(e){return arguments.length?(n=e,g):n},g.height=function(e){return arguments.length?(r=e,g):r},g.clipEdge=function(e){return arguments.length?(h=e,g):h},g.color=function(t){return arguments.length?(i=e.utils.getColor(t),g):i},g.offset=function(e){return arguments.length?(f=e,g):f},g.order=function(e){return arguments.length?(l=e,g):l},g.style=function(e){if(!arguments.length)return a;a=e;switch(a){case"stack":g.offset("zero"),g.order("default");break;case"stream":g.offset("wiggle"),g.order("inside-out");break;case"stream-center":g.offset("silhouette"),g.order("inside-out");break;case"expand":g.offset("expand"),g.order("default");break;case"stack_percent":g.offset(g.d3_stackedOffset_stackPercent),g.order("default")}return g},g.interpolate=function(e){return arguments.length?(c=e,g):c},g},e.models.stackedAreaChart=function(){"use strict";function M(y){return y.each(function(y){var _=d3.select(this),D=this,P=(a||parseInt(_.style("width"))||960)-u.left-u.right,H=(f||parseInt(_.style("height"))||400)-u.top-u.bottom;M.update=function(){_.transition().duration(A).call(M)},M.container=this,S.disabled=y.map(function(e){return!!e.disabled});if(!x){var B;x={};for(B in S)S[B]instanceof Array?x[B]=S[B].slice(0):x[B]=S[B]}if(!y||!y.length||!y.filter(function(e){return e.values.length}).length){var j=_.selectAll(".nv-noData").data([T]);return j.enter().append("text").attr("class","nvd3 nv-noData").attr("dy","-.7em").style("text-anchor","middle"),j.attr("x",u.left+P/2).attr("y",u.top+H/2).text(function(e){return e}),M}_.selectAll(".nv-noData").remove(),b=t.xScale(),w=t.yScale();var F=_.selectAll("g.nv-wrap.nv-stackedAreaChart").data([y]),I=F.enter().append("g").attr("class","nvd3 nv-wrap nv-stackedAreaChart").append("g"),q=F.select("g");I.append("rect").style("opacity",0),I.append("g").attr("class","nv-x nv-axis"),I.append("g").attr("class","nv-y nv-axis"),I.append("g").attr("class","nv-stackedWrap"),I.append("g").attr("class","nv-legendWrap"),I.append("g").attr("class","nv-controlsWrap"),I.append("g").attr("class","nv-interactive"),q.select("rect").attr("width",P).attr("height",H);if(h){var R=c?P-C:P;i.width(R),q.select(".nv-legendWrap").datum(y).call(i),u.top!=i.height()&&(u.top=i.height(),H=(f||parseInt(_.style("height"))||400)-u.top-u.bottom),q.select(".nv-legendWrap").attr("transform","translate("+(P-R)+","+ -u.top+")")}if(c){var U=[{key:L.stacked||"Stacked",metaKey:"Stacked",disabled:t.style()!="stack",style:"stack"},{key:L.stream||"Stream",metaKey:"Stream",disabled:t.style()!="stream",style:"stream"},{key:L.expanded||"Expanded",metaKey:"Expanded",disabled:t.style()!="expand",style:"expand"},{key:L.stack_percent||"Stack %",metaKey:"Stack_Percent",disabled:t.style()!="stack_percent",style:"stack_percent"}];C=k.length/3*260,U=U.filter(function(e){return k.indexOf(e.metaKey)!==-1}),s.width(C).color(["#444","#444","#444"]),q.select(".nv-controlsWrap").datum(U).call(s),u.top!=Math.max(s.height(),i.height())&&(u.top=Math.max(s.height(),i.height()),H=(f||parseInt(_.style("height"))||400)-u.top-u.bottom),q.select(".nv-controlsWrap").attr("transform","translate(0,"+ -u.top+")")}F.attr("transform","translate("+u.left+","+u.top+")"),v&&q.select(".nv-y.nv-axis").attr("transform","translate("+P+",0)"),m&&(o.width(P).height(H).margin({left:u.left,top:u.top}).svgContainer(_).xScale(b),F.select(".nv-interactive").call(o)),t.width(P).height(H);var z=q.select(".nv-stackedWrap").datum(y);z.transition().call(t),p&&(n.scale(b).ticks(P/100).tickSize(-H,0),q.select(".nv-x.nv-axis").attr("transform","translate(0,"+H+")"),q.select(".nv-x.nv-axis").transition().duration(0).call(n)),d&&(r.scale(w).ticks(t.offset()=="wiggle"?0:H/36).tickSize(-P,0).setTickFormat(t.style()=="expand"||t.style()=="stack_percent"?d3.format("%"):E),q.select(".nv-y.nv-axis").transition().duration(0).call(r)),t.dispatch.on("areaClick.toggle",function(e){y.filter(function(e){return!e.disabled}).length===1?y.forEach(function(e){e.disabled=!1}):y.forEach(function(t,n){t.disabled=n!=e.seriesIndex}),S.disabled=y.map(function(e){return!!e.disabled}),N.stateChange(S),M.update()}),i.dispatch.on("stateChange",function(e){S.disabled=e.disabled,N.stateChange(S),M.update()}),s.dispatch.on("legendClick",function(e,n){if(!e.disabled)return;U=U.map(function(e){return e.disabled=!0,e}),e.disabled=!1,t.style(e.style),S.style=t.style(),N.stateChange(S),M.update()}),o.dispatch.on("elementMousemove",function(i){t.clearHighlights();var s,a,f,c=[];y.filter(function(e,t){return e.seriesIndex=t,!e.disabled}).forEach(function(n,r){a=e.interactiveBisect(n.values,i.pointXValue,M.x()),t.highlightPoint(r,a,!0);var o=n.values[a];if(typeof o=="undefined")return;typeof s=="undefined"&&(s=o),typeof f=="undefined"&&(f=M.xScale()(M.x()(o,a)));var u=t.style()=="expand"?o.display.y:M.y()(o,a);c.push({key:n.key,value:u,color:l(n,n.seriesIndex),stackedValue:o.display})}),c.reverse();if(c.length>2){var h=M.yScale().invert(i.mouseY),p=Infinity,d=null;c.forEach(function(e,t){h=Math.abs(h);var n=Math.abs(e.stackedValue.y0),r=Math.abs(e.stackedValue.y);if(h>=n&&h<=r+n){d=t;return}}),d!=null&&(c[d].highlight=!0)}var v=n.tickFormat()(M.x()(s,a)),m=t.style()=="expand"?function(e,t){return d3.format(".1%")(e)}:function(e,t){return r.tickFormat()(e)};o.tooltip.position({left:f+u.left,top:i.mouseY+u.top}).chartContainer(D.parentNode).enabled(g).valueFormatter(m).data({value:v,series:c})(),o.renderGuideLine(f)}),o.dispatch.on("elementMouseout",function(e){N.tooltipHide(),t.clearHighlights()}),N.on("tooltipShow",function(e){g&&O(e,D.parentNode)}),N.on("changeState",function(e){typeof e.disabled!="undefined"&&y.length===e.disabled.length&&(y.forEach(function(t,n){t.disabled=e.disabled[n]}),S.disabled=e.disabled),typeof e.style!="undefined"&&t.style(e.style),M.update()})}),M}var t=e.models.stackedArea(),n=e.models.axis(),r=e.models.axis(),i=e.models.legend(),s=e.models.legend(),o=e.interactiveGuideline(),u={top:30,right:25,bottom:50,left:60},a=null,f=null,l=e.utils.defaultColor(),c=!0,h=!0,p=!0,d=!0,v=!1,m=!1,g=!0,y=function(e,t,n,r,i){return"<h3>"+e+"</h3>"+"<p>"+n+" on "+t+"</p>"},b,w,E=d3.format(",.2f"),S={style:t.style()},x=null,T="No Data Available.",N=d3.dispatch("tooltipShow","tooltipHide","stateChange","changeState"),C=250,k=["Stacked","Stream","Expanded"],L={},A=250;n.orient("bottom").tickPadding(7),r.orient(v?"right":"left"),s.updateState(!1);var O=function(i,s){var o=i.pos[0]+(s.offsetLeft||0),u=i.pos[1]+(s.offsetTop||0),a=n.tickFormat()(t.x()(i.point,i.pointIndex)),f=r.tickFormat()(t.y()(i.point,i.pointIndex)),l=y(i.series.key,a,f,i,M);e.tooltip.show([o,u],l,i.value<0?"n":"s",null,s)};return t.dispatch.on("tooltipShow",function(e){e.pos=[e.pos[0]+u.left,e.pos[1]+u.top],N.tooltipShow(e)}),t.dispatch.on("tooltipHide",function(e){N.tooltipHide(e)}),N.on("tooltipHide",function(){g&&e.tooltip.cleanup()}),M.dispatch=N,M.stacked=t,M.legend=i,M.controls=s,M.xAxis=n,M.yAxis=r,M.interactiveLayer=o,d3.rebind(M,t,"x","y","size","xScale","yScale","xDomain","yDomain","xRange","yRange","sizeDomain","interactive","useVoronoi","offset","order","style","clipEdge","forceX","forceY","forceSize","interpolate"),M.options=e.utils.optionsFunc.bind(M),M.margin=function(e){return arguments.length?(u.top=typeof e.top!="undefined"?e.top:u.top,u.right=typeof e.right!="undefined"?e.right:u.right,u.bottom=typeof e.bottom!="undefined"?e.bottom:u.bottom,u.left=typeof e.left!="undefined"?e.left:u.left,M):u},M.width=function(e){return arguments.length?(a=e,M):a},M.height=function(e){return arguments.length?(f=e,M):f},M.color=function(n){return arguments.length?(l=e.utils.getColor(n),i.color(l),t.color(l),M):l},M.showControls=function(e){return arguments.length?(c=e,M):c},M.showLegend=function(e){return arguments.length?(h=e,M):h},M.showXAxis=function(e){return arguments.length?(p=e,M):p},M.showYAxis=function(e){return arguments.length?(d=e,M):d},M.rightAlignYAxis=function(e){return arguments.length?(v=e,r.orient(e?"right":"left"),M):v},M.useInteractiveGuideline=function(e){return arguments.length?(m=e,e===!0&&(M.interactive(!1),M.useVoronoi(!1)),M):m},M.tooltip=function(e){return arguments.length?(y=e,M):y},M.tooltips=function(e){return arguments.length?(g=e,M):g},M.tooltipContent=function(e){return arguments.length?(y=e,M):y},M.state=function(e){return arguments.length?(S=e,M):S},M.defaultState=function(e){return arguments.length?(x=e,M):x},M.noData=function(e){return arguments.length?(T=e,M):T},M.transitionDuration=function(e){return arguments.length?(A=e,M):A},M.controlsData=function(e){return arguments.length?(k=e,M):k},M.controlLabels=function(e){return arguments.length?typeof e!="object"?L:(L=e,M):L},r.setTickFormat=r.tickFormat,r.tickFormat=function(e){return arguments.length?(E=e,r):E},M}})();
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..80a7b69dcce544dfa87ae851d92acdae0e93fb0f
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/js/respond.min.js
@@ -0,0 +1,5 @@
+/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+ * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+ *  */
+
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
new file mode 100644
index 0000000000000000000000000000000000000000..4bb0e42cc1028aa1791e73e6c7b450bbd7ad65db
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
@@ -0,0 +1,11 @@
+     <tr>
+      <td class="{{methods_level}}" colspan="4">{{name}}</td>
+      <td class="{{methods_level}} big">{{methods_bar}}</td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_tested_percent}}</div></td>
+      <td class="{{methods_level}} small"><div align="right">{{methods_number}}</div></td>
+      <td class="{{methods_level}} small">{{crap}}</td>
+      <td class="{{lines_level}} big">{{lines_bar}}</td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_executed_percent}}</div></td>
+      <td class="{{lines_level}} small"><div align="right">{{lines_number}}</div></td>
+     </tr>
+
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php
similarity index 86%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php
index 4a0fcd9311f0d6323980717633783208eaca11fa..cc9e8eac0cac8d2b8cf0917c363579a184b5769f 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
@@ -87,7 +87,7 @@ abstract class PHP_CodeCoverage_Report_Node implements Countable
      * @param string                       $name
      * @param PHP_CodeCoverage_Report_Node $parent
      */
-    public function __construct($name, PHP_CodeCoverage_Report_Node $parent = NULL)
+    public function __construct($name, PHP_CodeCoverage_Report_Node $parent = null)
     {
         if (substr($name, -1) == '/') {
             $name = substr($name, 0, -1);
@@ -110,10 +110,10 @@ public function getName()
      */
     public function getId()
     {
-        if ($this->id === NULL) {
+        if ($this->id === null) {
             $parent = $this->getParent();
 
-            if ($parent === NULL) {
+            if ($parent === null) {
                 $this->id = 'index';
             } else {
                 $parentId = $parent->getId();
@@ -121,7 +121,7 @@ public function getId()
                 if ($parentId == 'index') {
                     $this->id = str_replace(':', '_', $this->name);
                 } else {
-                    $this->id = $parentId . '_' . $this->name;
+                    $this->id = $parentId . '/' . $this->name;
                 }
             }
         }
@@ -134,8 +134,8 @@ public function getId()
      */
     public function getPath()
     {
-        if ($this->path === NULL) {
-            if ($this->parent === NULL) {
+        if ($this->path === null) {
+            if ($this->parent === null || $this->parent->getPath() === null) {
                 $this->path = $this->name;
             } else {
                 $this->path = $this->parent->getPath() . '/' . $this->name;
@@ -150,8 +150,8 @@ public function getPath()
      */
     public function getPathAsArray()
     {
-        if ($this->pathArray === NULL) {
-            if ($this->parent === NULL) {
+        if ($this->pathArray === null) {
+            if ($this->parent === null) {
                 $this->pathArray = array();
             } else {
                 $this->pathArray = $this->parent->getPathAsArray();
@@ -177,12 +177,12 @@ public function getParent()
      * @param  boolean $asString
      * @return integer
      */
-    public function getTestedClassesPercent($asString = TRUE)
+    public function getTestedClassesPercent($asString = true)
     {
         return PHP_CodeCoverage_Util::percent(
-          $this->getNumTestedClasses(),
-          $this->getNumClasses(),
-          $asString
+            $this->getNumTestedClasses(),
+            $this->getNumClasses(),
+            $asString
         );
     }
 
@@ -192,12 +192,12 @@ public function getTestedClassesPercent($asString = TRUE)
      * @param  boolean $asString
      * @return integer
      */
-    public function getTestedTraitsPercent($asString = TRUE)
+    public function getTestedTraitsPercent($asString = true)
     {
         return PHP_CodeCoverage_Util::percent(
-          $this->getNumTestedTraits(),
-          $this->getNumTraits(),
-          $asString
+            $this->getNumTestedTraits(),
+            $this->getNumTraits(),
+            $asString
         );
     }
 
@@ -208,12 +208,12 @@ public function getTestedTraitsPercent($asString = TRUE)
      * @return integer
      * @since  Method available since Release 1.2.0
      */
-    public function getTestedClassesAndTraitsPercent($asString = TRUE)
+    public function getTestedClassesAndTraitsPercent($asString = true)
     {
         return PHP_CodeCoverage_Util::percent(
-          $this->getNumTestedClassesAndTraits(),
-          $this->getNumClassesAndTraits(),
-          $asString
+            $this->getNumTestedClassesAndTraits(),
+            $this->getNumClassesAndTraits(),
+            $asString
         );
     }
 
@@ -223,12 +223,12 @@ public function getTestedClassesAndTraitsPercent($asString = TRUE)
      * @param  boolean $asString
      * @return integer
      */
-    public function getTestedMethodsPercent($asString = TRUE)
+    public function getTestedMethodsPercent($asString = true)
     {
         return PHP_CodeCoverage_Util::percent(
-          $this->getNumTestedMethods(),
-          $this->getNumMethods(),
-          $asString
+            $this->getNumTestedMethods(),
+            $this->getNumMethods(),
+            $asString
         );
     }
 
@@ -238,12 +238,12 @@ public function getTestedMethodsPercent($asString = TRUE)
      * @param  boolean $asString
      * @return integer
      */
-    public function getLineExecutedPercent($asString = TRUE)
+    public function getLineExecutedPercent($asString = true)
     {
         return PHP_CodeCoverage_Util::percent(
-          $this->getNumExecutedLines(),
-          $this->getNumExecutableLines(),
-          $asString
+            $this->getNumExecutedLines(),
+            $this->getNumExecutableLines(),
+            $asString
         );
     }
 
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Directory.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php
similarity index 91%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Directory.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php
index 44e151e13067ff309a873df8bc3a24e7de2d7ae5..f4c37e079fb826252d7803d1752559eebd9d7958 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Directory.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
@@ -89,7 +89,7 @@ class PHP_CodeCoverage_Report_Node_Directory extends PHP_CodeCoverage_Report_Nod
     /**
      * @var array
      */
-    protected $linesOfCode = NULL;
+    protected $linesOfCode = null;
 
     /**
      * @var integer
@@ -172,15 +172,15 @@ public function count()
     public function getIterator()
     {
         return new RecursiveIteratorIterator(
-          new PHP_CodeCoverage_Report_Node_Iterator($this),
-          RecursiveIteratorIterator::SELF_FIRST
+            new PHP_CodeCoverage_Report_Node_Iterator($this),
+            RecursiveIteratorIterator::SELF_FIRST
         );
     }
 
     /**
      * Adds a new directory.
      *
-     * @param  string $name
+     * @param  string                                 $name
      * @return PHP_CodeCoverage_Report_Node_Directory
      */
     public function addDirectory($name)
@@ -196,17 +196,17 @@ public function addDirectory($name)
     /**
      * Adds a new file.
      *
-     * @param  string  $name
-     * @param  array   $coverageData
-     * @param  array   $testData
-     * @param  boolean $cacheTokens
+     * @param  string                            $name
+     * @param  array                             $coverageData
+     * @param  array                             $testData
+     * @param  boolean                           $cacheTokens
      * @return PHP_CodeCoverage_Report_Node_File
      * @throws PHP_CodeCoverage_Exception
      */
     public function addFile($name, array $coverageData, array $testData, $cacheTokens)
     {
         $file = new PHP_CodeCoverage_Report_Node_File(
-          $name, $this, $coverageData, $testData, $cacheTokens
+            $name, $this, $coverageData, $testData, $cacheTokens
         );
 
         $this->children[] = $file;
@@ -255,12 +255,12 @@ public function getChildNodes()
      */
     public function getClasses()
     {
-        if ($this->classes === NULL) {
+        if ($this->classes === null) {
             $this->classes = array();
 
             foreach ($this->children as $child) {
                 $this->classes = array_merge(
-                  $this->classes, $child->getClasses()
+                    $this->classes, $child->getClasses()
                 );
             }
         }
@@ -275,12 +275,12 @@ public function getClasses()
      */
     public function getTraits()
     {
-        if ($this->traits === NULL) {
+        if ($this->traits === null) {
             $this->traits = array();
 
             foreach ($this->children as $child) {
                 $this->traits = array_merge(
-                  $this->traits, $child->getTraits()
+                    $this->traits, $child->getTraits()
                 );
             }
         }
@@ -295,12 +295,12 @@ public function getTraits()
      */
     public function getFunctions()
     {
-        if ($this->functions === NULL) {
+        if ($this->functions === null) {
             $this->functions = array();
 
             foreach ($this->children as $child) {
                 $this->functions = array_merge(
-                  $this->functions, $child->getFunctions()
+                    $this->functions, $child->getFunctions()
                 );
             }
         }
@@ -315,7 +315,7 @@ public function getFunctions()
      */
     public function getLinesOfCode()
     {
-        if ($this->linesOfCode === NULL) {
+        if ($this->linesOfCode === null) {
             $this->linesOfCode = array('loc' => 0, 'cloc' => 0, 'ncloc' => 0);
 
             foreach ($this->children as $child) {
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/File.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php
similarity index 80%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/File.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php
index 44e4783198725d711b5d24206d308bec33cd73fc..45ea9fdf313182ff4e75d61c4aab46c87e10eee0 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/File.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
@@ -66,11 +66,6 @@ class PHP_CodeCoverage_Report_Node_File extends PHP_CodeCoverage_Report_Node
      */
     protected $testData;
 
-    /**
-     * @var array
-     */
-    protected $ignoredLines;
-
     /**
      * @var integer
      */
@@ -114,17 +109,17 @@ class PHP_CodeCoverage_Report_Node_File extends PHP_CodeCoverage_Report_Node
     /**
      * @var integer
      */
-    protected $numMethods = NULL;
+    protected $numMethods = null;
 
     /**
      * @var integer
      */
-    protected $numTestedMethods = NULL;
+    protected $numTestedMethods = null;
 
     /**
      * @var integer
      */
-    protected $numTestedFunctions = NULL;
+    protected $numTestedFunctions = null;
 
     /**
      * @var array
@@ -155,7 +150,7 @@ public function __construct($name, PHP_CodeCoverage_Report_Node $parent, array $
     {
         if (!is_bool($cacheTokens)) {
             throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
-              1, 'boolean'
+                1, 'boolean'
             );
         }
 
@@ -163,9 +158,6 @@ public function __construct($name, PHP_CodeCoverage_Report_Node $parent, array $
 
         $this->coverageData = $coverageData;
         $this->testData     = $testData;
-        $this->ignoredLines = PHP_CodeCoverage_Util::getLinesToBeIgnored(
-                                $this->getPath(), $cacheTokens
-                              );
         $this->cacheTokens  = $cacheTokens;
 
         $this->calculateStatistics();
@@ -201,14 +193,6 @@ public function getTestData()
         return $this->testData;
     }
 
-    /**
-     * @return array
-     */
-    public function getIgnoredLines()
-    {
-        return $this->ignoredLines;
-    }
-
     /**
      * Returns the classes of this node.
      *
@@ -316,7 +300,7 @@ public function getNumTestedTraits()
      */
     public function getNumMethods()
     {
-        if ($this->numMethods === NULL) {
+        if ($this->numMethods === null) {
             $this->numMethods = 0;
 
             foreach ($this->classes as $class) {
@@ -346,7 +330,7 @@ public function getNumMethods()
      */
     public function getNumTestedMethods()
     {
-        if ($this->numTestedMethods === NULL) {
+        if ($this->numTestedMethods === null) {
             $this->numTestedMethods = 0;
 
             foreach ($this->classes as $class) {
@@ -388,7 +372,7 @@ public function getNumFunctions()
      */
     public function getNumTestedFunctions()
     {
-        if ($this->numTestedFunctions === NULL) {
+        if ($this->numTestedFunctions === null) {
             $this->numTestedFunctions = 0;
 
             foreach ($this->functions as $function) {
@@ -442,9 +426,8 @@ protected function calculateStatistics()
                 }
             }
 
-            if (!isset($this->ignoredLines[$lineNumber]) &&
-                isset($this->coverageData[$lineNumber]) &&
-                $this->coverageData[$lineNumber] !== NULL) {
+            if (isset($this->coverageData[$lineNumber]) &&
+                $this->coverageData[$lineNumber] !== null) {
                 if (isset($currentClass)) {
                     $currentClass['executableLines']++;
                 }
@@ -463,8 +446,7 @@ protected function calculateStatistics()
 
                 $this->numExecutableLines++;
 
-                if (count($this->coverageData[$lineNumber]) > 0 ||
-                    isset($this->ignoredLines[$lineNumber])) {
+                if (count($this->coverageData[$lineNumber]) > 0) {
                     if (isset($currentClass)) {
                         $currentClass['executedLines']++;
                     }
@@ -512,13 +494,13 @@ protected function calculateStatistics()
             foreach ($trait['methods'] as &$method) {
                 if ($method['executableLines'] > 0) {
                     $method['coverage'] = ($method['executedLines'] /
-                                           $method['executableLines']) * 100;
+                            $method['executableLines']) * 100;
                 } else {
                     $method['coverage'] = 100;
                 }
 
                 $method['crap'] = $this->crap(
-                  $method['ccn'], $method['coverage']
+                    $method['ccn'], $method['coverage']
                 );
 
                 $trait['ccn'] += $method['ccn'];
@@ -526,7 +508,7 @@ protected function calculateStatistics()
 
             if ($trait['executableLines'] > 0) {
                 $trait['coverage'] = ($trait['executedLines'] /
-                                      $trait['executableLines']) * 100;
+                        $trait['executableLines']) * 100;
             } else {
                 $trait['coverage'] = 100;
             }
@@ -536,7 +518,7 @@ protected function calculateStatistics()
             }
 
             $trait['crap'] = $this->crap(
-              $trait['ccn'], $trait['coverage']
+                $trait['ccn'], $trait['coverage']
             );
         }
 
@@ -544,13 +526,13 @@ protected function calculateStatistics()
             foreach ($class['methods'] as &$method) {
                 if ($method['executableLines'] > 0) {
                     $method['coverage'] = ($method['executedLines'] /
-                                           $method['executableLines']) * 100;
+                            $method['executableLines']) * 100;
                 } else {
                     $method['coverage'] = 100;
                 }
 
                 $method['crap'] = $this->crap(
-                  $method['ccn'], $method['coverage']
+                    $method['ccn'], $method['coverage']
                 );
 
                 $class['ccn'] += $method['ccn'];
@@ -558,7 +540,7 @@ protected function calculateStatistics()
 
             if ($class['executableLines'] > 0) {
                 $class['coverage'] = ($class['executedLines'] /
-                                      $class['executableLines']) * 100;
+                        $class['executableLines']) * 100;
             } else {
                 $class['coverage'] = 100;
             }
@@ -568,7 +550,7 @@ protected function calculateStatistics()
             }
 
             $class['crap'] = $this->crap(
-              $class['ccn'], $class['coverage']
+                $class['ccn'], $class['coverage']
             );
         }
     }
@@ -585,16 +567,16 @@ protected function processClasses(PHP_Token_Stream $tokens)
 
         foreach ($classes as $className => $class) {
             $this->classes[$className] = array(
-              'className'       => $className,
-              'methods'         => array(),
-              'startLine'       => $class['startLine'],
-              'executableLines' => 0,
-              'executedLines'   => 0,
-              'ccn'             => 0,
-              'coverage'        => 0,
-              'crap'            => 0,
-              'package'         => $class['package'],
-              'link'            => $link . $class['startLine']
+                'className'       => $className,
+                'methods'         => array(),
+                'startLine'       => $class['startLine'],
+                'executableLines' => 0,
+                'executedLines'   => 0,
+                'ccn'             => 0,
+                'coverage'        => 0,
+                'crap'            => 0,
+                'package'         => $class['package'],
+                'link'            => $link . $class['startLine']
             );
 
             $this->startLines[$class['startLine']] = &$this->classes[$className];
@@ -602,16 +584,16 @@ protected function processClasses(PHP_Token_Stream $tokens)
 
             foreach ($class['methods'] as $methodName => $method) {
                 $this->classes[$className]['methods'][$methodName] = array(
-                  'methodName'      => $methodName,
-                  'signature'       => $method['signature'],
-                  'startLine'       => $method['startLine'],
-                  'endLine'         => $method['endLine'],
-                  'executableLines' => 0,
-                  'executedLines'   => 0,
-                  'ccn'             => $method['ccn'],
-                  'coverage'        => 0,
-                  'crap'            => 0,
-                  'link'            => $link . $method['startLine']
+                    'methodName'      => $methodName,
+                    'signature'       => $method['signature'],
+                    'startLine'       => $method['startLine'],
+                    'endLine'         => $method['endLine'],
+                    'executableLines' => 0,
+                    'executedLines'   => 0,
+                    'ccn'             => $method['ccn'],
+                    'coverage'        => 0,
+                    'crap'            => 0,
+                    'link'            => $link . $method['startLine']
                 );
 
                 $this->startLines[$method['startLine']] = &$this->classes[$className]['methods'][$methodName];
@@ -632,16 +614,16 @@ protected function processTraits(PHP_Token_Stream $tokens)
 
         foreach ($traits as $traitName => $trait) {
             $this->traits[$traitName] = array(
-              'traitName'       => $traitName,
-              'methods'         => array(),
-              'startLine'       => $trait['startLine'],
-              'executableLines' => 0,
-              'executedLines'   => 0,
-              'ccn'             => 0,
-              'coverage'        => 0,
-              'crap'            => 0,
-              'package'         => $trait['package'],
-              'link'            => $link . $trait['startLine']
+                'traitName'       => $traitName,
+                'methods'         => array(),
+                'startLine'       => $trait['startLine'],
+                'executableLines' => 0,
+                'executedLines'   => 0,
+                'ccn'             => 0,
+                'coverage'        => 0,
+                'crap'            => 0,
+                'package'         => $trait['package'],
+                'link'            => $link . $trait['startLine']
             );
 
             $this->startLines[$trait['startLine']] = &$this->traits[$traitName];
@@ -649,16 +631,16 @@ protected function processTraits(PHP_Token_Stream $tokens)
 
             foreach ($trait['methods'] as $methodName => $method) {
                 $this->traits[$traitName]['methods'][$methodName] = array(
-                  'methodName'      => $methodName,
-                  'signature'       => $method['signature'],
-                  'startLine'       => $method['startLine'],
-                  'endLine'         => $method['endLine'],
-                  'executableLines' => 0,
-                  'executedLines'   => 0,
-                  'ccn'             => $method['ccn'],
-                  'coverage'        => 0,
-                  'crap'            => 0,
-                  'link'            => $link . $method['startLine']
+                    'methodName'      => $methodName,
+                    'signature'       => $method['signature'],
+                    'startLine'       => $method['startLine'],
+                    'endLine'         => $method['endLine'],
+                    'executableLines' => 0,
+                    'executedLines'   => 0,
+                    'ccn'             => $method['ccn'],
+                    'coverage'        => 0,
+                    'crap'            => 0,
+                    'link'            => $link . $method['startLine']
                 );
 
                 $this->startLines[$method['startLine']] = &$this->traits[$traitName]['methods'][$methodName];
@@ -679,15 +661,15 @@ protected function processFunctions(PHP_Token_Stream $tokens)
 
         foreach ($functions as $functionName => $function) {
             $this->functions[$functionName] = array(
-              'functionName'    => $functionName,
-              'signature'       => $function['signature'],
-              'startLine'       => $function['startLine'],
-              'executableLines' => 0,
-              'executedLines'   => 0,
-              'ccn'             => $function['ccn'],
-              'coverage'        => 0,
-              'crap'            => 0,
-              'link'            => $link . $function['startLine']
+                'functionName'    => $functionName,
+                'signature'       => $function['signature'],
+                'startLine'       => $function['startLine'],
+                'executableLines' => 0,
+                'executedLines'   => 0,
+                'ccn'             => $function['ccn'],
+                'coverage'        => 0,
+                'crap'            => 0,
+                'link'            => $link . $function['startLine']
             );
 
             $this->startLines[$function['startLine']] = &$this->functions[$functionName];
@@ -707,15 +689,15 @@ protected function processFunctions(PHP_Token_Stream $tokens)
     protected function crap($ccn, $coverage)
     {
         if ($coverage == 0) {
-            return (string)pow($ccn, 2) + $ccn;
+            return (string) pow($ccn, 2) + $ccn;
         }
 
         if ($coverage >= 95) {
-            return (string)$ccn;
+            return (string) $ccn;
         }
 
         return sprintf(
-          '%01.2F', pow($ccn, 2) * pow(1 - $coverage/100, 3) + $ccn
+            '%01.2F', pow($ccn, 2) * pow(1 - $coverage/100, 3) + $ccn
         );
     }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Iterator.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php
similarity index 94%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Iterator.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php
index e8e97403a644f0298fb0e74f66fd833b23a89567..bbfbede3eb2b8968fef07cfd7aec232b86f741b9 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Iterator.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -49,7 +49,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
@@ -112,7 +112,7 @@ public function key()
      */
     public function current()
     {
-        return $this->valid() ? $this->nodes[$this->position] : NULL;
+        return $this->valid() ? $this->nodes[$this->position] : null;
     }
 
     /**
@@ -132,7 +132,7 @@ public function next()
     public function getChildren()
     {
         return new PHP_CodeCoverage_Report_Node_Iterator(
-          $this->nodes[$this->position]
+            $this->nodes[$this->position]
         );
     }
 
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php
similarity index 64%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php
index 74edb6869d2e243c35b4000d0eff35953b590c84..50c534755596481923f7e3c1e56b7ba195369999 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,56 +37,56 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.2.1
+ * @since      File available since Release 1.1.0
  */
 
 /**
- * 
+ * Uses var_export() to write a PHP_CodeCoverage object to a file.
  *
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     uyga <iamuyga@gmail.com>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.2.1
+ * @since      Class available since Release 1.1.0
  */
-class PHP_CodeCoverage_Version
+class PHP_CodeCoverage_Report_PHP
 {
-    const VERSION = '1.2.11';
-    protected static $version;
-
     /**
-     * Returns the version of PHP_CodeCoverage.
-     *
+     * @param  PHP_CodeCoverage $coverage
+     * @param  string           $target
      * @return string
      */
-    public static function id()
+    public function process(PHP_CodeCoverage $coverage, $target = null)
     {
-        if (self::$version === NULL) {
-            self::$version = self::VERSION;
+        $filter = $coverage->filter();
 
-            if (is_dir(dirname(dirname(__DIR__)) . '/.git')) {
-                $dir = getcwd();
-                chdir(__DIR__);
-                $version = exec('git describe --tags');
-                chdir($dir);
+        $output = sprintf(
+            '<?php
+$coverage = new PHP_CodeCoverage;
+$coverage->setData(%s);
+$coverage->setTests(%s);
 
-                if ($version) {
-                    if (count(explode('.', self::VERSION)) == 3) {
-                        self::$version = $version;
-                    } else {
-                        $version = explode('-', $version);
+$filter = $coverage->filter();
+$filter->setBlacklistedFiles(%s);
+$filter->setWhitelistedFiles(%s);
 
-                        self::$version = self::VERSION . '-' . $version[2];
-                    }
-                }
-            }
-        }
+return $coverage;',
+            var_export($coverage->getData(true), 1),
+            var_export($coverage->getTests(), 1),
+            var_export($filter->getBlacklistedFiles(), 1),
+            var_export($filter->getWhitelistedFiles(), 1)
+        );
 
-        return self::$version;
+        if ($target !== null) {
+            return file_put_contents($target, $output);
+        } else {
+            return $output;
+        }
     }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Text.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php
similarity index 54%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Text.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php
index 719991c9758dfa37f8520be507cc99a0346737e1..cec9db96b8a35afc9af53378cc37e39052b6d53f 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Text.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -51,88 +51,130 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
  */
 class PHP_CodeCoverage_Report_Text
 {
-    protected $outputStream;
     protected $lowUpperBound;
     protected $highLowerBound;
     protected $showUncoveredFiles;
+    protected $showOnlySummary;
 
     protected $colors = array(
-      'green'  => "\x1b[30;42m",
-      'yellow' => "\x1b[30;43m",
-      'red'    => "\x1b[37;41m",
-      'header' => "\x1b[47;40m",
-      'reset'  => "\x1b[0m",
-      'eol'    => "\x1b[2K",
+        'green'  => "\x1b[30;42m",
+        'yellow' => "\x1b[30;43m",
+        'red'    => "\x1b[37;41m",
+        'header' => "\x1b[1;37;40m",
+        'reset'  => "\x1b[0m",
+        'eol'    => "\x1b[2K",
     );
 
-    public function __construct(PHPUnit_Util_Printer $outputStream, $lowUpperBound, $highLowerBound, $showUncoveredFiles)
+    public function __construct($lowUpperBound, $highLowerBound, $showUncoveredFiles, $showOnlySummary)
     {
-        $this->outputStream       = $outputStream;
         $this->lowUpperBound      = $lowUpperBound;
         $this->highLowerBound     = $highLowerBound;
         $this->showUncoveredFiles = $showUncoveredFiles;
+        $this->showOnlySummary    = $showOnlySummary;
     }
 
     /**
      * @param  PHP_CodeCoverage $coverage
-     * @param  string           $target
-     * @param  string           $name
+     * @param  bool             $showColors
      * @return string
      */
-    public function process(PHP_CodeCoverage $coverage, $showColors = FALSE)
+    public function process(PHP_CodeCoverage $coverage, $showColors = false)
     {
-        $output = '';
+        $output = PHP_EOL . PHP_EOL;
         $report = $coverage->getReport();
         unset($coverage);
 
         $colors = array(
-          'header'  => '',
-          'classes' => '',
-          'methods' => '',
-          'lines'   => '',
-          'reset'   => '',
-          'eol'     => ''
+            'header'  => '',
+            'classes' => '',
+            'methods' => '',
+            'lines'   => '',
+            'reset'   => '',
+            'eol'     => ''
         );
 
         if ($showColors) {
             $colors['classes'] = $this->getCoverageColor(
-                                   $report->getNumTestedClassesAndTraits(),
-                                   $report->getNumClassesAndTraits()
-                                 );
+                $report->getNumTestedClassesAndTraits(),
+                $report->getNumClassesAndTraits()
+            );
             $colors['methods'] = $this->getCoverageColor(
-                                   $report->getNumTestedMethods(),
-                                   $report->getNumMethods()
-                                 );
+                $report->getNumTestedMethods(),
+                $report->getNumMethods()
+            );
             $colors['lines']   = $this->getCoverageColor(
-                                   $report->getNumExecutedLines(),
-                                   $report->getNumExecutableLines()
-                                 );
+                $report->getNumExecutedLines(),
+                $report->getNumExecutableLines()
+            );
             $colors['reset']   = $this->colors['reset'];
             $colors['header']  = $this->colors['header'];
             $colors['eol']     = $this->colors['eol'];
         }
 
-        $output .= PHP_EOL . PHP_EOL .
-                   $colors['header'] . 'Code Coverage Report ';
+        $classes = sprintf(
+            '  Classes: %6s (%d/%d)',
+            PHP_CodeCoverage_Util::percent(
+                $report->getNumTestedClassesAndTraits(),
+                $report->getNumClassesAndTraits(),
+                true
+            ),
+            $report->getNumTestedClassesAndTraits(),
+            $report->getNumClassesAndTraits()
+        );
+
+        $methods = sprintf(
+            '  Methods: %6s (%d/%d)',
+            PHP_CodeCoverage_Util::percent(
+                $report->getNumTestedMethods(),
+                $report->getNumMethods(),
+                true
+            ),
+            $report->getNumTestedMethods(),
+            $report->getNumMethods()
+        );
+
+        $lines = sprintf(
+            '  Lines:   %6s (%d/%d)',
+            PHP_CodeCoverage_Util::percent(
+                $report->getNumExecutedLines(),
+                $report->getNumExecutableLines(),
+                true
+            ),
+            $report->getNumExecutedLines(),
+            $report->getNumExecutableLines()
+        );
+
+        $padding = max(array_map('strlen', array($classes, $methods, $lines)));
 
-        $output .= PHP_EOL .
-                   date('  Y-m-d H:i:s', $_SERVER['REQUEST_TIME']) .
-                   PHP_EOL;
+        if ($this->showOnlySummary) {
+            $title = 'Code Coverage Report Summary:';
+            $padding = max($padding, strlen($title));
 
-        $output .= PHP_EOL . ' Summary: ' . PHP_EOL . $colors['reset']
-          . $colors['classes'] . $colors['eol'] . '  Classes: ' . PHP_CodeCoverage_Util::percent($report->getNumTestedClassesAndTraits(), $report->getNumClassesAndTraits(), TRUE)
-          . ' (' . $report->getNumTestedClassesAndTraits() . '/' . $report->getNumClassesAndTraits() . ')' . PHP_EOL . $colors ['eol']
-          . $colors['methods'] . $colors['eol'] . '  Methods: ' . PHP_CodeCoverage_Util::percent($report->getNumTestedMethods(), $report->getNumMethods(), TRUE)
-          . ' (' . $report->getNumTestedMethods() . '/' . $report->getNumMethods() . ')' . PHP_EOL . $colors ['eol']
-          . $colors['lines'] . $colors['eol'] . '  Lines:   ' . PHP_CodeCoverage_Util::percent($report->getNumExecutedLines(), $report->getNumExecutableLines(), TRUE)
-          . ' (' . $report->getNumExecutedLines() . '/' . $report->getNumExecutableLines() . ')' . PHP_EOL . $colors['reset'] . $colors ['eol'];
+            $output .= $this->format($colors['header'], $padding, $title);
+        } else {
+            $date = date('  Y-m-d H:i:s', $_SERVER['REQUEST_TIME']);
+            $title = 'Code Coverage Report:';
+
+            $output .= $this->format($colors['header'], $padding, $title);
+            $output .= $this->format($colors['header'], $padding, $date);
+            $output .= $this->format($colors['header'], $padding, '');
+            $output .= $this->format($colors['header'], $padding, ' Summary:');
+        }
+
+        $output .= $this->format($colors['classes'], $padding, $classes);
+        $output .= $this->format($colors['methods'], $padding, $methods);
+        $output .= $this->format($colors['lines'], $padding, $lines);
+
+        if ($this->showOnlySummary) {
+            return $output . PHP_EOL;
+        }
 
         $classCoverage = array();
 
@@ -141,73 +183,31 @@ public function process(PHP_CodeCoverage $coverage, $showColors = FALSE)
                 continue;
             }
 
-            $classes      = $item->getClassesAndTraits();
-            $coverage     = $item->getCoverageData();
-            $lines        = array();
-            $ignoredLines = $item->getIgnoredLines();
+            $classes  = $item->getClassesAndTraits();
 
             foreach ($classes as $className => $class) {
                 $classStatements        = 0;
                 $coveredClassStatements = 0;
                 $coveredMethods         = 0;
+                $classMethods           = 0;
 
                 foreach ($class['methods'] as $method) {
-                    $methodCount        = 0;
-                    $methodLines        = 0;
-                    $methodLinesCovered = 0;
-
-                    for ($i  = $method['startLine'];
-                         $i <= $method['endLine'];
-                         $i++) {
-                        if (isset($ignoredLines[$i])) {
-                            continue;
-                        }
-
-                        $add   = TRUE;
-                        $count = 0;
-
-                        if (isset($coverage[$i])) {
-                            if ($coverage[$i] !== NULL) {
-                                $classStatements++;
-                                $methodLines++;
-                            } else {
-                                $add = FALSE;
-                            }
-
-                            $count = count($coverage[$i]);
-
-                            if ($count > 0) {
-                                $coveredClassStatements++;
-                                $methodLinesCovered++;
-                            }
-                        } else {
-                            $add = FALSE;
-                        }
-
-                        $methodCount = max($methodCount, $count);
-
-                        if ($add) {
-                            $lines[$i] = array(
-                              'count' => $count, 'type'  => 'stmt'
-                            );
-                        }
-                    }
+                    if ($method['executableLines'] == 0)
+                        continue;
 
-                    if ($methodCount > 0) {
+                    $classMethods++;
+                    $classStatements        += $method['executableLines'];
+                    $coveredClassStatements += $method['executedLines'];
+                    if ($method['coverage'] == 100) {
                         $coveredMethods++;
                     }
-
                 }
 
                 if (!empty($class['package']['namespace'])) {
                     $namespace = '\\' . $class['package']['namespace'] . '::';
-                }
-
-                else if (!empty($class['package']['fullPackage'])) {
+                } elseif (!empty($class['package']['fullPackage'])) {
                     $namespace = '@' . $class['package']['fullPackage'] . '::';
-                }
-
-                else {
+                } else {
                     $namespace = '';
                 }
 
@@ -215,7 +215,7 @@ public function process(PHP_CodeCoverage $coverage, $showColors = FALSE)
                     'namespace'         => $namespace,
                     'className '        => $className,
                     'methodsCovered'    => $coveredMethods,
-                    'methodCount'       => count($class['methods']),
+                    'methodCount'       => $classMethods,
                     'statementsCovered' => $coveredClassStatements,
                     'statementCount'    => $classStatements,
                 );
@@ -239,26 +239,24 @@ public function process(PHP_CodeCoverage $coverage, $showColors = FALSE)
                 }
 
                 $output .= PHP_EOL . $fullQualifiedPath . PHP_EOL
-                  . '  ' . $methodColor . 'Methods: ' . $this->printCoverageCounts($classInfo['methodsCovered'], $classInfo['methodCount'], 2) . $resetColor . ' '
-                  . '  ' . $linesColor  . 'Lines: ' . $this->printCoverageCounts($classInfo['statementsCovered'], $classInfo['statementCount'], 3) . $resetColor
+                    . '  ' . $methodColor . 'Methods: ' . $this->printCoverageCounts($classInfo['methodsCovered'], $classInfo['methodCount'], 2) . $resetColor . ' '
+                    . '  ' . $linesColor  . 'Lines: ' . $this->printCoverageCounts($classInfo['statementsCovered'], $classInfo['statementCount'], 3) . $resetColor
                 ;
             }
         }
 
-        $this->outputStream->write($output . PHP_EOL);
+        return $output . PHP_EOL;
     }
 
     protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements)
     {
         $coverage = PHP_CodeCoverage_Util::percent(
-          $numberOfCoveredElements, $totalNumberOfElements
+            $numberOfCoveredElements, $totalNumberOfElements
         );
 
         if ($coverage > $this->highLowerBound) {
             return $this->colors['green'];
-        }
-
-        else if ($coverage > $this->lowUpperBound) {
+        } elseif ($coverage > $this->lowUpperBound) {
             return $this->colors['yellow'];
         }
 
@@ -270,9 +268,16 @@ protected function printCoverageCounts($numberOfCoveredElements, $totalNumberOfE
         $format = '%' . $presicion . 's';
 
         return PHP_CodeCoverage_Util::percent(
-          $numberOfCoveredElements, $totalNumberOfElements, TRUE, TRUE
+            $numberOfCoveredElements, $totalNumberOfElements, true, true
         ) .
         ' (' . sprintf($format, $numberOfCoveredElements) . '/' .
         sprintf($format, $totalNumberOfElements) . ')';
     }
+
+    private function format($color, $padding, $string)
+    {
+        $reset = $color ? $this->colors['reset'] : '';
+
+        return $color . str_pad($string, $padding) . $reset . PHP_EOL;
+    }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f5a773acb78a3d23afb25c8f980faf3a2816f3e
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML
+{
+    /**
+     * @var string
+     */
+    private $target;
+
+    /**
+     * @var PHP_CodeCoverage_Report_XML_Project
+     */
+    private $project;
+
+    public function process(PHP_CodeCoverage $coverage, $target)
+    {
+        if (substr($target, -1, 1) != DIRECTORY_SEPARATOR) {
+            $target .= DIRECTORY_SEPARATOR;
+        }
+
+        $this->target = $target;
+        $this->initTargetDirectory($target);
+
+        $report = $coverage->getReport();
+
+        $this->project = new PHP_CodeCoverage_Report_XML_Project(
+            $coverage->getReport()->getName()
+        );
+
+        $this->processTests($coverage->getTests());
+        $this->processDirectory($report, $this->project);
+
+        $index = $this->project->asDom();
+        $index->formatOutput = true;
+        $index->preserveWhiteSpace = false;
+        $index->save($target . '/index.xml');
+    }
+
+    private function initTargetDirectory($dir)
+    {
+        if (file_exists($dir)) {
+            if (!is_dir($dir)) {
+                throw new PHP_CodeCoverage_Exception(
+                    "'$dir' exists but is not a directory."
+                );
+            }
+
+            if (!is_writable($dir)) {
+                throw new PHP_CodeCoverage_Exception(
+                    "'$dir' exists but is not writable."
+                );
+            }
+        } elseif (!@mkdir($dir, 0777, true)) {
+            throw new PHP_CodeCoverage_Exception(
+                "'$dir' could not be created."
+            );
+        }
+    }
+
+    private function processDirectory(PHP_CodeCoverage_Report_Node_Directory $directory, PHP_CodeCoverage_Report_XML_Node $context)
+    {
+        $dirObject = $context->addDirectory($directory->getName());
+
+        $this->setTotals($directory, $dirObject->getTotals());
+
+        foreach ($directory as $node) {
+            if ($node instanceof PHP_CodeCoverage_Report_Node_Directory) {
+                $this->processDirectory($node, $dirObject);
+                continue;
+            }
+
+            if ($node instanceof PHP_CodeCoverage_Report_Node_File) {
+                $this->processFile($node, $dirObject);
+                continue;
+            }
+
+            throw new PHP_CodeCoverage_Exception(
+                'Unknown node type for XML report'
+            );
+        }
+    }
+
+    private function processFile(PHP_CodeCoverage_Report_Node_File $file, PHP_CodeCoverage_Report_XML_Directory $context)
+    {
+        $fileObject = $context->addFile(
+            $file->getName(),
+            $file->getId() . '.xml'
+        );
+
+        $this->setTotals($file, $fileObject->getTotals());
+
+        $fileReport = new PHP_CodeCoverage_Report_XML_File_Report(
+            $file->getName()
+        );
+
+        $this->setTotals($file, $fileReport->getTotals());
+
+        foreach ($file->getClassesAndTraits() as $unit) {
+            $this->processUnit($unit, $fileReport);
+        }
+
+        foreach ($file->getFunctions() as $function) {
+            $this->processFunction($function, $fileReport);
+        }
+
+        foreach ($file->getCoverageData() as $line => $tests) {
+            if (!is_array($tests) || count($tests) == 0) {
+                continue;
+            }
+
+            $coverage = $fileReport->getLineCoverage($line);
+
+            foreach ($tests as $test) {
+                $coverage->addTest($test);
+            }
+
+            $coverage->finalize();
+        }
+
+        $this->initTargetDirectory(
+            $this->target . dirname($file->getId()) . '/'
+        );
+
+        $fileDom = $fileReport->asDom();
+        $fileDom->formatOutput = true;
+        $fileDom->preserveWhiteSpace = false;
+        $fileDom->save($this->target . $file->getId() . '.xml');
+    }
+
+    private function processUnit($unit, PHP_CodeCoverage_Report_XML_File_Report $report)
+    {
+        if (isset($unit['className'])) {
+            $unitObject = $report->getClassObject($unit['className']);
+        } else {
+            $unitObject = $report->getTraitObject($unit['traitName']);
+        }
+
+        $unitObject->setLines(
+            $unit['startLine'],
+            $unit['executableLines'],
+            $unit['executedLines']
+        );
+
+        $unitObject->setCrap($unit['crap']);
+
+        $unitObject->setPackage(
+            $unit['package']['fullPackage'],
+            $unit['package']['package'],
+            $unit['package']['subpackage'],
+            $unit['package']['category']
+        );
+
+        $unitObject->setNamespace($unit['package']['namespace']);
+
+        foreach ($unit['methods'] as $method) {
+            $methodObject = $unitObject->addMethod($method['methodName']);
+            $methodObject->setSignature($method['signature']);
+            $methodObject->setLines($method['startLine'], $method['endLine']);
+            $methodObject->setCrap($method['crap']);
+            $methodObject->setTotals(
+                $method['executableLines'],
+                $method['executedLines'],
+                $method['coverage']
+            );
+        }
+    }
+
+    private function processFunction($function, PHP_CodeCoverage_Report_XML_File_Report $report)
+    {
+        $functionObject = $report->getFunctionObject($function['functionName']);
+
+        $functionObject->setSignature($function['signature']);
+        $functionObject->setLines($function['startLine']);
+        $functionObject->setCrap($function['crap']);
+        $functionObject->setTotals($function['executableLines'], $function['executedLines'], $function['coverage']);
+    }
+
+    private function processTests(array $tests)
+    {
+        $testsObject = $this->project->getTests();
+
+        foreach ($tests as $test => $result) {
+            if ($test == 'UNCOVERED_FILES_FROM_WHITELIST') {
+                continue;
+            }
+
+            $testsObject->addTest($test, $result);
+        }
+    }
+
+    private function setTotals(PHP_CodeCoverage_Report_Node $node, PHP_CodeCoverage_Report_XML_Totals $totals)
+    {
+        $loc = $node->getLinesOfCode();
+
+        $totals->setNumLines(
+            $loc['loc'],
+            $loc['cloc'],
+            $loc['ncloc'],
+            $node->getNumExecutableLines(),
+            $node->getNumExecutedLines()
+        );
+
+        $totals->setNumClasses(
+            $node->getNumClasses(),
+            $node->getNumTestedClasses()
+        );
+
+        $totals->setNumTraits(
+            $node->getNumTraits(),
+            $node->getNumTestedTraits()
+        );
+
+        $totals->setNumMethods(
+            $node->getNumMethods(),
+            $node->getNumTestedMethods()
+        );
+
+        $totals->setNumFunctions(
+            $node->getNumFunctions(),
+            $node->getNumTestedFunctions()
+        );
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php
new file mode 100644
index 0000000000000000000000000000000000000000..50aa60759e394b5a8bec590c23d295a650d6ab0a
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Directory extends PHP_CodeCoverage_Report_XML_Node
+{
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php
new file mode 100644
index 0000000000000000000000000000000000000000..2548d465d97868ee1d3b97e81ee47d8d7b0c53f3
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File
+{
+    /**
+     * @var DOMDocument
+     */
+    protected $dom;
+
+    /**
+     * @var DOMElement
+     */
+    protected $contextNode;
+
+    public function __construct(DOMElement $context)
+    {
+        $this->dom         = $context->ownerDocument;
+        $this->contextNode = $context;
+    }
+
+    public function getTotals()
+    {
+        $totalsContainer = $this->contextNode->firstChild;
+
+        if (!$totalsContainer) {
+            $totalsContainer = $this->contextNode->appendChild(
+                $this->dom->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0', 'totals'
+                )
+            );
+        }
+
+        return new PHP_CodeCoverage_Report_XML_Totals($totalsContainer);
+    }
+
+    public function getLineCoverage($line)
+    {
+        $coverage = $this->contextNode->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0', 'coverage'
+        )->item(0);
+
+        if (!$coverage) {
+            $coverage = $this->contextNode->appendChild(
+                $this->dom->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0', 'coverage'
+                )
+            );
+        }
+
+        $lineNode = $coverage->appendChild(
+            $this->dom->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0', 'line'
+            )
+        );
+
+        return new PHP_CodeCoverage_Report_XML_File_Coverage($lineNode, $line);
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php
new file mode 100644
index 0000000000000000000000000000000000000000..75dc0827886b22975e9bdcee69ccb9b60076020c
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File_Coverage
+{
+    /**
+     * @var XMLWriter
+     */
+    private $writer;
+
+    /**
+     * @var DOMElement
+     */
+    private $contextNode;
+
+    /**
+     * @var bool
+     */
+    private $finalized = false;
+
+    public function __construct(DOMElement $context, $line)
+    {
+        $this->contextNode = $context;
+
+        $this->writer = new XMLWriter();
+        $this->writer->openMemory();
+        $this->writer->startElementNs(null, $context->nodeName, 'http://schema.phpunit.de/coverage/1.0');
+        $this->writer->writeAttribute('nr', $line);
+    }
+
+    public function addTest($test)
+    {
+        if ($this->finalized) {
+            throw new PHP_CodeCoverage_Exception('Coverage Report already finalized');
+        }
+
+        $this->writer->startElement('covered');
+        $this->writer->writeAttribute('by', $test);
+        $this->writer->endElement();
+    }
+
+    public function finalize()
+    {
+        $this->writer->endElement();
+
+        $fragment = $this->contextNode->ownerDocument->createDocumentFragment();
+        $fragment->appendXML($this->writer->outputMemory());
+
+        $this->contextNode->parentNode->replaceChild(
+            $fragment,
+            $this->contextNode
+        );
+
+        $this->finalized = true;
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php
new file mode 100644
index 0000000000000000000000000000000000000000..416d3d531155eba33700a55d2cab39aa844cebc8
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File_Method
+{
+    /**
+     * @var DOMElement
+     */
+    private $contextNode;
+
+    public function __construct(DOMElement $context, $name)
+    {
+        $this->contextNode = $context;
+
+        $this->setName($name);
+    }
+
+    private function setName($name)
+    {
+        $this->contextNode->setAttribute('name', $name);
+    }
+
+    public function setSignature($signature)
+    {
+        $this->contextNode->setAttribute('signature', $signature);
+    }
+
+    public function setLines($start, $end = null)
+    {
+        $this->contextNode->setAttribute('start', $start);
+
+        if ($end !== null) {
+            $this->contextNode->setAttribute('end', $end);
+        }
+    }
+
+    public function setTotals($executable, $executed, $coverage)
+    {
+        $this->contextNode->setAttribute('executable', $executable);
+        $this->contextNode->setAttribute('executed', $executed);
+        $this->contextNode->setAttribute('coverage', $coverage);
+    }
+
+    public function setCrap($crap)
+    {
+        $this->contextNode->setAttribute('crap', $crap);
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php
new file mode 100644
index 0000000000000000000000000000000000000000..5892e4a3e795c1b602848db08ea6c2fa139e4980
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File_Report extends PHP_CodeCoverage_Report_XML_File
+{
+    public function __construct($name)
+    {
+        $this->dom = new DOMDocument;
+        $this->dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://schema.phpunit.de/coverage/1.0"><file /></phpunit>');
+
+        $this->contextNode = $this->dom->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0', 'file'
+        )->item(0);
+
+        $this->setName($name);
+    }
+
+    private function setName($name)
+    {
+        $this->contextNode->setAttribute('name', $name);
+    }
+
+    public function asDom()
+    {
+        return $this->dom;
+    }
+
+    public function getFunctionObject($name)
+    {
+        $node = $this->contextNode->appendChild(
+            $this->dom->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0', 'function'
+            )
+        );
+
+        return new PHP_CodeCoverage_Report_XML_File_Method($node, $name);
+    }
+
+    public function getClassObject($name)
+    {
+        return $this->getUnitObject('class', $name);
+    }
+
+    public function getTraitObject($name)
+    {
+        return $this->getUnitObject('trait', $name);
+    }
+
+    private function getUnitObject($tagName, $name)
+    {
+        $node = $this->contextNode->appendChild(
+            $this->dom->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0', $tagName
+            )
+        );
+
+        return new PHP_CodeCoverage_Report_XML_File_Unit($node, $name);
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php
new file mode 100644
index 0000000000000000000000000000000000000000..6bf7c233eebdd809e4d8e002028811b0953ebb66
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_File_Unit
+{
+    /**
+     * @var DOMElement
+     */
+    private $contextNode;
+
+    public function __construct(DOMElement $context, $name)
+    {
+        $this->contextNode = $context;
+
+        $this->setName($name);
+    }
+
+    private function setName($name)
+    {
+        $this->contextNode->setAttribute('name', $name);
+    }
+
+    public function setLines($start, $executable, $executed)
+    {
+        $this->contextNode->setAttribute('start', $start);
+        $this->contextNode->setAttribute('executable', $executable);
+        $this->contextNode->setAttribute('executed', $executed);
+    }
+
+    public function setCrap($crap)
+    {
+        $this->contextNode->setAttribute('crap', $crap);
+    }
+
+    public function setPackage($full, $package, $sub, $category)
+    {
+        $node = $this->contextNode->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0', 'package'
+        )->item(0);
+
+        if (!$node) {
+            $node = $this->contextNode->appendChild(
+                $this->contextNode->ownerDocument->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0', 'package'
+                )
+            );
+        }
+
+        $node->setAttribute('full', $full);
+        $node->setAttribute('name', $package);
+        $node->setAttribute('sub', $sub);
+        $node->setAttribute('category', $category);
+    }
+
+    public function setNamespace($namespace)
+    {
+        $node = $this->contextNode->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0', 'namespace'
+        )->item(0);
+
+        if (!$node) {
+            $node = $this->contextNode->appendChild(
+                $this->contextNode->ownerDocument->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0', 'namespace'
+                )
+            );
+        }
+
+        $node->setAttribute('name', $namespace);
+    }
+
+    public function addMethod($name)
+    {
+        $node = $this->contextNode->appendChild(
+            $this->contextNode->ownerDocument->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0', 'method'
+            )
+        );
+
+        return new PHP_CodeCoverage_Report_XML_File_Method($node, $name);
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php
new file mode 100644
index 0000000000000000000000000000000000000000..aaecb0be60b3c8ab9312a106871fc00caa8926cb
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Node
+{
+    /**
+     * @var DOMDocument
+     */
+    private $dom;
+
+    /**
+     * @var DOMElement
+     */
+    private $contextNode;
+
+    public function __construct(DOMElement $context)
+    {
+        $this->setContextNode($context);
+    }
+
+    protected function setContextNode(DOMElement $context)
+    {
+        $this->dom         = $context->ownerDocument;
+        $this->contextNode = $context;
+    }
+
+    public function getDom()
+    {
+        return $this->dom;
+    }
+
+    protected function getContextNode()
+    {
+        return $this->contextNode;
+    }
+
+    public function getTotals()
+    {
+        $totalsContainer = $this->getContextNode()->firstChild;
+
+        if (!$totalsContainer) {
+            $totalsContainer = $this->getContextNode()->appendChild(
+                $this->dom->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0', 'totals'
+                )
+            );
+        }
+
+        return new PHP_CodeCoverage_Report_XML_Totals($totalsContainer);
+    }
+
+    public function addDirectory($name)
+    {
+        $dirNode = $this->getDom()->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0', 'directory'
+        );
+
+        $dirNode->setAttribute('name', $name);
+        $this->getContextNode()->appendChild($dirNode);
+
+        return new PHP_CodeCoverage_Report_XML_Directory($dirNode);
+    }
+
+    public function addFile($name, $href)
+    {
+        $fileNode = $this->getDom()->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0', 'file'
+        );
+
+        $fileNode->setAttribute('name', $name);
+        $fileNode->setAttribute('href', $href);
+        $this->getContextNode()->appendChild($fileNode);
+
+        return new PHP_CodeCoverage_Report_XML_File($fileNode);
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php
new file mode 100644
index 0000000000000000000000000000000000000000..fd25a964797fc2a71209791c3f527a2d71fa4f0e
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Project extends PHP_CodeCoverage_Report_XML_Node
+{
+    public function __construct($name)
+    {
+        $this->init();
+        $this->setProjectName($name);
+    }
+
+    private function init()
+    {
+        $dom = new DOMDocument;
+        $dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="http://schema.phpunit.de/coverage/1.0"><project/></phpunit>');
+
+        $this->setContextNode(
+            $dom->getElementsByTagNameNS(
+                'http://schema.phpunit.de/coverage/1.0', 'project'
+            )->item(0)
+        );
+    }
+
+    private function setProjectName($name)
+    {
+        $this->getContextNode()->setAttribute('name', $name);
+    }
+
+    public function getTests()
+    {
+        $testsNode = $this->getContextNode()->getElementsByTagNameNS(
+            'http://schema.phpunit.de/coverage/1.0', 'tests'
+        )->item(0);
+
+        if (!$testsNode) {
+            $testsNode = $this->getContextNode()->appendChild(
+                $this->getDom()->createElementNS(
+                    'http://schema.phpunit.de/coverage/1.0', 'tests'
+                )
+            );
+        }
+
+        return new PHP_CodeCoverage_Report_XML_Tests($testsNode);
+    }
+
+    public function asDom()
+    {
+        return $this->getDom();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php
new file mode 100644
index 0000000000000000000000000000000000000000..85bcd1eb2bfe4d2f2d4b0d08df22cc414c0cc961
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Tests
+{
+    private $contextNode;
+
+    private $codeMap = array(
+        0 => 'PASSED',     // PHPUnit_Runner_BaseTestRunner::STATUS_PASSED
+        1 => 'SKIPPED',    // PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED
+        2 => 'INCOMPLETE', // PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE
+        3 => 'FAILURE',    // PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE
+        4 => 'ERROR',      // PHPUnit_Runner_BaseTestRunner::STATUS_ERROR
+        5 => 'RISKY'       // PHPUnit_Runner_BaseTestRunner::STATUS_RISKY
+    );
+
+    public function __construct(DOMElement $context)
+    {
+        $this->contextNode = $context;
+    }
+
+    public function addTest($test, $result)
+    {
+        $node = $this->contextNode->appendChild(
+            $this->contextNode->ownerDocument->createElementNS(
+                'http://schema.phpunit.de/coverage/1.0', 'test'
+            )
+        );
+        $node->setAttribute('name', $test);
+        $node->setAttribute('result', (int) $result);
+        $node->setAttribute('status', $this->codeMap[(int) $result]);
+
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php
new file mode 100644
index 0000000000000000000000000000000000000000..8e8bb8923ab2c2a907e45d6450d44d2fad0d3a37
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 2.0.0
+ */
+class PHP_CodeCoverage_Report_XML_Totals
+{
+    /**
+     * @var DOMNode
+     */
+    private $container;
+
+    /**
+     * @var DOMElement
+     */
+    private $linesNode;
+
+    /**
+     * @var DOMElement
+     */
+    private $methodsNode;
+
+    /**
+     * @var DOMElement
+     */
+    private $functionsNode;
+
+    /**
+     * @var DOMElement
+     */
+    private $classesNode;
+
+    /**
+     * @var DOMElement
+     */
+    private $traitsNode;
+
+    public function __construct(DOMElement $container)
+    {
+        $this->container = $container;
+        $dom             = $container->ownerDocument;
+
+        $this->linesNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0', 'lines')
+        ;
+
+        $this->methodsNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0', 'methods'
+        );
+
+        $this->functionsNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0', 'functions'
+        );
+
+        $this->classesNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0', 'classes'
+        );
+
+        $this->traitsNode = $dom->createElementNS(
+            'http://schema.phpunit.de/coverage/1.0', 'traits'
+        );
+
+        $container->appendChild($this->linesNode);
+        $container->appendChild($this->methodsNode);
+        $container->appendChild($this->functionsNode);
+        $container->appendChild($this->classesNode);
+        $container->appendChild($this->traitsNode);
+    }
+
+    public function getContainer()
+    {
+        return $this->container;
+    }
+
+    public function setNumLines($loc, $cloc, $ncloc, $executable, $executed)
+    {
+        $this->linesNode->setAttribute('total', $loc);
+        $this->linesNode->setAttribute('comments', $cloc);
+        $this->linesNode->setAttribute('code', $ncloc);
+        $this->linesNode->setAttribute('executable', $executable);
+        $this->linesNode->setAttribute('executed', $executed);
+        $this->linesNode->setAttribute(
+            'percent', PHP_CodeCoverage_Util::percent($executed,$executable, true)
+        );
+    }
+
+    public function setNumClasses($count, $tested)
+    {
+        $this->classesNode->setAttribute('count', $count);
+        $this->classesNode->setAttribute('tested', $tested);
+        $this->classesNode->setAttribute(
+            'percent', PHP_CodeCoverage_Util::percent($tested,$count, true)
+        );
+    }
+
+    public function setNumTraits($count, $tested)
+    {
+        $this->traitsNode->setAttribute('count', $count);
+        $this->traitsNode->setAttribute('tested', $tested);
+        $this->traitsNode->setAttribute(
+            'percent', PHP_CodeCoverage_Util::percent($tested,$count, true)
+        );
+    }
+
+    public function setNumMethods($count, $tested)
+    {
+        $this->methodsNode->setAttribute('count', $count);
+        $this->methodsNode->setAttribute('tested', $tested);
+        $this->methodsNode->setAttribute(
+            'percent', PHP_CodeCoverage_Util::percent($tested,$count, true)
+        );
+    }
+
+    public function setNumFunctions($count, $tested)
+    {
+        $this->functionsNode->setAttribute('count', $count);
+        $this->functionsNode->setAttribute('tested', $tested);
+        $this->functionsNode->setAttribute(
+            'percent', PHP_CodeCoverage_Util::percent($tested,$count, true)
+        );
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php
new file mode 100644
index 0000000000000000000000000000000000000000..f179042792856c9267ff4e64ca537d1263fd6bdc
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * PHP_CodeCoverage
+ *
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      File available since Release 1.0.0
+ */
+
+/**
+ * Utility methods.
+ *
+ * @category   PHP
+ * @package    CodeCoverage
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_CodeCoverage_Util
+{
+    /**
+     * @param  float $a
+     * @param  float $b
+     * @return float ($a / $b) * 100
+     */
+    public static function percent($a, $b, $asString = false, $fixedWidth = false)
+    {
+        if ($asString && $b == 0) {
+            return '';
+        }
+
+        if ($b > 0) {
+            $percent = ($a / $b) * 100;
+        } else {
+            $percent = 100;
+        }
+
+        if ($asString) {
+            if ($fixedWidth) {
+                return sprintf('%6.2F%%', $percent);
+            }
+
+            return sprintf('%01.2F%%', $percent);
+        } else {
+            return $percent;
+        }
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util/InvalidArgumentHelper.php b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php
similarity index 80%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util/InvalidArgumentHelper.php
rename to core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php
index 94938ef9e4bca9c1c782e5dee4348a3184717b12..6637a978d0d7f6730e611ecbe3601d6752466d5d 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util/InvalidArgumentHelper.php
+++ b/core/vendor/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.2.0
@@ -50,7 +50,7 @@
  * @category   PHP
  * @package    CodeCoverage
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.2.0
@@ -62,19 +62,19 @@ class PHP_CodeCoverage_Util_InvalidArgumentHelper
      * @param string  $type
      * @param mixed   $value
      */
-    public static function factory($argument, $type, $value = NULL)
+    public static function factory($argument, $type, $value = null)
     {
-        $stack = debug_backtrace(FALSE);
+        $stack = debug_backtrace(false);
 
         return new PHP_CodeCoverage_Exception(
-          sprintf(
-            'Argument #%d%sof %s::%s() must be a %s',
-            $argument,
-            $value !== NULL ? ' (' . $value . ')' : ' ',
-            $stack[1]['class'],
-            $stack[1]['function'],
-            $type
-          )
+            sprintf(
+                'Argument #%d%sof %s::%s() must be a %s',
+                $argument,
+                $value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ',
+                $stack[1]['class'],
+                $stack[1]['function'],
+                $type
+            )
         );
     }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/FilterTest.php b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/FilterTest.php
similarity index 90%
rename from core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/FilterTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/FilterTest.php
index be8b71ee5cb3fdf7444a512db701f7f4690c12c2..fb91ae53066ef302baf50a6f2c7b127ce0518d8d 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/FilterTest.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/FilterTest.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.0.0
@@ -59,7 +59,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.0.0
@@ -109,6 +109,7 @@ protected function setUp()
           TEST_FILES_PATH . 'NamespaceCoveragePublicTest.php',
           TEST_FILES_PATH . 'NamespaceCoveredClass.php',
           TEST_FILES_PATH . 'NotExistingCoveredElementTest.php',
+          TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php',
           TEST_FILES_PATH . 'source_with_ignore.php',
           TEST_FILES_PATH . 'source_with_namespace.php',
           TEST_FILES_PATH . 'source_with_oneline_annotations.php',
@@ -266,6 +267,8 @@ public function testRemovingADirectoryFromTheWhitelistWorks()
      */
     public function testIsFile()
     {
+        $this->assertFalse($this->filter->isFile('vfs://root/a/path'));
+        $this->assertFalse($this->filter->isFile('xdebug://debug-eval'));
         $this->assertFalse($this->filter->isFile('eval()\'d code'));
         $this->assertFalse($this->filter->isFile('runtime-created function'));
         $this->assertFalse($this->filter->isFile('assert code'));
@@ -299,4 +302,19 @@ public function testNotWhitelistedFileIsFiltered()
         $this->filter->addFileToWhitelist($this->files[0]);
         $this->assertTrue($this->filter->isFiltered($this->files[1]));
     }
+
+    /**
+     * @covers PHP_CodeCoverage_Filter::isFiltered
+     * @covers PHP_CodeCoverage_Filter::isFile
+     */
+    public function testNonFilesAreFiltered()
+    {
+        $this->assertTrue($this->filter->isFiltered('vfs://root/a/path'));
+        $this->assertTrue($this->filter->isFiltered('xdebug://debug-eval'));
+        $this->assertTrue($this->filter->isFiltered('eval()\'d code'));
+        $this->assertTrue($this->filter->isFiltered('runtime-created function'));
+        $this->assertTrue($this->filter->isFiltered('assert code'));
+        $this->assertTrue($this->filter->isFiltered('regexp code'));
+        $this->assertFalse($this->filter->isFiltered('filename'));
+    }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/Report/CloverTest.php b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/CloverTest.php
similarity index 83%
rename from core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/Report/CloverTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/CloverTest.php
index 1008ebcedbb6c26a030098836beba8ea805f540c..b0933cac1ca7083d543584fd204fdf92f52ed30f 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/Report/CloverTest.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/CloverTest.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.0.0
@@ -61,7 +61,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.0.0
@@ -77,7 +77,7 @@ public function testCloverForBankAccountTest()
 
         $this->assertStringMatchesFormatFile(
           TEST_FILES_PATH . 'BankAccount-clover.xml',
-          $clover->process($this->getCoverageForBankAccount(), NULL, 'BankAccount')
+          $clover->process($this->getCoverageForBankAccount(), null, 'BankAccount')
         );
     }
 
@@ -93,4 +93,17 @@ public function testCloverForFileWithIgnoredLines()
           $clover->process($this->getCoverageForFileWithIgnoredLines())
         );
     }
+
+    /**
+     * @covers PHP_CodeCoverage_Report_Clover
+     */
+    public function testCloverForClassWithAnonymousFunction()
+    {
+        $clover = new PHP_CodeCoverage_Report_Clover;
+
+        $this->assertStringMatchesFormatFile(
+          TEST_FILES_PATH . 'class-with-anonymous-function-clover.xml',
+          $clover->process($this->getCoverageForClassWithAnonymousFunction())
+        );
+    }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/Report/FactoryTest.php b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/FactoryTest.php
similarity index 97%
rename from core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/Report/FactoryTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/FactoryTest.php
index 4ff2c09a5867d888394e1458f9911f651f475572..b0f4388561dc938aef08ae73f703c596791ea6a4 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/Report/FactoryTest.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/Report/FactoryTest.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.1.0
@@ -61,7 +61,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.1.0
@@ -183,7 +183,7 @@ public function testBuildDirectoryStructure()
           'PHP_CodeCoverage_Report_Factory', 'buildDirectoryStructure'
         );
 
-        $method->setAccessible(TRUE);
+        $method->setAccessible(true);
 
         $this->assertEquals(
           array(
@@ -209,7 +209,7 @@ public function testReducePaths($reducedPaths, $commonPath, $paths)
           'PHP_CodeCoverage_Report_Factory', 'reducePaths'
         );
 
-        $method->setAccessible(TRUE);
+        $method->setAccessible(true);
 
         $_commonPath = $method->invokeArgs($this->factory, array(&$paths));
 
diff --git a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/PHP.php b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/UtilTest.php
similarity index 73%
rename from core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/PHP.php
rename to core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/UtilTest.php
index c3482b5aff1a5f33d87e6add743f3808589f69fa..e3d8f9fc3a45475205a734c86c3ea3413873ea9e 100644
--- a/core/vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/PHP.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverage/UtilTest.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,39 +36,37 @@
  *
  * @category   PHP
  * @package    CodeCoverage
+ * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
+ * @since      File available since Release 1.0.0
  */
 
 /**
- * Uses serialize() to write a PHP_CodeCoverage object to a file.
+ * Tests for the PHP_CodeCoverage_Util class.
  *
  * @category   PHP
  * @package    CodeCoverage
+ * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
+ * @since      Class available since Release 1.0.0
  */
-class PHP_CodeCoverage_Report_PHP
+class PHP_CodeCoverage_UtilTest extends PHPUnit_Framework_TestCase
 {
     /**
-     * @param  PHP_CodeCoverage $coverage
-     * @param  string           $target
-     * @return string
+     * @covers PHP_CodeCoverage_Util::percent
      */
-    public function process(PHP_CodeCoverage $coverage, $target = NULL)
+    public function testPercent()
     {
-        $coverage = serialize($coverage);
-
-        if ($target !== NULL) {
-            return file_put_contents($target, $coverage);
-        } else {
-            return $coverage;
-        }
+        $this->assertEquals(100, PHP_CodeCoverage_Util::percent(100, 0));
+        $this->assertEquals(100, PHP_CodeCoverage_Util::percent(100, 100));
+        $this->assertEquals(
+          '100.00%', PHP_CodeCoverage_Util::percent(100, 100, true)
+        );
     }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverageTest.php b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverageTest.php
similarity index 51%
rename from core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverageTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverageTest.php
index 228175166d03a3b1e5592240e1834b1ef8df156c..745657c1f2e62c0d041190fc71519bf5092e426a 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverageTest.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/PHP/CodeCoverageTest.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.0.0
@@ -53,7 +53,6 @@
 }
 
 require_once TEST_FILES_PATH . '../TestCase.php';
-
 require_once TEST_FILES_PATH . 'BankAccount.php';
 require_once TEST_FILES_PATH . 'BankAccountTest.php';
 
@@ -64,25 +63,18 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.0.0
  */
 class PHP_CodeCoverageTest extends PHP_CodeCoverage_TestCase
 {
-    protected $coverage;
-    protected $getLinesToBeCovered;
+    private $coverage;
 
     protected function setUp()
     {
         $this->coverage = new PHP_CodeCoverage;
-
-        $this->getLinesToBeCovered = new ReflectionMethod(
-          'PHP_CodeCoverage', 'getLinesToBeCovered'
-        );
-
-        $this->getLinesToBeCovered->setAccessible(TRUE);
     }
 
     /**
@@ -107,7 +99,7 @@ public function testConstructor()
     public function testConstructor2()
     {
         $filter   = new PHP_CodeCoverage_Filter;
-        $coverage = new PHP_CodeCoverage(NULL, $filter);
+        $coverage = new PHP_CodeCoverage(null, $filter);
 
         $this->assertAttributeInstanceOf(
           'PHP_CodeCoverage_Driver_Xdebug', 'driver', $coverage
@@ -122,7 +114,7 @@ public function testConstructor2()
      */
     public function testStartThrowsExceptionForInvalidArgument()
     {
-        $this->coverage->start(NULL, array(), NULL);
+        $this->coverage->start(null, array(), null);
     }
 
     /**
@@ -131,7 +123,16 @@ public function testStartThrowsExceptionForInvalidArgument()
      */
     public function testStopThrowsExceptionForInvalidArgument()
     {
-        $this->coverage->stop(NULL);
+        $this->coverage->stop(null);
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::stop
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testStopThrowsExceptionForInvalidArgument2()
+    {
+        $this->coverage->stop(true, null);
     }
 
     /**
@@ -140,7 +141,7 @@ public function testStopThrowsExceptionForInvalidArgument()
      */
     public function testAppendThrowsExceptionForInvalidArgument()
     {
-        $this->coverage->append(array(), NULL);
+        $this->coverage->append(array(), null);
     }
 
     /**
@@ -149,7 +150,7 @@ public function testAppendThrowsExceptionForInvalidArgument()
      */
     public function testSetCacheTokensThrowsExceptionForInvalidArgument()
     {
-        $this->coverage->setCacheTokens(NULL);
+        $this->coverage->setCacheTokens(null);
     }
 
     /**
@@ -157,8 +158,28 @@ public function testSetCacheTokensThrowsExceptionForInvalidArgument()
      */
     public function testSetCacheTokens()
     {
-        $this->coverage->setCacheTokens(TRUE);
-        $this->assertAttributeEquals(TRUE, 'cacheTokens', $this->coverage);
+        $this->coverage->setCacheTokens(true);
+        $this->assertAttributeEquals(true, 'cacheTokens', $this->coverage);
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::setCheckForUnintentionallyCoveredCode
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testSetCheckForUnintentionallyCoveredCodeThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->setCheckForUnintentionallyCoveredCode(null);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::setCheckForUnintentionallyCoveredCode
+     */
+    public function testSetCheckForUnintentionallyCoveredCode()
+    {
+        $this->coverage->setCheckForUnintentionallyCoveredCode(true);
+        $this->assertAttributeEquals(
+          true, 'checkForUnintentionallyCoveredCode', $this->coverage
+        );
     }
 
     /**
@@ -167,7 +188,7 @@ public function testSetCacheTokens()
      */
     public function testSetForceCoversAnnotationThrowsExceptionForInvalidArgument()
     {
-        $this->coverage->setForceCoversAnnotation(NULL);
+        $this->coverage->setForceCoversAnnotation(null);
     }
 
     /**
@@ -175,9 +196,29 @@ public function testSetForceCoversAnnotationThrowsExceptionForInvalidArgument()
      */
     public function testSetForceCoversAnnotation()
     {
-        $this->coverage->setForceCoversAnnotation(TRUE);
+        $this->coverage->setForceCoversAnnotation(true);
+        $this->assertAttributeEquals(
+          true, 'forceCoversAnnotation', $this->coverage
+        );
+    }
+
+    /**
+     * @covers            PHP_CodeCoverage::setAddUncoveredFilesFromWhitelist
+     * @expectedException PHP_CodeCoverage_Exception
+     */
+    public function testSetAddUncoveredFilesFromWhitelistThrowsExceptionForInvalidArgument()
+    {
+        $this->coverage->setAddUncoveredFilesFromWhitelist(null);
+    }
+
+    /**
+     * @covers PHP_CodeCoverage::setAddUncoveredFilesFromWhitelist
+     */
+    public function testSetAddUncoveredFilesFromWhitelist()
+    {
+        $this->coverage->setAddUncoveredFilesFromWhitelist(true);
         $this->assertAttributeEquals(
-          TRUE, 'forceCoversAnnotation', $this->coverage
+          true, 'addUncoveredFilesFromWhitelist', $this->coverage
         );
     }
 
@@ -187,7 +228,7 @@ public function testSetForceCoversAnnotation()
      */
     public function testSetProcessUncoveredFilesFromWhitelistThrowsExceptionForInvalidArgument()
     {
-        $this->coverage->setProcessUncoveredFilesFromWhitelist(NULL);
+        $this->coverage->setProcessUncoveredFilesFromWhitelist(null);
     }
 
     /**
@@ -195,9 +236,9 @@ public function testSetProcessUncoveredFilesFromWhitelistThrowsExceptionForInval
      */
     public function testSetProcessUncoveredFilesFromWhitelist()
     {
-        $this->coverage->setProcessUncoveredFilesFromWhitelist(TRUE);
+        $this->coverage->setProcessUncoveredFilesFromWhitelist(true);
         $this->assertAttributeEquals(
-          TRUE, 'processUncoveredFilesFromWhitelist', $this->coverage
+          true, 'processUncoveredFilesFromWhitelist', $this->coverage
         );
     }
 
@@ -206,9 +247,9 @@ public function testSetProcessUncoveredFilesFromWhitelist()
      */
     public function testSetMapTestClassNameToCoveredClassName()
     {
-        $this->coverage->setMapTestClassNameToCoveredClassName(TRUE);
+        $this->coverage->setMapTestClassNameToCoveredClassName(true);
         $this->assertAttributeEquals(
-          TRUE, 'mapTestClassNameToCoveredClassName', $this->coverage
+          true, 'mapTestClassNameToCoveredClassName', $this->coverage
         );
     }
 
@@ -218,7 +259,7 @@ public function testSetMapTestClassNameToCoveredClassName()
      */
     public function testSetMapTestClassNameToCoveredClassNameThrowsExceptionForInvalidArgument()
     {
-        $this->coverage->setMapTestClassNameToCoveredClassName(NULL);
+        $this->coverage->setMapTestClassNameToCoveredClassName(null);
     }
 
     /**
@@ -228,7 +269,7 @@ public function testClear()
     {
         $this->coverage->clear();
 
-        $this->assertAttributeEquals(NULL, 'currentId', $this->coverage);
+        $this->assertAttributeEquals(null, 'currentId', $this->coverage);
         $this->assertAttributeEquals(array(), 'data', $this->coverage);
         $this->assertAttributeEquals(array(), 'tests', $this->coverage);
     }
@@ -252,10 +293,10 @@ public function testCollect()
 
         $this->assertEquals(
           array(
-            'BankAccountTest::testBalanceIsInitiallyZero' => NULL,
-            'BankAccountTest::testBalanceCannotBecomeNegative' => NULL,
-            'BankAccountTest::testBalanceCannotBecomeNegative2' => NULL,
-            'BankAccountTest::testDepositWithdrawMoney' => NULL
+            'BankAccountTest::testBalanceIsInitiallyZero' => null,
+            'BankAccountTest::testBalanceCannotBecomeNegative' => null,
+            'BankAccountTest::testBalanceCannotBecomeNegative2' => null,
+            'BankAccountTest::testDepositWithdrawMoney' => null
           ),
           $coverage->getTests()
         );
@@ -294,267 +335,148 @@ public function testMerge2()
     }
 
     /**
-     * @covers       PHP_CodeCoverage::getLinesToBeCovered
-     * @covers       PHP_CodeCoverage::resolveCoversToReflectionObjects
-     * @dataProvider getLinesToBeCoveredProvider
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
      */
-    public function testGetLinesToBeCovered($test, $lines)
+    public function testGetLinesToBeIgnored()
     {
-        if (strpos($test, 'Namespace') === 0) {
-            $expected = array(
-              TEST_FILES_PATH . 'NamespaceCoveredClass.php' => $lines
-            );
-        }
-
-        else if ($test === 'CoverageNoneTest') {
-            $expected = array();
-        }
-
-        else if ($test === 'CoverageNothingTest') {
-            $expected = false;
-        }
-
-        else if ($test === 'CoverageFunctionTest') {
-            $expected = array(
-              TEST_FILES_PATH . 'CoveredFunction.php' => $lines
-            );
-        }
-
-        else {
-            $expected = array(TEST_FILES_PATH . 'CoveredClass.php' => $lines);
-        }
-
         $this->assertEquals(
-          $expected,
-          $this->getLinesToBeCovered->invoke(
-            $this->coverage, $test, 'testSomething'
-          )
-        );
-    }
-
-    /**
-     * @covers            PHP_CodeCoverage::getLinesToBeCovered
-     * @covers            PHP_CodeCoverage::resolveCoversToReflectionObjects
-     * @expectedException PHP_CodeCoverage_Exception
-     */
-    public function testGetLinesToBeCovered2()
-    {
-        $this->getLinesToBeCovered->invoke(
-          $this->coverage, 'NotExistingCoveredElementTest', 'testOne'
-        );
-    }
-
-    /**
-     * @covers            PHP_CodeCoverage::getLinesToBeCovered
-     * @covers            PHP_CodeCoverage::resolveCoversToReflectionObjects
-     * @expectedException PHP_CodeCoverage_Exception
-     */
-    public function testGetLinesToBeCovered3()
-    {
-        $this->getLinesToBeCovered->invoke(
-          $this->coverage, 'NotExistingCoveredElementTest', 'testTwo'
-        );
-    }
-
-    /**
-     * @covers            PHP_CodeCoverage::getLinesToBeCovered
-     * @covers            PHP_CodeCoverage::resolveCoversToReflectionObjects
-     * @expectedException PHP_CodeCoverage_Exception
-     */
-    public function testGetLinesToBeCovered4()
-    {
-        $this->getLinesToBeCovered->invoke(
-          $this->coverage, 'NotExistingCoveredElementTest', 'testThree'
-        );
-    }
-
-    /**
-     * @covers PHP_CodeCoverage::getLinesToBeCovered
-     */
-    public function testGetLinesToBeCoveredSkipsNonExistantMethods()
-    {
-        $this->assertSame(
-          array(),
-          $this->getLinesToBeCovered->invoke(
+          array(
+             1,
+             3,
+             4,
+             5,
+             7,
+             8,
+             9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            30,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38
+          ),
+          $this->getLinesToBeIgnored()->invoke(
             $this->coverage,
-            'NotExistingCoveredElementTest',
-            'methodDoesNotExist'
+            TEST_FILES_PATH . 'source_with_ignore.php'
           )
         );
     }
 
     /**
-     * @covers PHP_CodeCoverage::getLinesToBeCovered
-     * @expectedException PHP_CodeCoverage_Exception
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
      */
-    public function testTwoCoversDefaultClassAnnoationsAreNotAllowed()
+    public function testGetLinesToBeIgnored2()
     {
-        $this->getLinesToBeCovered->invoke(
-          $this->coverage,
-          'CoverageTwoDefaultClassAnnotations',
-          'testSomething'
-        );
-    }
-
-    /**
-     * @covers PHP_CodeCoverage::getLinesToBeCovered
-     */
-    public function testFunctionParenthesesAreAllowed()
-    {
-        $this->assertSame(
-          array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)),
-          $this->getLinesToBeCovered->invoke(
+        $this->assertEquals(
+          array(1, 5),
+          $this->getLinesToBeIgnored()->invoke(
             $this->coverage,
-            'CoverageFunctionParenthesesTest',
-            'testSomething'
+            TEST_FILES_PATH . 'source_without_ignore.php'
           )
         );
     }
 
     /**
-     * @covers PHP_CodeCoverage::getLinesToBeCovered
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
      */
-    public function testFunctionParenthesesAreAllowedWithWhitespace()
+    public function testGetLinesToBeIgnored3()
     {
-        $this->assertSame(
-          array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)),
-          $this->getLinesToBeCovered->invoke(
+        $this->assertEquals(
+          array(
+            1,
+            2,
+            3,
+            4,
+            5,
+            8,
+            11,
+            15,
+            16,
+            19,
+            20
+          ),
+          $this->getLinesToBeIgnored()->invoke(
             $this->coverage,
-            'CoverageFunctionParenthesesWhitespaceTest',
-            'testSomething'
+            TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php'
           )
         );
     }
 
     /**
-     * @covers PHP_CodeCoverage::getLinesToBeCovered
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
      */
-    public function testMethodParenthesesAreAllowed()
+    public function testGetLinesToBeIgnoredOneLineAnnotations()
     {
-        $this->assertSame(
-          array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)),
-          $this->getLinesToBeCovered->invoke(
+        $this->assertEquals(
+          array(
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            18,
+            20,
+            23,
+            24,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            37
+          ),
+          $this->getLinesToBeIgnored()->invoke(
             $this->coverage,
-            'CoverageMethodParenthesesTest',
-            'testSomething'
+            TEST_FILES_PATH . 'source_with_oneline_annotations.php'
           )
         );
     }
 
     /**
-     * @covers PHP_CodeCoverage::getLinesToBeCovered
+     * @return ReflectionMethod
      */
-    public function testMethodParenthesesAreAllowedWithWhitespace()
+    private function getLinesToBeIgnored()
     {
-        $this->assertSame(
-          array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)),
-          $this->getLinesToBeCovered->invoke(
-            $this->coverage,
-            'CoverageMethodParenthesesWhitespaceTest',
-            'testSomething'
-          )
+        $getLinesToBeIgnored = new ReflectionMethod(
+            'PHP_CodeCoverage', 'getLinesToBeIgnored'
         );
-    }
 
-    public function getLinesToBeCoveredProvider()
-    {
-        return array(
-          array(
-            'CoverageNoneTest',
-            array()
-          ),
-          array(
-            'CoverageClassExtendedTest',
-            array_merge(range(19, 36), range(2, 17))
-          ),
-          array(
-            'CoverageClassTest',
-            range(19, 36)
-          ),
-          array(
-            'CoverageMethodTest',
-            range(31, 35)
-          ),
-          array(
-            'CoverageMethodOneLineAnnotationTest',
-            range(31, 35)
-          ),
-          array(
-            'CoverageNotPrivateTest',
-            array_merge(range(25, 29), range(31, 35))
-          ),
-          array(
-            'CoverageNotProtectedTest',
-            array_merge(range(21, 23), range(31, 35))
-          ),
-          array(
-            'CoverageNotPublicTest',
-            array_merge(range(21, 23), range(25, 29))
-          ),
-          array(
-            'CoveragePrivateTest',
-            range(21, 23)
-          ),
-          array(
-            'CoverageProtectedTest',
-            range(25, 29)
-          ),
-          array(
-            'CoveragePublicTest',
-            range(31, 35)
-          ),
-          array(
-            'CoverageFunctionTest',
-            range(2, 4)
-          ),
-          array(
-            'NamespaceCoverageClassExtendedTest',
-            array_merge(range(21, 38), range(4, 19))
-          ),
-          array(
-            'NamespaceCoverageClassTest',
-            range(21, 38)
-          ),
-          array(
-            'NamespaceCoverageMethodTest',
-            range(33, 37)
-          ),
-          array(
-            'NamespaceCoverageNotPrivateTest',
-            array_merge(range(27, 31), range(33, 37))
-          ),
-          array(
-            'NamespaceCoverageNotProtectedTest',
-            array_merge(range(23, 25), range(33, 37))
-          ),
-          array(
-            'NamespaceCoverageNotPublicTest',
-            array_merge(range(23, 25), range(27, 31))
-          ),
-          array(
-            'NamespaceCoveragePrivateTest',
-            range(23, 25)
-          ),
-          array(
-            'NamespaceCoverageProtectedTest',
-            range(27, 31)
-          ),
-          array(
-            'NamespaceCoveragePublicTest',
-            range(33, 37)
-          ),
-          array(
-            'NamespaceCoverageCoversClassTest',
-            array_merge(range(23, 25), range(27, 31), range(33, 37), range(6, 8), range(10, 13), range(15, 18))
-          ),
-          array(
-            'NamespaceCoverageCoversClassPublicTest',
-            range(33, 37)
-          ),
-          array(
-            'CoverageNothingTest',
-            false
-          )
-        );
+        $getLinesToBeIgnored->setAccessible(true);
+
+        return $getLinesToBeIgnored;
     }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/TestCase.php b/core/vendor/phpunit/php-code-coverage/tests/TestCase.php
similarity index 74%
rename from core/vendor/phpunit/php-code-coverage/Tests/TestCase.php
rename to core/vendor/phpunit/php-code-coverage/tests/TestCase.php
index 6a04513f8a9c59d1a6f1199a5f2fa0b1786dc04a..73ce71b99da48fd4abc7ba83b1faf358210c8ded 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/TestCase.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/TestCase.php
@@ -2,7 +2,7 @@
 /**
  * PHP_CodeCoverage
  *
- * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      File available since Release 1.0.0
@@ -51,7 +51,7 @@
  * @package    CodeCoverage
  * @subpackage Tests
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-code-coverage
  * @since      Class available since Release 1.0.0
@@ -124,24 +124,44 @@ protected function getCoverageForBankAccount()
         $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
 
         $coverage->start(
-          new BankAccountTest('testBalanceIsInitiallyZero'), TRUE
+          new BankAccountTest('testBalanceIsInitiallyZero'), true
+        );
+
+        $coverage->stop(
+          true,
+          array(TEST_FILES_PATH . 'BankAccount.php' => range(6, 9))
         );
-        $coverage->stop();
 
         $coverage->start(
           new BankAccountTest('testBalanceCannotBecomeNegative')
         );
-        $coverage->stop();
+
+        $coverage->stop(
+          true,
+          array(TEST_FILES_PATH . 'BankAccount.php' => range(27, 32))
+        );
 
         $coverage->start(
           new BankAccountTest('testBalanceCannotBecomeNegative2')
         );
-        $coverage->stop();
+
+        $coverage->stop(
+          true,
+          array(TEST_FILES_PATH . 'BankAccount.php' => range(20, 25))
+        );
 
         $coverage->start(
           new BankAccountTest('testDepositWithdrawMoney')
         );
-        $coverage->stop();
+
+        $coverage->stop(
+          true,
+          array(
+            TEST_FILES_PATH . 'BankAccount.php' => array_merge(
+              range(6, 9), range(20, 25), range(27, 32)
+            )
+          )
+        );
 
         return $coverage;
     }
@@ -160,14 +180,22 @@ protected function getCoverageForBankAccountForFirstTwoTests()
         $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
 
         $coverage->start(
-          new BankAccountTest('testBalanceIsInitiallyZero'), TRUE
+          new BankAccountTest('testBalanceIsInitiallyZero'), true
+        );
+
+        $coverage->stop(
+          true,
+          array(TEST_FILES_PATH . 'BankAccount.php' => range(6, 9))
         );
-        $coverage->stop();
 
         $coverage->start(
           new BankAccountTest('testBalanceCannotBecomeNegative')
         );
-        $coverage->stop();
+
+        $coverage->stop(
+          true,
+          array(TEST_FILES_PATH . 'BankAccount.php' => range(27, 32))
+        );
 
         return $coverage;
     }
@@ -186,14 +214,26 @@ protected function getCoverageForBankAccountForLastTwoTests()
         $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
 
         $coverage->start(
-          new BankAccountTest('testBalanceCannotBecomeNegative2'), TRUE
+          new BankAccountTest('testBalanceCannotBecomeNegative2')
+        );
+
+        $coverage->stop(
+          true,
+          array(TEST_FILES_PATH . 'BankAccount.php' => range(20, 25))
         );
-        $coverage->stop();
 
         $coverage->start(
           new BankAccountTest('testDepositWithdrawMoney')
         );
-        $coverage->stop();
+
+        $coverage->stop(
+          true,
+          array(
+            TEST_FILES_PATH . 'BankAccount.php' => array_merge(
+              range(6, 9), range(20, 25), range(27, 32)
+            )
+          )
+        );
 
         return $coverage;
     }
@@ -206,7 +246,7 @@ protected function getExpectedDataArrayForBankAccount()
               0 => 'BankAccountTest::testBalanceIsInitiallyZero',
               1 => 'BankAccountTest::testDepositWithdrawMoney'
             ),
-            9 => NULL,
+            9 => null,
             13 => array(),
             14 => array(),
             15 => array(),
@@ -219,7 +259,7 @@ protected function getExpectedDataArrayForBankAccount()
             24 => array(
               0 => 'BankAccountTest::testDepositWithdrawMoney',
             ),
-            25 => NULL,
+            25 => null,
             29 => array(
               0 => 'BankAccountTest::testBalanceCannotBecomeNegative',
               1 => 'BankAccountTest::testDepositWithdrawMoney'
@@ -227,7 +267,7 @@ protected function getExpectedDataArrayForBankAccount()
             31 => array(
               0 => 'BankAccountTest::testDepositWithdrawMoney'
             ),
-            32 => NULL
+            32 => null
           )
         );
     }
@@ -239,7 +279,7 @@ protected function getCoverageForFileWithIgnoredLines()
           new PHP_CodeCoverage_Filter
         );
 
-        $coverage->start('FileWithIgnoredLines', TRUE);
+        $coverage->start('FileWithIgnoredLines', true);
         $coverage->stop();
 
         return $coverage;
@@ -263,4 +303,41 @@ protected function setUpXdebugStubForFileWithIgnoredLines()
 
         return $stub;
     }
+
+    protected function getCoverageForClassWithAnonymousFunction()
+    {
+        $coverage = new PHP_CodeCoverage(
+          $this->setUpXdebugStubForClassWithAnonymousFunction(),
+          new PHP_CodeCoverage_Filter
+        );
+
+        $coverage->start('ClassWithAnonymousFunction', true);
+        $coverage->stop();
+
+        return $coverage;
+    }
+
+    protected function setUpXdebugStubForClassWithAnonymousFunction()
+    {
+        $stub = $this->getMock('PHP_CodeCoverage_Driver_Xdebug');
+        $stub->expects($this->any())
+             ->method('stop')
+             ->will($this->returnValue(
+               array(
+                 TEST_FILES_PATH . 'source_with_class_and_anonymous_function.php' => array(
+                    7  => 1,
+                    9  => 1,
+                    10 => -1,
+                    11 => 1,
+                    12 => 1,
+                    13 => 1,
+                    14 => 1,
+                    17 => 1,
+                    18 => 1
+                 )
+               )
+            ));
+
+        return $stub;
+    }
 }
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/BankAccount-clover.xml b/core/vendor/phpunit/php-code-coverage/tests/_files/BankAccount-clover.xml
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/BankAccount-clover.xml
rename to core/vendor/phpunit/php-code-coverage/tests/_files/BankAccount-clover.xml
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/BankAccount.php b/core/vendor/phpunit/php-code-coverage/tests/_files/BankAccount.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/BankAccount.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/BankAccount.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/BankAccountTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/BankAccountTest.php
similarity index 93%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/BankAccountTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/BankAccountTest.php
index 827cd2452021f605acfd60d1e80b2a87b49b37bc..3a6277ba2026e986b2cc2af1f355b3a92c94efb7 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/_files/BankAccountTest.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/BankAccountTest.php
@@ -25,9 +25,7 @@ public function testBalanceCannotBecomeNegative()
     {
         try {
             $this->ba->withdrawMoney(1);
-        }
-
-        catch (RuntimeException $e) {
+        } catch (RuntimeException $e) {
             $this->assertEquals(0, $this->ba->getBalance());
 
             return;
@@ -43,9 +41,7 @@ public function testBalanceCannotBecomeNegative2()
     {
         try {
             $this->ba->depositMoney(-1);
-        }
-
-        catch (RuntimeException $e) {
+        } catch (RuntimeException $e) {
             $this->assertEquals(0, $this->ba->getBalance());
 
             return;
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageClassExtendedTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassExtendedTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageClassExtendedTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassExtendedTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageClassTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageClassTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageClassTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionParenthesesTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionParenthesesTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..becc6c8f9f3870a3ba3221fbf414ba323378ef1b
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction ( )
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageFunctionTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..55d7f571e5de21551fb6e6cafe9b783a7b71c0c1
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodOneLineAnnotationTest.php
@@ -0,0 +1,11 @@
+<?php
+
+class CoverageMethodOneLineAnnotationTest extends PHPUnit_Framework_TestCase
+{
+    /** @covers CoveredClass::publicMethod */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodParenthesesTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodParenthesesTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d1be1c6cf06b65ab6ac0c5be48948ca4e7c99e70
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod ( )
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageMethodTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNoneTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNoneTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNoneTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNoneTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNotPrivateTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPrivateTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNotPrivateTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPrivateTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNotProtectedTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotProtectedTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNotProtectedTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotProtectedTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNotPublicTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPublicTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNotPublicTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNotPublicTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNothingTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNothingTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageNothingTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageNothingTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoveragePrivateTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoveragePrivateTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoveragePrivateTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoveragePrivateTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageProtectedTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageProtectedTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageProtectedTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageProtectedTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoveragePublicTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoveragePublicTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoveragePublicTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoveragePublicTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageTwoDefaultClassAnnotations.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoverageTwoDefaultClassAnnotations.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageTwoDefaultClassAnnotations.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoverageTwoDefaultClassAnnotations.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoveredClass.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoveredClass.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoveredClass.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoveredClass.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoveredFunction.php b/core/vendor/phpunit/php-code-coverage/tests/_files/CoveredFunction.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoveredFunction.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/CoveredFunction.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageClassExtendedTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassExtendedTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageClassExtendedTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassExtendedTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageClassTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageClassTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageClassTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..45f583b7777654879c33f74a39ce0fc28fee59bc
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassPublicTest.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @coversDefaultClass \Foo\CoveredClass
+ */
+class NamespaceCoverageCoversClassPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b336745460ad7e336ef3e792c5d7dde7f46951a0
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageCoversClassTest.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @coversDefaultClass \Foo\CoveredClass
+ */
+class NamespaceCoverageCoversClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::privateMethod
+     * @covers ::protectedMethod
+     * @covers ::publicMethod
+     * @covers \Foo\CoveredParentClass::privateMethod
+     * @covers \Foo\CoveredParentClass::protectedMethod
+     * @covers \Foo\CoveredParentClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageMethodTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageMethodTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageMethodTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageMethodTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageNotPrivateTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPrivateTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageNotPrivateTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPrivateTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageNotProtectedTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotProtectedTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageNotProtectedTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotProtectedTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageNotPublicTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPublicTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageNotPublicTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageNotPublicTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoveragePrivateTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePrivateTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoveragePrivateTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePrivateTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageProtectedTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageProtectedTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageProtectedTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoverageProtectedTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoveragePublicTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePublicTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoveragePublicTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveragePublicTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoveredClass.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveredClass.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoveredClass.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NamespaceCoveredClass.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NotExistingCoveredElementTest.php b/core/vendor/phpunit/php-code-coverage/tests/_files/NotExistingCoveredElementTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NotExistingCoveredElementTest.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/NotExistingCoveredElementTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/class-with-anonymous-function-clover.xml b/core/vendor/phpunit/php-code-coverage/tests/_files/class-with-anonymous-function-clover.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ac43b80617803ff733625b87ec5685a729af6f0a
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/class-with-anonymous-function-clover.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<coverage generated="%i">
+  <project timestamp="%i">
+    <file name="%s/source_with_class_and_anonymous_function.php">
+      <class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
+        <metrics methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="5" coveredstatements="4" elements="7" coveredelements="5"/>
+      </class>
+      <line num="5" type="method" name="runAnonymous" crap="1.04" count="1"/>
+      <line num="7" type="stmt" count="1"/>
+      <line num="9" type="stmt" count="1"/>
+      <line num="10" type="stmt" count="0"/>
+      <line num="11" type="method" name="anonymous function" crap="1" count="1"/>
+      <line num="12" type="stmt" count="1"/>
+      <line num="13" type="stmt" count="1"/>
+      <line num="14" type="stmt" count="1"/>
+      <line num="17" type="stmt" count="1"/>
+      <line num="18" type="stmt" count="1"/>
+      <metrics loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
+    </file>
+    <metrics files="1" loc="19" ncloc="17" classes="1" methods="2" coveredmethods="1" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="10" coveredelements="8"/>
+  </project>
+</coverage>
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/ignored-lines-clover.xml b/core/vendor/phpunit/php-code-coverage/tests/_files/ignored-lines-clover.xml
similarity index 70%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/ignored-lines-clover.xml
rename to core/vendor/phpunit/php-code-coverage/tests/_files/ignored-lines-clover.xml
index aeb4172dcb32113e9cc3c8f676f90a930d95b7e9..cda929cd34821cf7538a97bf29a3aea8ab9cb389 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/_files/ignored-lines-clover.xml
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/ignored-lines-clover.xml
@@ -3,15 +3,15 @@
   <project timestamp="%i">
     <file name="%s/source_with_ignore.php">
       <class name="Foo" namespace="global">
-        <metrics methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="1" coveredelements="0"/>
+        <metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
       </class>
       <class name="Bar" namespace="global">
-        <metrics methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="1" coveredelements="0"/>
+        <metrics methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
       </class>
       <line num="2" type="stmt" count="1"/>
       <line num="6" type="stmt" count="0"/>
-      <metrics loc="38" ncloc="26" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
+      <metrics loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
     </file>
-    <metrics files="1" loc="38" ncloc="26" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
+    <metrics files="1" loc="37" ncloc="25" classes="2" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="2" coveredstatements="1" elements="2" coveredelements="1"/>
   </project>
 </coverage>
diff --git a/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_class_and_anonymous_function.php b/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_class_and_anonymous_function.php
new file mode 100644
index 0000000000000000000000000000000000000000..eaba387d6f6344c8efcc665fc599dd09b4f50d81
--- /dev/null
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_class_and_anonymous_function.php
@@ -0,0 +1,19 @@
+<?php
+
+class CoveredClassWithAnonymousFunctionInStaticMethod
+{
+    public static function runAnonymous()
+    {
+        $filter = array('abc124', 'abc123', '123');
+
+        array_walk(
+            $filter,
+            function (&$val, $key) {
+                $val = preg_replace('|[^0-9]|', '', $val);
+            }
+        );
+
+        // Should be covered
+        $extravar = true;
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_ignore.php b/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_ignore.php
similarity index 95%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_ignore.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/source_with_ignore.php
index 51a9268e9b89d75173df7798cfdd7bf7209eda87..dd9aa12a2e17253a5f303a5945477ba79fa2653e 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_ignore.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_ignore.php
@@ -30,9 +30,8 @@ function baz()
     print '*'; // @codeCoverageIgnore
 }
 
-interface Bor {
-
+interface Bor
+{
     public function foo();
 
 }
-
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_namespace.php b/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_namespace.php
similarity index 62%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_namespace.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/source_with_namespace.php
index 4aba25a8a1a01eebbe59c48cab1c9c38fc5c5bab..ebe98ee15bad712273a34c33db40a7c569b6085d 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_namespace.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_namespace.php
@@ -4,7 +4,7 @@
 /**
  * Represents foo.
  */
-class Foo
+class source_with_namespace
 {
 }
 
@@ -13,8 +13,8 @@ class Foo
  */
 function &foo($bar)
 {
-    $baz = function() {};
-    $a   = TRUE ? TRUE : FALSE;
+    $baz = function () {};
+    $a   = true ? true : false;
     $b = "{$a}";
     $c = "${b}";
 }
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_oneline_annotations.php b/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_oneline_annotations.php
similarity index 96%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_oneline_annotations.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/source_with_oneline_annotations.php
index 327122e5a229aee5614d8fb525989eb1ca8d28f5..19dd4cd4dff5f46124e3aa61ec0ae483cdb8550d 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_with_oneline_annotations.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/source_with_oneline_annotations.php
@@ -1,7 +1,8 @@
 <?php
 
 /** Docblock */
-interface Foo {
+interface Foo
+{
     public function bar();
 }
 
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_without_ignore.php b/core/vendor/phpunit/php-code-coverage/tests/_files/source_without_ignore.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/source_without_ignore.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/source_without_ignore.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_without_namespace.php b/core/vendor/phpunit/php-code-coverage/tests/_files/source_without_namespace.php
similarity index 69%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/source_without_namespace.php
rename to core/vendor/phpunit/php-code-coverage/tests/_files/source_without_namespace.php
index 4a52adeffbeda3e2035ea88a180fa5208c407142..24d78e594d9f44052beab96fbeae092ee7e071ae 100644
--- a/core/vendor/phpunit/php-code-coverage/Tests/_files/source_without_namespace.php
+++ b/core/vendor/phpunit/php-code-coverage/tests/_files/source_without_namespace.php
@@ -11,8 +11,8 @@ class Foo
  */
 function &foo($bar)
 {
-    $baz = function() {};
-    $a   = TRUE ? TRUE : FALSE;
+    $baz = function () {};
+    $a   = true ? true : false;
     $b = "{$a}";
     $c = "${b}";
 }
diff --git a/core/vendor/phpunit/php-text-template/ChangeLog.markdown b/core/vendor/phpunit/php-text-template/ChangeLog.markdown
deleted file mode 100644
index 63abd62d57ecb1310c55ea11f743370f3da9ffb5..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-text-template/ChangeLog.markdown
+++ /dev/null
@@ -1,24 +0,0 @@
-Text_Template 1.1
-=================
-
-This is the list of changes for the Text_Template 1.1 release series.
-
-Text_Template 1.1.4
--------------------
-
-* Improved error message in case `renderTo()` cannot write to the target file.
-
-Text_Template 1.1.3
--------------------
-
-* No changes.
-
-Text_Template 1.1.2
--------------------
-
-* No changes.
-
-Text_Template 1.1.1
--------------------
-
-* No changes.
diff --git a/core/vendor/phpunit/php-text-template/ChangeLog.md b/core/vendor/phpunit/php-text-template/ChangeLog.md
new file mode 100644
index 0000000000000000000000000000000000000000..f2b7f7ecc1e35c74b9d39c20b27f7628dc5dbc60
--- /dev/null
+++ b/core/vendor/phpunit/php-text-template/ChangeLog.md
@@ -0,0 +1,9 @@
+Text_Template 1.2
+=================
+
+This is the list of changes for the Text_Template 1.2 release series.
+
+Text_Template 1.2.0
+-------------------
+
+* Added support for arbitrary delimiters for template variables.
diff --git a/core/vendor/phpunit/php-text-template/LICENSE b/core/vendor/phpunit/php-text-template/LICENSE
index af2a7132bc4ae008387514d50e5e539d361b8502..3efd415ef6549e3115147e580d44ffeaae8c9752 100644
--- a/core/vendor/phpunit/php-text-template/LICENSE
+++ b/core/vendor/phpunit/php-text-template/LICENSE
@@ -1,6 +1,6 @@
 Text_Template
 
-Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/core/vendor/phpunit/php-text-template/README.markdown b/core/vendor/phpunit/php-text-template/README.md
similarity index 100%
rename from core/vendor/phpunit/php-text-template/README.markdown
rename to core/vendor/phpunit/php-text-template/README.md
diff --git a/core/vendor/phpunit/php-text-template/Text/Template.php b/core/vendor/phpunit/php-text-template/Text/Template.php
index 24abf1bf0f06bdd85238005fe35cd72f76eb298f..2f5a36709c8cc51300dc067955dc5ef7ed48d1b9 100644
--- a/core/vendor/phpunit/php-text-template/Text/Template.php
+++ b/core/vendor/phpunit/php-text-template/Text/Template.php
@@ -2,7 +2,7 @@
 /**
  * Text_Template
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @category   Text
  * @package    Template
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-text-template
  * @since      File available since Release 1.0.0
@@ -48,8 +48,8 @@
  *
  * @category   Text
  * @package    Template
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-text-template
@@ -62,6 +62,16 @@ class Text_Template
      */
     protected $template = '';
 
+    /**
+     * @var string
+     */
+    protected $openDelimiter = '{';
+
+    /**
+     * @var string
+     */
+    protected $closeDelimiter = '}';
+
     /**
      * @var array
      */
@@ -73,9 +83,11 @@ class Text_Template
      * @param  string $file
      * @throws InvalidArgumentException
      */
-    public function __construct($file = '')
+    public function __construct($file = '', $openDelimiter = '{', $closeDelimiter = '}')
     {
         $this->setFile($file);
+        $this->openDelimiter  = $openDelimiter;
+        $this->closeDelimiter = $closeDelimiter;
     }
 
     /**
@@ -128,7 +140,7 @@ public function render()
         $keys = array();
 
         foreach ($this->values as $key => $value) {
-            $keys[] = '{' . $key . '}';
+            $keys[] = $this->openDelimiter . $key . $this->closeDelimiter;
         }
 
         return str_replace($keys, $this->values, $this->template);
@@ -162,3 +174,4 @@ public function renderTo($target)
         }
     }
 }
+
diff --git a/core/vendor/phpunit/php-text-template/Text/Template/Autoload.php b/core/vendor/phpunit/php-text-template/Text/Template/Autoload.php
index 90ee111fd090dbbe0e5099687b34b88c478e8a1c..9142641a74f6db95b402a6c85b6a2ce3f70b2346 100644
--- a/core/vendor/phpunit/php-text-template/Text/Template/Autoload.php
+++ b/core/vendor/phpunit/php-text-template/Text/Template/Autoload.php
@@ -2,7 +2,7 @@
 /**
  * Text_Template
  *
- * Copyright (c) 2009-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @category   Text
  * @package    Template
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-text-template
  * @since      File available since Release 1.1.0
diff --git a/core/vendor/phpunit/php-text-template/Text/Template/Autoload.php.in b/core/vendor/phpunit/php-text-template/Text/Template/Autoload.php.in
index 183740323183787f90f5b233ecfff8c3494945e6..30921204ac5bc3f3b917ee201b8ea64abbac3416 100644
--- a/core/vendor/phpunit/php-text-template/Text/Template/Autoload.php.in
+++ b/core/vendor/phpunit/php-text-template/Text/Template/Autoload.php.in
@@ -2,7 +2,7 @@
 /**
  * Text_Template
  *
- * Copyright (c) 2009-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @category   Text
  * @package    Template
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2010 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-text-template
  * @since      File available since Release 1.1.0
diff --git a/core/vendor/phpunit/php-text-template/package.xml b/core/vendor/phpunit/php-text-template/package.xml
index d928730b767a51a0df7f207bd5c3674c413c5a10..7bd4f3141fe8d6bb7172126827a6c062051ba3d5 100644
--- a/core/vendor/phpunit/php-text-template/package.xml
+++ b/core/vendor/phpunit/php-text-template/package.xml
@@ -17,10 +17,10 @@
   <email>sb@sebastian-bergmann.de</email>
   <active>yes</active>
  </lead>
- <date>2012-10-31</date>
+ <date>2014-01-30</date>
  <version>
-  <release>1.1.4</release>
-  <api>1.1.0</api>
+  <release>1.2.0</release>
+  <api>1.2.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -40,9 +40,9 @@
      <tasks:replace from="@package_version@" to="version" type="package-info" />
     </file>
    </dir>
-   <file baseinstalldir="/" name="ChangeLog.markdown" role="doc"/>
+   <file baseinstalldir="/" name="ChangeLog.md" role="doc"/>
    <file baseinstalldir="/" name="LICENSE" role="doc"/>
-   <file baseinstalldir="/" name="README.markdown" role="doc"/>
+   <file baseinstalldir="/" name="README.md" role="doc"/>
   </dir>
  </contents>
  <dependencies>
diff --git a/core/vendor/phpunit/php-timer/ChangeLog.markdown b/core/vendor/phpunit/php-timer/ChangeLog.markdown
deleted file mode 100644
index 8d6a0523755616e536241b4743e0f4342e99f933..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-timer/ChangeLog.markdown
+++ /dev/null
@@ -1,29 +0,0 @@
-PHP_Timer 1.0
-=============
-
-This is the list of changes for the PHP_Timer 1.0 release series.
-
-PHP_Timer 1.0.4
----------------
-
-* No changes.
-
-PHP_Timer 1.0.3
----------------
-
-* No changes.
-
-PHP_Timer 1.0.2
----------------
-
-* `$_SERVER['REQUEST_TIME_FLOAT']` is used when available.
-
-PHP_Timer 1.0.1
----------------
-
-* No changes.
-
-PHP_Timer 1.0.0
----------------
-
-* Initial release.
diff --git a/core/vendor/phpunit/php-timer/LICENSE b/core/vendor/phpunit/php-timer/LICENSE
index b51fc64c47e5f3a35af84bc52107e33d383f3804..581812af37372e8f7f96205d7849df3e6088c07b 100644
--- a/core/vendor/phpunit/php-timer/LICENSE
+++ b/core/vendor/phpunit/php-timer/LICENSE
@@ -1,6 +1,6 @@
 PHP_Timer
 
-Copyright (c) 2010-2012, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/core/vendor/phpunit/php-timer/PHP/Timer.php b/core/vendor/phpunit/php-timer/PHP/Timer.php
index 0f2cc2b5cbbd70dd3839952cbbdd1c34b0155767..0056ea8310889299df492bfb66a63be458b492c8 100644
--- a/core/vendor/phpunit/php-timer/PHP/Timer.php
+++ b/core/vendor/phpunit/php-timer/PHP/Timer.php
@@ -2,7 +2,7 @@
 /**
  * PHP_Timer
  *
- * Copyright (c) 2010-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHP
  * @subpackage Timer
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-timer
  * @since      File available since Release 1.0.0
@@ -48,8 +48,8 @@
  *
  * @package    PHP
  * @subpackage Timer
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-timer
@@ -60,7 +60,16 @@ class PHP_Timer
     /**
      * @var array
      */
-    protected static $startTimes = array();
+    private static $times = array(
+      'hour'   => 3600000,
+      'minute' => 60000,
+      'second' => 1000
+    );
+
+    /**
+     * @var array
+     */
+    private static $startTimes = array();
 
     /**
      * @var float
@@ -93,32 +102,16 @@ public static function stop()
      */
     public static function secondsToTimeString($time)
     {
-        $buffer = '';
-
-        $hours   = sprintf('%02d', ($time >= 3600) ? floor($time / 3600) : 0);
-        $minutes = sprintf(
-                     '%02d',
-                     ($time >= 60)   ? floor($time /   60) - 60 * $hours : 0
-                   );
-        $seconds = sprintf('%02d', $time - 60 * 60 * $hours - 60 * $minutes);
-
-        if ($hours == 0 && $minutes == 0) {
-            $seconds = sprintf('%1d', $seconds);
+        $ms = round($time * 1000);
 
-            $buffer .= $seconds . ' second';
-
-            if ($seconds != '1') {
-                $buffer .= 's';
-            }
-        } else {
-            if ($hours > 0) {
-                $buffer = $hours . ':';
+        foreach (self::$times as $unit => $value) {
+            if ($ms >= $value) {
+                $time = floor($ms / $value * 100.0) / 100.0;
+                return $time . ' ' . ($time == 1 ? $unit : $unit . 's');
             }
-
-            $buffer .= $minutes . ':' . $seconds;
         }
 
-        return $buffer;
+        return $ms . ' ms';
     }
 
     /**
@@ -128,7 +121,7 @@ public static function secondsToTimeString($time)
      */
     public static function timeSinceStartOfRequest()
     {
-        return self::secondsToTimeString(time() - self::$requestTime);
+        return self::secondsToTimeString(microtime(TRUE) - self::$requestTime);
     }
 
     /**
@@ -150,10 +143,6 @@ public static function resourceUsage()
     PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME_FLOAT'];
 }
 
-else if (isset($_SERVER['REQUEST_TIME'])) {
-    PHP_Timer::$requestTime = $_SERVER['REQUEST_TIME'];
-}
-
 else {
-    PHP_Timer::$requestTime = time();
-}
\ No newline at end of file
+    PHP_Timer::$requestTime = microtime(TRUE);
+}
diff --git a/core/vendor/phpunit/php-timer/PHP/Timer/Autoload.php b/core/vendor/phpunit/php-timer/PHP/Timer/Autoload.php
index 0184b9dbb20ede3fedb19fb2b66dccec4cf5bab9..17b781daae8e42f353c93791d536e35c1ce9f586 100644
--- a/core/vendor/phpunit/php-timer/PHP/Timer/Autoload.php
+++ b/core/vendor/phpunit/php-timer/PHP/Timer/Autoload.php
@@ -2,7 +2,7 @@
 /**
  * PHP_Timer
  *
- * Copyright (c) 2010-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHP
  * @subpackage Timer
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-timer
  * @since      File available since Release 1.1.0
diff --git a/core/vendor/phpunit/php-timer/PHP/Timer/Autoload.php.in b/core/vendor/phpunit/php-timer/PHP/Timer/Autoload.php.in
index 77e7b039a38eb76b4cb9efef1a1e3ff918819fc9..c2681c27a33faeaa574c5e1aed8da907bb3708ce 100644
--- a/core/vendor/phpunit/php-timer/PHP/Timer/Autoload.php.in
+++ b/core/vendor/phpunit/php-timer/PHP/Timer/Autoload.php.in
@@ -2,7 +2,7 @@
 /**
  * PHP_Timer
  *
- * Copyright (c) 2010-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHP
  * @subpackage Timer
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-timer
  * @since      File available since Release 1.1.0
diff --git a/core/vendor/phpunit/php-timer/README.markdown b/core/vendor/phpunit/php-timer/README.markdown
deleted file mode 100644
index 9ff8f78efead01509155d44f0e937a4d1f9efc1a..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-timer/README.markdown
+++ /dev/null
@@ -1,23 +0,0 @@
-PHP_Timer
-=========
-
-Installation
-------------
-
-PHP_Timer should be installed using the [PEAR Installer](http://pear.php.net/). This installer is the backbone of PEAR, which provides a distribution system for PHP packages, and is shipped with every release of PHP since version 4.3.0.
-
-The PEAR channel (`pear.phpunit.de`) that is used to distribute PHP_Timer needs to be registered with the local PEAR environment:
-
-    sb@ubuntu ~ % pear channel-discover pear.phpunit.de
-    Adding Channel "pear.phpunit.de" succeeded
-    Discovery of channel "pear.phpunit.de" succeeded
-
-This has to be done only once. Now the PEAR Installer can be used to install packages from the PHPUnit channel:
-
-    sb@vmware ~ % pear install phpunit/PHP_Timer
-    downloading PHP_Timer-1.0.0.tgz ...
-    Starting to download PHP_Timer-1.0.0.tgz (2,536 bytes)
-    ....done: 2,536 bytes
-    install ok: channel://pear.phpunit.de/PHP_Timer-1.0.0
-
-After the installation you can find the PHP_Timer source files inside your local PEAR directory; the path is usually `/usr/lib/php/PHP`.
diff --git a/core/vendor/phpunit/php-timer/README.md b/core/vendor/phpunit/php-timer/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b618de0cb71d7bad7b408c635e9065efb0104203
--- /dev/null
+++ b/core/vendor/phpunit/php-timer/README.md
@@ -0,0 +1,56 @@
+# PHP_Timer
+
+Utility class for timing things, factored out of PHPUnit into a stand-alone component.
+
+## Installation
+
+You can use the [PEAR Installer](http://pear.php.net/manual/en/guide.users.commandline.cli.php) or [Composer](http://getcomposer.org/) to download and install this package as well as its dependencies.
+
+### PEAR Installer
+
+The following two commands (which you may have to run as `root`) are all that is required to install this package using the PEAR Installer:
+
+    pear config-set auto_discover 1
+    pear install pear.phpunit.de/PHP_Timer
+
+### Composer
+
+To add this package as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-timer` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_Timer:
+
+    {
+        "require": {
+            "phpunit/php-timer": "*"
+        }
+    }
+
+### Usage
+
+#### Basic Timing
+
+```php
+PHP_Timer::start();
+
+$timer->start();
+
+// ...
+
+$time = PHP_Timer::stop();
+var_dump($time);
+
+print PHP_Timer::secondsToTimeString($time);
+```
+
+The code above yields the output below:
+
+    double(1.0967254638672E-5)
+    0 ms
+
+#### Resource Consumption Since PHP Startup
+
+```php
+print PHP_Timer::resourceUsage();
+```
+
+The code above yields the output below:
+
+    Time: 0 ms, Memory: 0.50Mb
diff --git a/core/vendor/phpunit/php-timer/Tests/TimerTest.php b/core/vendor/phpunit/php-timer/Tests/TimerTest.php
index 1582d3b043bac7a1d63c51a4a0a60fc3ac75330b..9cf4cb076df68ebbe05b18113d98fd20e5b5c3fa 100644
--- a/core/vendor/phpunit/php-timer/Tests/TimerTest.php
+++ b/core/vendor/phpunit/php-timer/Tests/TimerTest.php
@@ -2,7 +2,7 @@
 /**
  * PHP_Timer
  *
- * Copyright (c) 2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHP
  * @subpackage Timer
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/php-timer
  * @since      File available since Release 1.0.0
@@ -50,8 +50,8 @@
  *
  * @package    PHP
  * @subpackage Timer
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-timer
@@ -65,24 +65,18 @@ class PHP_TimerTest extends PHPUnit_Framework_TestCase
      */
     public function testStartStop()
     {
-        PHP_Timer::start();
         $this->assertInternalType('float', PHP_Timer::stop());
     }
 
     /**
-     * @covers PHP_Timer::secondsToTimeString
+     * @covers       PHP_Timer::secondsToTimeString
+     * @dataProvider secondsProvider
      */
-    public function testSecondsToTimeString()
+    public function testSecondsToTimeString($string, $seconds)
     {
-        $this->assertEquals('0 seconds', PHP_Timer::secondsToTimeString(0));
-        $this->assertEquals('1 second', PHP_Timer::secondsToTimeString(1));
-        $this->assertEquals('2 seconds', PHP_Timer::secondsToTimeString(2));
-        $this->assertEquals('01:00', PHP_Timer::secondsToTimeString(60));
-        $this->assertEquals('01:01', PHP_Timer::secondsToTimeString(61));
-        $this->assertEquals('02:00', PHP_Timer::secondsToTimeString(120));
-        $this->assertEquals('02:01', PHP_Timer::secondsToTimeString(121));
-        $this->assertEquals('01:00:00', PHP_Timer::secondsToTimeString(3600));
-        $this->assertEquals('01:00:01', PHP_Timer::secondsToTimeString(3601));
+        $this->assertEquals(
+          $string, PHP_Timer::secondsToTimeString($seconds)
+        );
     }
 
     /**
@@ -91,7 +85,7 @@ public function testSecondsToTimeString()
     public function testTimeSinceStartOfRequest()
     {
         $this->assertStringMatchesFormat(
-          '%i %s', PHP_Timer::timeSinceStartOfRequest()
+          '%f %s', PHP_Timer::timeSinceStartOfRequest()
         );
     }
 
@@ -105,4 +99,44 @@ public function testResourceUsage()
           'Time: %s, Memory: %s', PHP_Timer::resourceUsage()
         );
     }
+
+    public function secondsProvider()
+    {
+        return array(
+          array('0 ms', 0),
+          array('1 ms', .001),
+          array('10 ms', .01),
+          array('100 ms', .1),
+          array('999 ms', .999),
+          array('1 second', .9999),
+          array('1 second', 1),
+          array('2 seconds', 2),
+          array('59.9 seconds', 59.9),
+          array('59.99 seconds', 59.99),
+          array('59.99 seconds', 59.999),
+          array('1 minute', 59.9999),
+          array('59 seconds', 59.001),
+          array('59.01 seconds', 59.01),
+          array('1 minute', 60),
+          array('1.01 minutes', 61),
+          array('2 minutes', 120),
+          array('2.01 minutes', 121),
+          array('59.99 minutes', 3599.9),
+          array('59.99 minutes', 3599.99),
+          array('59.99 minutes', 3599.999),
+          array('1 hour', 3599.9999),
+          array('59.98 minutes', 3599.001),
+          array('59.98 minutes', 3599.01),
+          array('1 hour', 3600),
+          array('1 hour', 3601),
+          array('1 hour', 3601.9),
+          array('1 hour', 3601.99),
+          array('1 hour', 3601.999),
+          array('1 hour', 3601.9999),
+          array('1.01 hours', 3659.9999),
+          array('1.01 hours', 3659.001),
+          array('1.01 hours', 3659.01),
+          array('2 hours', 7199.9999),
+        );
+    }
 }
diff --git a/core/vendor/phpunit/php-timer/composer.json b/core/vendor/phpunit/php-timer/composer.json
index b10a398ec139a0755cd5b67b3b9cb429e17b2f55..211c001786b9d212cbc4d45dbfa4a7a554a513c5 100644
--- a/core/vendor/phpunit/php-timer/composer.json
+++ b/core/vendor/phpunit/php-timer/composer.json
@@ -5,7 +5,7 @@
     "keywords": [
         "timer"
     ],
-    "homepage": "http://www.phpunit.de/",
+    "homepage": "https://github.com/sebastianbergmann/php-timer/",
     "license": "BSD-3-Clause",
     "authors": [
         {
diff --git a/core/vendor/phpunit/php-timer/package-composer.json b/core/vendor/phpunit/php-timer/package-composer.json
deleted file mode 100644
index 7bdde76c9d3c50c6dea5a51137a16d3f7d5807a6..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-timer/package-composer.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "phpunit/php-timer",
-    "keywords": [ "timer" ],
-    "license": "BSD-3-Clause",
-    "homepage": "http://www.phpunit.de/",
-    "dependency_map": { },
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-        "irc": "irc://irc.freenode.net/phpunit"
-    },
-    "autoload": {
-        "classmap": [ "PHP/" ]
-    },
-    "include_path": [
-        ""
-    ],
-    "version": false,
-    "time": false
-}
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-timer/package.xml b/core/vendor/phpunit/php-timer/package.xml
index c90fbf2da585949509d5fd0d1d08a386027b2952..2980a31a93a3b622ac018abf9c35a7a1a5bbf1fb 100644
--- a/core/vendor/phpunit/php-timer/package.xml
+++ b/core/vendor/phpunit/php-timer/package.xml
@@ -17,9 +17,9 @@
   <email>sb@sebastian-bergmann.de</email>
   <active>yes</active>
  </lead>
- <date>2012-10-05</date>
+ <date>2013-08-02</date>
  <version>
-  <release>1.0.4</release>
+  <release>1.0.5</release>
   <api>1.0.0</api>
  </version>
  <stability>
@@ -40,9 +40,8 @@
      <tasks:replace from="@package_version@" to="version" type="package-info" />
     </file>
    </dir>
-   <file baseinstalldir="/" name="ChangeLog.markdown" role="doc"/>
    <file baseinstalldir="/" name="LICENSE" role="doc"/>
-   <file baseinstalldir="/" name="README.markdown" role="doc"/>
+   <file baseinstalldir="/" name="README.md" role="doc"/>
   </dir>
  </contents>
  <dependencies>
diff --git a/core/vendor/phpunit/php-token-stream/ChangeLog.markdown b/core/vendor/phpunit/php-token-stream/ChangeLog.markdown
deleted file mode 100644
index 0fb8fff7bb9824cb393aaf7f953c8b919ed54f15..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-token-stream/ChangeLog.markdown
+++ /dev/null
@@ -1,35 +0,0 @@
-PHP_TokenStream 1.1
-===================
-
-This is the list of changes for the PHP_TokenStream 1.1 release series.
-
-PHP_TokenStream 1.1.5
----------------------
-
-* No changes.
-
-PHP_TokenStream 1.1.4
----------------------
-
-* No changes.
-
-PHP_TokenStream 1.1.3
----------------------
-
-* Added class for the `T_TRAIT_C` token that was added in PHP 5.4.
-
-PHP_TokenStream 1.1.2
----------------------
-
-* Added classes for the `T_CALLABLE` and `T_INSTEADOF` tokens that were added in PHP 5.4.
-* Added support for namespaced functions.
-
-PHP_TokenStream 1.1.1
----------------------
-
-* Fixed issue #19: Notice in `PHP_Token_INTERFACE::hasInterfaces()`.
-
-PHP_TokenStream 1.1.0
----------------------
-
-* Moved `phptok` tool to separate package.
diff --git a/core/vendor/phpunit/php-token-stream/LICENSE b/core/vendor/phpunit/php-token-stream/LICENSE
index 471af20dd423d5167758cfefc43c3a4a17f4d80d..e5ae55e82a2bb5dd35bb0fd712b278b756a226f4 100644
--- a/core/vendor/phpunit/php-token-stream/LICENSE
+++ b/core/vendor/phpunit/php-token-stream/LICENSE
@@ -1,6 +1,6 @@
 PHP_TokenStream
 
-Copyright (c) 2009-2012, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/core/vendor/phpunit/php-token-stream/PHP/Token.php b/core/vendor/phpunit/php-token-stream/PHP/Token.php
index ebd4ce76b04e05711f7a20833764f756bcebba2f..45e5dc3fdec707866dce915994a451b64b0023e4 100644
--- a/core/vendor/phpunit/php-token-stream/PHP/Token.php
+++ b/core/vendor/phpunit/php-token-stream/PHP/Token.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package   PHP_TokenStream
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since     File available since Release 1.0.0
  */
@@ -44,8 +44,8 @@
 /**
  * A PHP token.
  *
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version   Release: @package_version@
  * @link      http://github.com/sebastianbergmann/php-token-stream/tree
@@ -175,7 +175,7 @@ public function getEndTokenId()
                 }
             }
 
-            else if (($this instanceof PHP_Token_FUNCTION || 
+            else if (($this instanceof PHP_Token_FUNCTION ||
                 $this instanceof PHP_Token_NAMESPACE) &&
                 $tokens[$i] instanceof PHP_Token_SEMICOLON) {
                 if ($block === 0) {
@@ -376,10 +376,15 @@ public function getArguments()
         }
 
         $this->arguments = array();
-        $i               = $this->id + 3;
         $tokens          = $this->tokenStream->tokens();
         $typeHint        = NULL;
 
+        // Search for first token inside brackets
+        $i = $this->id + 2;
+        while (!$tokens[$i-1] instanceof PHP_Token_OPEN_BRACKET) {
+            $i++;
+        }
+
         while (!$tokens[$i] instanceof PHP_Token_CLOSE_BRACKET) {
             if ($tokens[$i] instanceof PHP_Token_STRING) {
                 $typeHint = (string)$tokens[$i];
@@ -404,17 +409,22 @@ public function getName()
 
         $tokens = $this->tokenStream->tokens();
 
-        if ($tokens[$this->id+2] instanceof PHP_Token_STRING) {
-            $this->name = (string)$tokens[$this->id+2];
-        }
+        for ($i = $this->id + 1; $i < count($tokens); $i++) {
+            if ($tokens[$i] instanceof PHP_Token_STRING) {
+                $this->name = (string)$tokens[$i];
+                break;
+            }
 
-        else if ($tokens[$this->id+2] instanceof PHP_Token_AMPERSAND &&
-                 $tokens[$this->id+3] instanceof PHP_Token_STRING) {
-            $this->name = (string)$tokens[$this->id+3];
-        }
+            else if ($tokens[$i] instanceof PHP_Token_AMPERSAND &&
+                     $tokens[$i+1] instanceof PHP_Token_STRING) {
+                $this->name = (string)$tokens[$i+1];
+                break;
+            }
 
-        else {
-            $this->name = 'anonymous function';
+            else if ($tokens[$i] instanceof PHP_Token_OPEN_BRACKET) {
+                $this->name = 'anonymous function';
+                break;
+            }
         }
 
         if ($this->name != 'anonymous function') {
@@ -482,11 +492,13 @@ public function getSignature()
 
         $tokens = $this->tokenStream->tokens();
 
-        while (!$tokens[$i] instanceof PHP_Token_CLOSE_BRACKET) {
+        while (isset($tokens[$i]) &&
+               !$tokens[$i] instanceof PHP_Token_OPEN_CURLY &&
+               !$tokens[$i] instanceof PHP_Token_SEMICOLON) {
             $this->signature .= $tokens[$i++];
         }
 
-        $this->signature .= ')';
+        $this->signature = trim($this->signature);
 
         return $this->signature;
     }
@@ -494,8 +506,10 @@ public function getSignature()
 
 class PHP_Token_CONST extends PHP_Token {}
 class PHP_Token_RETURN extends PHP_Token {}
+class PHP_Token_YIELD extends PHP_Token {}
 class PHP_Token_TRY extends PHP_Token {}
 class PHP_Token_CATCH extends PHP_Token {}
+class PHP_Token_FINALLY extends PHP_Token {}
 class PHP_Token_THROW extends PHP_Token {}
 class PHP_Token_USE extends PHP_Token {}
 class PHP_Token_GLOBAL extends PHP_Token {}
@@ -638,6 +652,7 @@ public function getInterfaces()
 }
 
 class PHP_Token_CLASS extends PHP_Token_INTERFACE {}
+class PHP_Token_CLASS_NAME_CONSTANT extends PHP_Token {}
 class PHP_Token_TRAIT extends PHP_Token_INTERFACE {}
 class PHP_Token_EXTENDS extends PHP_Token {}
 class PHP_Token_IMPLEMENTS extends PHP_Token {}
diff --git a/core/vendor/phpunit/php-token-stream/PHP/Token/Stream.php b/core/vendor/phpunit/php-token-stream/PHP/Token/Stream.php
index 77ba0dc11fae9313692085fab701b94f9d5535b9..6a18235328ae2e9b08b70b34cf8491047f3e5d23 100644
--- a/core/vendor/phpunit/php-token-stream/PHP/Token/Stream.php
+++ b/core/vendor/phpunit/php-token-stream/PHP/Token/Stream.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package   PHP_TokenStream
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since     File available since Release 1.0.0
  */
@@ -44,8 +44,8 @@
 /**
  * A stream of PHP tokens.
  *
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version   Release: @package_version@
  * @link      http://github.com/sebastianbergmann/php-token-stream/tree
@@ -132,6 +132,11 @@ class PHP_Token_Stream implements ArrayAccess, Countable, SeekableIterator
      */
     protected $traits;
 
+    /**
+     * @var array
+     */
+    protected $lineToFunctionMap = array();
+
     /**
      * Constructor.
      *
@@ -190,13 +195,21 @@ protected function scan($sourceCode)
         $tokens    = token_get_all($sourceCode);
         $numTokens = count($tokens);
 
+        $lastNonWhitespaceTokenWasDoubleColon = FALSE;
+
         for ($i = 0; $i < $numTokens; ++$i) {
             $token = $tokens[$i];
             unset($tokens[$i]);
 
             if (is_array($token)) {
-                $text       = $token[1];
-                $tokenClass = 'PHP_Token_' . substr(token_name($token[0]), 2);
+                $name = substr(token_name($token[0]), 2);
+                $text = $token[1];
+
+                if ($lastNonWhitespaceTokenWasDoubleColon && $name == 'CLASS') {
+                    $name = 'CLASS_NAME_CONSTANT';
+                }
+
+                $tokenClass = 'PHP_Token_' . $name;
             } else {
                 $text       = $token;
                 $tokenClass = self::$customTokens[$token];
@@ -214,6 +227,14 @@ protected function scan($sourceCode)
                 $tokenClass == 'PHP_Token_DOC_COMMENT') {
                 $this->linesOfCode['cloc'] += $lines + 1;
             }
+
+            if ($name == 'DOUBLE_COLON') {
+                $lastNonWhitespaceTokenWasDoubleColon = TRUE;
+            }
+
+            else if ($name != 'WHITESPACE') {
+                $lastNonWhitespaceTokenWasDoubleColon = FALSE;
+            }
         }
 
         $this->linesOfCode['loc']   = substr_count($sourceCode, "\n");
@@ -351,6 +372,21 @@ public function getIncludes($categorize = FALSE, $category = NULL)
         return $includes;
     }
 
+    /**
+     * Returns the name of the function or method a line belongs to.
+     *
+     * @return string or null if the line is not in a function or method
+     * @since  Method available since Release 1.2.0
+     */
+    public function getFunctionForLine($line)
+    {
+        $this->parse();
+
+        if (isset($this->lineToFunctionMap[$line])) {
+            return $this->lineToFunctionMap[$line];
+        }
+    }
+
     protected function parse()
     {
         $this->interfaces = array();
@@ -431,14 +467,30 @@ protected function parse()
                         $trait === FALSE &&
                         $interface === FALSE) {
                         $this->functions[$name] = $tmp;
+
+                        $this->addFunctionToMap(
+                          $name, $tmp['startLine'], $tmp['endLine']
+                        );
                     }
 
                     else if ($class !== FALSE) {
                         $this->classes[$class]['methods'][$name] = $tmp;
+
+                        $this->addFunctionToMap(
+                          $class . '::' . $name,
+                          $tmp['startLine'],
+                          $tmp['endLine']
+                        );
                     }
 
                     else if ($trait !== FALSE) {
                         $this->traits[$trait]['methods'][$name] = $tmp;
+
+                        $this->addFunctionToMap(
+                          $trait . '::' . $name,
+                          $tmp['startLine'],
+                          $tmp['endLine']
+                        );
                     }
 
                     else {
@@ -565,4 +617,11 @@ public function seek($position)
             throw new OutOfBoundsException('Invalid seek position');
         }
     }
+
+    private function addFunctionToMap($name, $startLine, $endLine)
+    {
+        for ($line = $startLine; $line <= $endLine; $line++) {
+            $this->lineToFunctionMap[$line] = $name;
+        }
+    }
 }
diff --git a/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/Autoload.php b/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/Autoload.php
index 9895b345092625aefc5d5ad43bd990a51d7302b7..5c8cc21ba1feb97f732b8874773dc413ee0b036b 100644
--- a/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/Autoload.php
+++ b/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/Autoload.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2010, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package   PHP_TokenStream
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2010 Sebastian Bergmann <sebastian@phpunit.de>
  * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link      http://github.com/sebastianbergmann/php-token-stream/tree
  * @since     File available since Release 1.1.0
diff --git a/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/Autoload.php.in b/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/Autoload.php.in
index ebd488be87b6e3fb2be6fbbbcb0c98ffb1dd5942..1cb39812fb8bacb9d97f3ccf78fb41435bff67e8 100644
--- a/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/Autoload.php.in
+++ b/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/Autoload.php.in
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2010, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package   PHP_TokenStream
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2010 Sebastian Bergmann <sebastian@phpunit.de>
  * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link      http://github.com/sebastianbergmann/php-token-stream/tree
  * @since     File available since Release 1.1.0
diff --git a/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/CachingFactory.php b/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/CachingFactory.php
index 6ff2c5db4c0baa6630daad114dcf8196625dc5f9..dd499675047d658025edc33137c823665f568b8f 100644
--- a/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/CachingFactory.php
+++ b/core/vendor/phpunit/php-token-stream/PHP/Token/Stream/CachingFactory.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package   PHP_TokenStream
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since     File available since Release 1.0.0
  */
@@ -44,8 +44,8 @@
 /**
  * A caching factory for token stream objects.
  *
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version   Release: @package_version@
  * @link      http://github.com/sebastianbergmann/php-token-stream/tree
diff --git a/core/vendor/phpunit/php-token-stream/README.markdown b/core/vendor/phpunit/php-token-stream/README.markdown
deleted file mode 100644
index e233f41263a6a516515eecaa988853c6df45c359..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-token-stream/README.markdown
+++ /dev/null
@@ -1,23 +0,0 @@
-PHP_TokenStream
-===============
-
-Installation
-------------
-
-PHP_TokenStream should be installed using the [PEAR Installer](http://pear.php.net/). This installer is the backbone of PEAR, which provides a distribution system for PHP packages, and is shipped with every release of PHP since version 4.3.0.
-
-The PEAR channel (`pear.phpunit.de`) that is used to distribute PHP_TokenStream needs to be registered with the local PEAR environment:
-
-    sb@ubuntu ~ % pear channel-discover pear.phpunit.de
-    Adding Channel "pear.phpunit.de" succeeded
-    Discovery of channel "pear.phpunit.de" succeeded
-
-This has to be done only once. Now the PEAR Installer can be used to install packages from the PHPUnit channel:
-
-    sb@ubuntu tokenstream % pear install phpunit/PHP_TokenStream-beta
-    downloading PHP_TokenStream-0.9.1.tgz ...
-    Starting to download PHP_TokenStream-0.9.1.tgz (5,113 bytes)
-    ...done: 5,113 bytes
-    install ok: channel://pear.phpunit.de/PHP_TokenStream-0.9.1
-
-After the installation you can find the PHP_TokenStream source files inside your local PEAR directory; the path is usually `/usr/lib/php/PHP`.
diff --git a/core/vendor/phpunit/php-token-stream/README.md b/core/vendor/phpunit/php-token-stream/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..dbed93dfd64085ba26ec7b3fcb00e3c89f9b7df6
--- /dev/null
+++ b/core/vendor/phpunit/php-token-stream/README.md
@@ -0,0 +1,22 @@
+# PHP_TokenStream
+
+## Installation
+
+You can use [Composer](http://getcomposer.org/) or the [PEAR Installer](http://pear.php.net/manual/en/guide.users.commandline.cli.php) to download and install this package as well as its dependencies.
+
+### Composer
+
+To add this package as a local, per-project dependency to your project, simply add a dependency on `phpunit/php-token-stream` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHP_TokenStream:
+
+    {
+        "require": {
+            "phpunit/php-token-stream": "*"
+        }
+    }
+
+### PEAR Installer
+
+The following two commands (which you may have to run as `root`) are all that is required to install this package using the PEAR Installer:
+
+    pear config-set auto_discover 1
+    pear install pear.phpunit.de/PHP_TokenStream
diff --git a/core/vendor/phpunit/php-token-stream/Tests/Token/ClassTest.php b/core/vendor/phpunit/php-token-stream/Tests/Token/ClassTest.php
index 5dd6e997ec02053e29af24cbab9c577ce13e9422..c9ff246b49be431e6669bcffe063c95c9463245a 100644
--- a/core/vendor/phpunit/php-token-stream/Tests/Token/ClassTest.php
+++ b/core/vendor/phpunit/php-token-stream/Tests/Token/ClassTest.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHP_TokenStream
  * @subpackage Tests
  * @author     Laurent Laville <pear@laurent-laville.org>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since      File available since Release 1.0.2
  */
@@ -58,7 +58,7 @@
  * @package    PHP_TokenStream
  * @subpackage Tests
  * @author     Laurent Laville <pear@laurent-laville.org>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-token-stream/
@@ -119,4 +119,10 @@ public function testIssue19()
             }
         }
     }
+
+    public function testIssue30()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'issue30.php');
+        $this->assertCount(1, $ts->getClasses());
+    }
 }
diff --git a/core/vendor/phpunit/php-token-stream/Tests/Token/ClosureTest.php b/core/vendor/phpunit/php-token-stream/Tests/Token/ClosureTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e03dc6d0f0f3721219d810b185bbc8835972b9d
--- /dev/null
+++ b/core/vendor/phpunit/php-token-stream/Tests/Token/ClosureTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * php-token-stream
+ *
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @since      File available since Release 1.0.0
+ */
+
+if (!defined('TEST_FILES_PATH')) {
+    define(
+      'TEST_FILES_PATH',
+      dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR .
+      '_files' . DIRECTORY_SEPARATOR
+    );
+}
+
+require_once 'PHP/Token/Stream.php';
+
+/**
+ * Tests for the PHP_Token_FUNCTION class.
+ *
+ * @package    PHP_TokenStream
+ * @subpackage Tests
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/php-token-stream/
+ * @since      Class available since Release 1.0.0
+ */
+class PHP_Token_ClosureTest extends PHPUnit_Framework_TestCase
+{
+    protected $functions;
+
+    protected function setUp()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'closure.php');
+
+        foreach ($ts as $token) {
+            if ($token instanceof PHP_Token_FUNCTION) {
+                $this->functions[] = $token;
+            }
+        }
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getArguments
+     */
+    public function testGetArguments()
+    {
+        $this->assertEquals(array('$foo' => null, '$bar' => null), $this->functions[0]->getArguments());
+        $this->assertEquals(array('$foo' => 'Foo', '$bar' => null), $this->functions[1]->getArguments());
+        $this->assertEquals(array('$foo' => null, '$bar' => null, '$baz' => null), $this->functions[2]->getArguments());
+        $this->assertEquals(array('$foo' => 'Foo', '$bar' => null, '$baz' => null), $this->functions[3]->getArguments());
+        $this->assertEquals(array(), $this->functions[4]->getArguments());
+        $this->assertEquals(array(), $this->functions[5]->getArguments());
+    }
+
+    /**
+     * @covers PHP_Token_FUNCTION::getName
+     */
+    public function testGetName()
+    {
+        $this->assertEquals('anonymous function', $this->functions[0]->getName());
+        $this->assertEquals('anonymous function', $this->functions[1]->getName());
+        $this->assertEquals('anonymous function', $this->functions[2]->getName());
+        $this->assertEquals('anonymous function', $this->functions[3]->getName());
+        $this->assertEquals('anonymous function', $this->functions[4]->getName());
+        $this->assertEquals('anonymous function', $this->functions[5]->getName());
+    }
+
+    /**
+     * @covers PHP_Token::getLine
+     */
+    public function testGetLine()
+    {
+        $this->assertEquals(2, $this->functions[0]->getLine());
+        $this->assertEquals(3, $this->functions[1]->getLine());
+        $this->assertEquals(4, $this->functions[2]->getLine());
+        $this->assertEquals(5, $this->functions[3]->getLine());
+    }
+
+    /**
+     * @covers PHP_TokenWithScope::getEndLine
+     */
+    public function testGetEndLine()
+    {
+        $this->assertEquals(2, $this->functions[0]->getLine());
+        $this->assertEquals(3, $this->functions[1]->getLine());
+        $this->assertEquals(4, $this->functions[2]->getLine());
+        $this->assertEquals(5, $this->functions[3]->getLine());
+    }
+}
diff --git a/core/vendor/phpunit/php-token-stream/Tests/Token/FunctionTest.php b/core/vendor/phpunit/php-token-stream/Tests/Token/FunctionTest.php
index d57162b54dbb7324bbfd4441b0e3a38236740f7c..45d169c531225878726b858763a4d5015c855e84 100644
--- a/core/vendor/phpunit/php-token-stream/Tests/Token/FunctionTest.php
+++ b/core/vendor/phpunit/php-token-stream/Tests/Token/FunctionTest.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHP_TokenStream
  * @subpackage Tests
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since      File available since Release 1.0.0
  */
@@ -57,8 +57,8 @@
  *
  * @package    PHP_TokenStream
  * @subpackage Tests
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-token-stream/
@@ -99,6 +99,8 @@ public function testGetArguments()
         );
 
         $this->assertEquals(array(), $this->functions[4]->getArguments());
+
+        $this->assertEquals(array('$x' => null, '$y' => null), $this->functions[5]->getArguments());
     }
 
     /**
@@ -157,4 +159,32 @@ public function testGetDocblock()
         $this->assertNull($this->functions[3]->getDocblock());
         $this->assertNull($this->functions[4]->getDocblock());
     }
+
+    public function testSignature()
+    {
+        $ts = new PHP_Token_Stream(TEST_FILES_PATH . 'source5.php');
+        $f  = $ts->getFunctions();
+        $c  = $ts->getClasses();
+        $i  = $ts->getInterfaces();
+
+        $this->assertEquals(
+          'foo($a, array $b, array $c = array())',
+          $f['foo']['signature']
+        );
+
+        $this->assertEquals(
+          'm($a, array $b, array $c = array())',
+          $c['c']['methods']['m']['signature']
+        );
+
+        $this->assertEquals(
+          'm($a, array $b, array $c = array())',
+          $c['a']['methods']['m']['signature']
+        );
+
+        $this->assertEquals(
+          'm($a, array $b, array $c = array())',
+          $i['i']['methods']['m']['signature']
+        );
+    }
 }
diff --git a/core/vendor/phpunit/php-token-stream/Tests/Token/IncludeTest.php b/core/vendor/phpunit/php-token-stream/Tests/Token/IncludeTest.php
index 710be223e34222a21b213223b289e9b5c965388d..02e574e774e9e33b52c2e3804f2bc219ce2d8e08 100644
--- a/core/vendor/phpunit/php-token-stream/Tests/Token/IncludeTest.php
+++ b/core/vendor/phpunit/php-token-stream/Tests/Token/IncludeTest.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHP_TokenStream
  * @subpackage Tests
  * @author     Laurent Laville <pear@laurent-laville.org>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since      File available since Release 1.0.2
  */
@@ -59,7 +59,7 @@
  * @package    PHP_TokenStream
  * @subpackage Tests
  * @author     Laurent Laville <pear@laurent-laville.org>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-token-stream/
diff --git a/core/vendor/phpunit/php-token-stream/Tests/Token/InterfaceTest.php b/core/vendor/phpunit/php-token-stream/Tests/Token/InterfaceTest.php
index 1c689bf825072b6e59f245c53947ab45af0e0572..8ad7bc2441c2a17b3d0927a5310d5ef8bf6b673b 100644
--- a/core/vendor/phpunit/php-token-stream/Tests/Token/InterfaceTest.php
+++ b/core/vendor/phpunit/php-token-stream/Tests/Token/InterfaceTest.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,9 +36,9 @@
  *
  * @package    PHP_TokenStream
  * @subpackage Tests
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Laurent Laville <pear@laurent-laville.org>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since      File available since Release 1.0.0
  */
@@ -58,9 +58,9 @@
  *
  * @package    PHP_TokenStream
  * @subpackage Tests
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Laurent Laville <pear@laurent-laville.org>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-token-stream/
diff --git a/core/vendor/phpunit/php-token-stream/Tests/Token/NamespaceTest.php b/core/vendor/phpunit/php-token-stream/Tests/Token/NamespaceTest.php
index bc0dbcb32d89193ae353a70657e9941d72beb750..0f3ef82159953ba3d39604a7cd52f831544aaa02 100644
--- a/core/vendor/phpunit/php-token-stream/Tests/Token/NamespaceTest.php
+++ b/core/vendor/phpunit/php-token-stream/Tests/Token/NamespaceTest.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHP_TokenStream
  * @subpackage Tests
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since      File available since Release 1.0.0
  */
@@ -57,8 +57,8 @@
  *
  * @package    PHP_TokenStream
  * @subpackage Tests
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-token-stream/
diff --git a/core/vendor/phpunit/php-token-stream/Tests/TokenTest.php b/core/vendor/phpunit/php-token-stream/Tests/TokenTest.php
index 60cd0c7d9961f69ba1b20335fab35af7b794d7e1..57fd57cac461f26abdac41d635bb41799265e099 100644
--- a/core/vendor/phpunit/php-token-stream/Tests/TokenTest.php
+++ b/core/vendor/phpunit/php-token-stream/Tests/TokenTest.php
@@ -2,7 +2,7 @@
 /**
  * php-token-stream
  *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2009-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHP_TokenStream
  * @subpackage Tests
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @since      File available since Release 1.0.0
  */
@@ -56,8 +56,8 @@
  *
  * @package    PHP_TokenStream
  * @subpackage Tests
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2009-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/php-token-stream/
diff --git a/core/vendor/phpunit/php-token-stream/Tests/_files/closure.php b/core/vendor/phpunit/php-token-stream/Tests/_files/closure.php
new file mode 100644
index 0000000000000000000000000000000000000000..a0e3a81d649dae3462a99c1c268c78ff6aaccdc3
--- /dev/null
+++ b/core/vendor/phpunit/php-token-stream/Tests/_files/closure.php
@@ -0,0 +1,7 @@
+<?php
+$function1 = function($foo, $bar) use ($var) {};
+$function2 = function(Foo $foo, $bar) use ($var) {};
+$function3 = function ($foo, $bar, $baz) {};
+$function4 = function (Foo $foo, $bar, $baz) {};
+$function5 = function () {};
+$function6 = function() {};
diff --git a/core/vendor/phpunit/php-token-stream/Tests/_files/issue30.php b/core/vendor/phpunit/php-token-stream/Tests/_files/issue30.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d1f6f354ae4d4cb9c12ccbe01f51da0970dc059
--- /dev/null
+++ b/core/vendor/phpunit/php-token-stream/Tests/_files/issue30.php
@@ -0,0 +1,8 @@
+<?php
+class Foo
+{
+    public function bar()
+    {
+        return Foo::CLASS;
+    }
+}
diff --git a/core/vendor/phpunit/php-token-stream/Tests/_files/source.php b/core/vendor/phpunit/php-token-stream/Tests/_files/source.php
index 3c8c1a2da99c45f83fbdd9144e3e232d517941b8..0c9b87f65f8988ecba85538d0416cbed294579d0 100644
--- a/core/vendor/phpunit/php-token-stream/Tests/_files/source.php
+++ b/core/vendor/phpunit/php-token-stream/Tests/_files/source.php
@@ -29,4 +29,8 @@ public function barfoo(Barfoo $barfoo)
     public function baz()
     {
     }
+
+    public function blaz($x, $y)
+    {
+    }
 }
diff --git a/core/vendor/phpunit/php-token-stream/Tests/_files/source5.php b/core/vendor/phpunit/php-token-stream/Tests/_files/source5.php
new file mode 100644
index 0000000000000000000000000000000000000000..ef7d47462e35ca3af44a64dc3d5221407c5ee55b
--- /dev/null
+++ b/core/vendor/phpunit/php-token-stream/Tests/_files/source5.php
@@ -0,0 +1,5 @@
+<?php
+function foo($a, array $b, array $c = array()) {}
+interface i { public function m($a, array $b, array $c = array()); }
+abstract class a { abstract public function m($a, array $b, array $c = array()); }
+class c { public function m($a, array $b, array $c = array()) {} }
diff --git a/core/vendor/phpunit/php-token-stream/composer.json b/core/vendor/phpunit/php-token-stream/composer.json
index d67c03473949c9b76ffe82679ecdb6679adfda77..6cd2e1be50f30a6ddf13859d379080a85e1ba10d 100644
--- a/core/vendor/phpunit/php-token-stream/composer.json
+++ b/core/vendor/phpunit/php-token-stream/composer.json
@@ -5,7 +5,7 @@
     "keywords": [
         "tokenizer"
     ],
-    "homepage": "http://www.phpunit.de/",
+    "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
     "license": "BSD-3-Clause",
     "authors": [
         {
@@ -29,5 +29,10 @@
     },
     "include-path": [
         ""
-    ]
+    ],
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.2-dev"
+        }
+    }
 }
diff --git a/core/vendor/phpunit/php-token-stream/package-composer.json b/core/vendor/phpunit/php-token-stream/package-composer.json
deleted file mode 100644
index a42eb94440c2f5a6d807156334187bad4eac4e8e..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/php-token-stream/package-composer.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "name": "phpunit/php-token-stream",
-    "keywords": [ "tokenizer" ],
-    "license": "BSD-3-Clause",
-    "homepage": "http://www.phpunit.de/",
-    "dependency_map": { },
-    "support": {
-        "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-        "irc": "irc://irc.freenode.net/phpunit"
-    },
-    "autoload": {
-        "classmap": [ "PHP/" ]
-    },
-    "include_path": [
-        ""
-    ],
-    "version": false,
-    "time": false
-}
\ No newline at end of file
diff --git a/core/vendor/phpunit/php-token-stream/package.xml b/core/vendor/phpunit/php-token-stream/package.xml
index d2f758d2156aa358eb7217919cb6f38b0996a123..820638ad0f8b8127c7f8d157a4271bc79ce5a2f9 100644
--- a/core/vendor/phpunit/php-token-stream/package.xml
+++ b/core/vendor/phpunit/php-token-stream/package.xml
@@ -17,10 +17,10 @@
   <email>sb@sebastian-bergmann.de</email>
   <active>yes</active>
  </lead>
- <date>2012-10-05</date>
+ <date>2014-03-03</date>
  <version>
-  <release>1.1.5</release>
-  <api>1.1.0</api>
+  <release>1.2.2</release>
+  <api>1.2.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -48,9 +48,8 @@
      <tasks:replace from="@package_version@" to="version" type="package-info" />
     </file>
    </dir>
-   <file baseinstalldir="/" name="ChangeLog.markdown" role="doc"/>
    <file baseinstalldir="/" name="LICENSE" role="doc"/>
-   <file baseinstalldir="/" name="README.markdown" role="doc"/>
+   <file baseinstalldir="/" name="README.md" role="doc"/>
   </dir>
  </contents>
  <dependencies>
diff --git a/core/vendor/phpunit/phpunit-mock-objects/.gitignore b/core/vendor/phpunit/phpunit-mock-objects/.gitignore
index a7419836bf19bf28f558ae6c09b23860536ccb23..b17f73fd53436362694c36b86095c7fb4f98f465 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/.gitignore
+++ b/core/vendor/phpunit/phpunit-mock-objects/.gitignore
@@ -1,7 +1,8 @@
-build/api
-build/code-browser
 build/coverage
 build/logs
-build/pdepend
 cache.properties
 phpunit.xml
+/vendor
+/composer.lock
+/composer.phar
+/.idea
diff --git a/core/vendor/phpunit/phpunit-mock-objects/.travis.yml b/core/vendor/phpunit/phpunit-mock-objects/.travis.yml
index a419159bfd4e0368fd4a9ce917e6fe79d0a8ed28..b6a76ecd22ec0654554a4658be11f70aecdd51fe 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/.travis.yml
+++ b/core/vendor/phpunit/phpunit-mock-objects/.travis.yml
@@ -1,22 +1,29 @@
 language: php
 
-php:
-    - 5.3
-    - 5.4
-
 before_script:
-    - mkdir -p vendor
-    - git clone --branch=3.7 --depth=100 --quiet git://github.com/sebastianbergmann/phpunit.git vendor/phpunit
-    - git clone --branch=1.2 --depth=100 --quiet git://github.com/sebastianbergmann/php-code-coverage.git vendor/php-code-coverage
-    - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-text-template.git vendor/php-text-template
-    - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-token-stream.git vendor/php-token-stream
-    - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-file-iterator.git vendor/php-file-iterator
-    - git clone --branch=master --depth=100 --quiet git://github.com/sebastianbergmann/php-timer.git vendor/php-timer
-    - git clone --branch=master --depth=100 --quiet git://github.com/pear/pear-core.git vendor/pear-core
-    - git clone --branch=trunk --depth=100 --quiet git://github.com/pear/Console_Getopt.git vendor/console-getopt
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
+script: ./vendor/bin/phpunit --configuration ./build/travis-ci.xml
 
-script: php -d include_path=vendor/php-text-template:vendor/php-token-stream:vendor/php-file-iterator:vendor/phpunit:vendor/php-code-coverage:vendor/php-timer:vendor/php-invoker:vendor/pear-core:vendor/console-getopt:vendor:. ./vendor/phpunit/phpunit.php --configuration ./build/travis-ci.xml
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
 
 notifications:
   email: false
-  irc: "irc.freenode.org#phpunit"
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+    on_success: always
+    on_failure: always
+    on_start: false
+
diff --git a/core/vendor/phpunit/phpunit-mock-objects/ChangeLog.markdown b/core/vendor/phpunit/phpunit-mock-objects/ChangeLog.markdown
deleted file mode 100644
index fc576e599e63ac9b0a90360eb409ef3b58fa5ff9..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/ChangeLog.markdown
+++ /dev/null
@@ -1,27 +0,0 @@
-PHPUnit_MockObject 1.2
-======================
-
-This is the list of changes for the PHPUnit_MockObject 1.2 release series.
-
-PHPUnit_MockObject 1.2.3
-------------------------
-
-* Fixed a bug where getting two mocks with different argument cloning options returned the same mock.
-
-PHPUnit_MockObject 1.2.2
-------------------------
-
-* Fixed #100: Removed the unique mock object ID introduced in version 1.2.
-
-PHPUnit_MockObject 1.2.1
-------------------------
-
-* No changes.
-
-PHPUnit_MockObject 1.2.0
-------------------------
-
-* Implemented #47: Make cloning of arguments passed to mocked methods optional.
-* Implemented #84: `getMockFromWsdl()` now works with namespaces.
-* Fixed #90: Mocks with a fixed class name could only be created once.
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/LICENSE b/core/vendor/phpunit/phpunit-mock-objects/LICENSE
index 830850c38e7ee3b7a0cdcb9e744baf5f60b9567d..6c7e93b14fb12d3dbea4a91bb370d4fd0e7ca1cc 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/LICENSE
+++ b/core/vendor/phpunit/phpunit-mock-objects/LICENSE
@@ -1,6 +1,6 @@
 PHPUnit_MockObject
 
-Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2002-2014, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Autoload.php b/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Autoload.php
deleted file mode 100644
index 296a1aca7a594a883d5c2e67a1eb3f707cd848e0..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Autoload.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      File available since Release 1.1.0
- */
-
-spl_autoload_register(
-  function ($class)
-  {
-      static $classes = NULL;
-      static $path = NULL;
-
-      if ($classes === NULL) {
-          $classes = array(
-            'phpunit_framework_mockobject_builder_identity' => '/Framework/MockObject/Builder/Identity.php',
-            'phpunit_framework_mockobject_builder_invocationmocker' => '/Framework/MockObject/Builder/InvocationMocker.php',
-            'phpunit_framework_mockobject_builder_match' => '/Framework/MockObject/Builder/Match.php',
-            'phpunit_framework_mockobject_builder_methodnamematch' => '/Framework/MockObject/Builder/MethodNameMatch.php',
-            'phpunit_framework_mockobject_builder_namespace' => '/Framework/MockObject/Builder/Namespace.php',
-            'phpunit_framework_mockobject_builder_parametersmatch' => '/Framework/MockObject/Builder/ParametersMatch.php',
-            'phpunit_framework_mockobject_builder_stub' => '/Framework/MockObject/Builder/Stub.php',
-            'phpunit_framework_mockobject_generator' => '/Framework/MockObject/Generator.php',
-            'phpunit_framework_mockobject_invocation' => '/Framework/MockObject/Invocation.php',
-            'phpunit_framework_mockobject_invocation_object' => '/Framework/MockObject/Invocation/Object.php',
-            'phpunit_framework_mockobject_invocation_static' => '/Framework/MockObject/Invocation/Static.php',
-            'phpunit_framework_mockobject_invocationmocker' => '/Framework/MockObject/InvocationMocker.php',
-            'phpunit_framework_mockobject_invokable' => '/Framework/MockObject/Invokable.php',
-            'phpunit_framework_mockobject_matcher' => '/Framework/MockObject/Matcher.php',
-            'phpunit_framework_mockobject_matcher_anyinvokedcount' => '/Framework/MockObject/Matcher/AnyInvokedCount.php',
-            'phpunit_framework_mockobject_matcher_anyparameters' => '/Framework/MockObject/Matcher/AnyParameters.php',
-            'phpunit_framework_mockobject_matcher_invocation' => '/Framework/MockObject/Matcher/Invocation.php',
-            'phpunit_framework_mockobject_matcher_invokedatindex' => '/Framework/MockObject/Matcher/InvokedAtIndex.php',
-            'phpunit_framework_mockobject_matcher_invokedatleastonce' => '/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
-            'phpunit_framework_mockobject_matcher_invokedcount' => '/Framework/MockObject/Matcher/InvokedCount.php',
-            'phpunit_framework_mockobject_matcher_invokedrecorder' => '/Framework/MockObject/Matcher/InvokedRecorder.php',
-            'phpunit_framework_mockobject_matcher_methodname' => '/Framework/MockObject/Matcher/MethodName.php',
-            'phpunit_framework_mockobject_matcher_parameters' => '/Framework/MockObject/Matcher/Parameters.php',
-            'phpunit_framework_mockobject_matcher_statelessinvocation' => '/Framework/MockObject/Matcher/StatelessInvocation.php',
-            'phpunit_framework_mockobject_mockbuilder' => '/Framework/MockObject/MockBuilder.php',
-            'phpunit_framework_mockobject_mockobject' => '/Framework/MockObject/MockObject.php',
-            'phpunit_framework_mockobject_stub' => '/Framework/MockObject/Stub.php',
-            'phpunit_framework_mockobject_stub_consecutivecalls' => '/Framework/MockObject/Stub/ConsecutiveCalls.php',
-            'phpunit_framework_mockobject_stub_exception' => '/Framework/MockObject/Stub/Exception.php',
-            'phpunit_framework_mockobject_stub_matchercollection' => '/Framework/MockObject/Stub/MatcherCollection.php',
-            'phpunit_framework_mockobject_stub_return' => '/Framework/MockObject/Stub/Return.php',
-            'phpunit_framework_mockobject_stub_returnargument' => '/Framework/MockObject/Stub/ReturnArgument.php',
-            'phpunit_framework_mockobject_stub_returncallback' => '/Framework/MockObject/Stub/ReturnCallback.php',
-            'phpunit_framework_mockobject_stub_returnself' => '/Framework/MockObject/Stub/ReturnSelf.php',
-            'phpunit_framework_mockobject_stub_returnvaluemap' => '/Framework/MockObject/Stub/ReturnValueMap.php',
-            'phpunit_framework_mockobject_verifiable' => '/Framework/MockObject/Verifiable.php'
-          );
-
-          $path = dirname(dirname(dirname(__FILE__)));
-      }
-
-      $cn = strtolower($class);
-
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
-);
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php b/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php
deleted file mode 100644
index b5af44db160b18556e4542bb2cb5213c386d93f2..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator.php
+++ /dev/null
@@ -1,808 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      File available since Release 1.0.0
- */
-
-/**
- * Mock Object Code Generator
- *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @version    Release: @package_version@
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      Class available since Release 1.0.0
- */
-class PHPUnit_Framework_MockObject_Generator
-{
-    /**
-     * @var array
-     */
-    protected static $cache = array();
-
-    /**
-     * @var array
-     */
-    protected static $blacklistedMethodNames = array(
-      '__clone' => TRUE,
-      'abstract' => TRUE,
-      'and' => TRUE,
-      'array' => TRUE,
-      'as' => TRUE,
-      'break' => TRUE,
-      'case' => TRUE,
-      'catch' => TRUE,
-      'class' => TRUE,
-      'clone' => TRUE,
-      'const' => TRUE,
-      'continue' => TRUE,
-      'declare' => TRUE,
-      'default' => TRUE,
-      'die' => TRUE,
-      'do' => TRUE,
-      'echo' => TRUE,
-      'else' => TRUE,
-      'elseif' => TRUE,
-      'empty' => TRUE,
-      'enddeclare' => TRUE,
-      'endfor' => TRUE,
-      'endforeach' => TRUE,
-      'endif' => TRUE,
-      'endswitch' => TRUE,
-      'endwhile' => TRUE,
-      'eval' => TRUE,
-      'exit' => TRUE,
-      'expects' => TRUE,
-      'extends' => TRUE,
-      'final' => TRUE,
-      'for' => TRUE,
-      'foreach' => TRUE,
-      'function' => TRUE,
-      'global' => TRUE,
-      'goto' => TRUE,
-      'if' => TRUE,
-      'implements' => TRUE,
-      'include' => TRUE,
-      'include_once' => TRUE,
-      'instanceof' => TRUE,
-      'interface' => TRUE,
-      'isset' => TRUE,
-      'list' => TRUE,
-      'namespace' => TRUE,
-      'new' => TRUE,
-      'or' => TRUE,
-      'print' => TRUE,
-      'private' => TRUE,
-      'protected' => TRUE,
-      'public' => TRUE,
-      'require' => TRUE,
-      'require_once' => TRUE,
-      'return' => TRUE,
-      'static' => TRUE,
-      'staticExpects' => TRUE,
-      'switch' => TRUE,
-      'throw' => TRUE,
-      'try' => TRUE,
-      'unset' => TRUE,
-      'use' => TRUE,
-      'var' => TRUE,
-      'while' => TRUE,
-      'xor' => TRUE
-    );
-
-    /**
-     * @var boolean
-     */
-    protected static $soapLoaded = NULL;
-
-    /**
-     * Returns a mock object for the specified class.
-     *
-     * @param  string  $originalClassName
-     * @param  array   $methods
-     * @param  array   $arguments
-     * @param  string  $mockClassName
-     * @param  boolean $callOriginalConstructor
-     * @param  boolean $callOriginalClone
-     * @param  boolean $callAutoload
-     * @param  boolean $cloneArguments
-     * @return object
-     * @throws InvalidArgumentException
-     * @since  Method available since Release 1.0.0
-     */
-    public static function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE)
-    {
-        if (!is_string($originalClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($mockClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(4, 'string');
-        }
-
-        if (!is_array($methods) && !is_null($methods)) {
-            throw new InvalidArgumentException;
-        }
-
-        if (NULL !== $methods) {
-            foreach ($methods as $method) {
-                if (!preg_match('~[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*~', $method)) {
-                    throw new PHPUnit_Framework_Exception(
-                      sprintf(
-                        'Cannot stub or mock method with invalid name "%s"',
-                        $method
-                      )
-                    );
-                }
-            }
-            if ($methods != array_unique($methods)) {
-                throw new PHPUnit_Framework_Exception(
-                  sprintf(
-                    'Cannot stub or mock using a method list that contains duplicates: "%s"',
-                    implode(', ', $methods)
-                  )
-                );
-            }
-        }
-
-        if ($mockClassName != '' && class_exists($mockClassName, FALSE)) {
-            $reflect = new ReflectionClass($mockClassName);
-            if (!$reflect->implementsInterface("PHPUnit_Framework_MockObject_MockObject")) {
-                throw new PHPUnit_Framework_Exception(
-                  sprintf(
-                    'Class "%s" already exists.',
-                    $mockClassName
-                  )
-                );
-            }
-        }
-
-        $mock = self::generate(
-          $originalClassName,
-          $methods,
-          $mockClassName,
-          $callOriginalClone,
-          $callAutoload,
-          $cloneArguments
-        );
-
-        return self::getObject(
-          $mock['code'],
-          $mock['mockClassName'],
-          $originalClassName,
-          $callOriginalConstructor,
-          $callAutoload,
-          $arguments
-        );
-    }
-
-    /**
-     * @param  string $code
-     * @param  string $className
-     * @param  string $originalClassName
-     * @param  string $callOriginalConstructor
-     * @param  string $callAutoload
-     * @param  array  $arguments
-     * @return object
-     */
-    protected static function getObject($code, $className, $originalClassName = '', $callOriginalConstructor = FALSE, $callAutoload = FALSE, array $arguments = array())
-    {
-        if (!class_exists($className, FALSE)) {
-            eval($code);
-        }
-
-        if ($callOriginalConstructor &&
-            !interface_exists($originalClassName, $callAutoload)) {
-            if (count($arguments) == 0) {
-                $object = new $className;
-            } else {
-                $class = new ReflectionClass($className);
-                $object = $class->newInstanceArgs($arguments);
-            }
-        } else {
-            // Use a trick to create a new object of a class
-            // without invoking its constructor.
-            $object = unserialize(
-              sprintf('O:%d:"%s":0:{}', strlen($className), $className)
-            );
-        }
-
-        return $object;
-    }
-
-    /**
-     * Returns a mock object for the specified abstract class with all abstract
-     * methods of the class mocked. Concrete methods to mock can be specified with
-     * the last parameter
-     *
-     * @param  string  $originalClassName
-     * @param  array   $arguments
-     * @param  string  $mockClassName
-     * @param  boolean $callOriginalConstructor
-     * @param  boolean $callOriginalClone
-     * @param  boolean $callAutoload
-     * @param  array   $mockedMethods
-     * @param  boolean $cloneArguments
-     * @return object
-     * @since  Method available since Release 1.0.0
-     * @throws InvalidArgumentException
-     */
-    public static function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $mockedMethods = array(), $cloneArguments = TRUE)
-    {
-        if (!is_string($originalClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($mockClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
-        }
-
-        if (class_exists($originalClassName, $callAutoload) ||
-            interface_exists($originalClassName, $callAutoload)) {
-            $methods   = array();
-            $reflector = new ReflectionClass($originalClassName);
-
-            foreach ($reflector->getMethods() as $method) {
-                if ($method->isAbstract() || in_array($method->getName(), $mockedMethods)) {
-                    $methods[] = $method->getName();
-                }
-            }
-
-            if (empty($methods)) {
-                $methods = NULL;
-            }
-
-            return self::getMock(
-              $originalClassName,
-              $methods,
-              $arguments,
-              $mockClassName,
-              $callOriginalConstructor,
-              $callOriginalClone,
-              $callAutoload,
-              $cloneArguments
-            );
-        } else {
-            throw new PHPUnit_Framework_Exception(
-              sprintf(
-                'Class "%s" does not exist.',
-                $originalClassName
-              )
-            );
-        }
-    }
-
-    /**
-     * Returns an object for the specified trait.
-     *
-     * @param  string  $traitName
-     * @param  array   $arguments
-     * @param  string  $traitClassName
-     * @param  boolean $callOriginalConstructor
-     * @param  boolean $callOriginalClone
-     * @param  boolean $callAutoload
-     * @return object
-     * @since  Method available since Release 1.1.0
-     * @throws InvalidArgumentException
-     */
-    public static function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE)
-    {
-        if (!is_string($traitName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_string($traitClassName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
-        }
-
-        if (!trait_exists($traitName, $callAutoload)) {
-            throw new PHPUnit_Framework_Exception(
-              sprintf(
-                'Trait "%s" does not exist.',
-                $traitName
-              )
-            );
-        }
-
-        $className = self::generateClassName(
-          $traitName, $traitClassName, 'Trait_'
-        );
-
-        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
-                         DIRECTORY_SEPARATOR;
-        $classTemplate = new Text_Template(
-                           $templateDir . 'trait_class.tpl'
-                         );
-
-        $classTemplate->setVar(
-          array(
-            'class_name' => $className['className'],
-            'trait_name' => $traitName
-          )
-        );
-
-        return self::getObject(
-          $classTemplate->render(),
-          $className['className']
-        );
-    }
-
-    /**
-     * @param  string  $originalClassName
-     * @param  array   $methods
-     * @param  string  $mockClassName
-     * @param  boolean $callOriginalClone
-     * @param  boolean $callAutoload
-     * @param  boolean $cloneArguments
-     * @return array
-     */
-    public static function generate($originalClassName, array $methods = NULL, $mockClassName = '', $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE)
-    {
-        if ($mockClassName == '') {
-            $key = md5(
-              $originalClassName .
-              serialize($methods) .
-              serialize($callOriginalClone) .
-              serialize($cloneArguments)
-            );
-
-            if (isset(self::$cache[$key])) {
-                return self::$cache[$key];
-            }
-        }
-
-        $mock = self::generateMock(
-          $originalClassName,
-          $methods,
-          $mockClassName,
-          $callOriginalClone,
-          $callAutoload,
-          $cloneArguments
-        );
-
-        if (isset($key)) {
-            self::$cache[$key] = $mock;
-        }
-
-        return $mock;
-    }
-
-    /**
-     * @param  string $wsdlFile
-     * @param  string $originalClassName
-     * @param  array  $methods
-     * @param  array  $options
-     * @return array
-     */
-    public static function generateClassFromWsdl($wsdlFile, $originalClassName, array $methods = array(), array $options = array())
-    {
-        if (self::$soapLoaded === NULL) {
-            self::$soapLoaded = extension_loaded('soap');
-        }
-
-        if (self::$soapLoaded) {
-            $client   = new SOAPClient($wsdlFile, $options);
-            $_methods = array_unique($client->__getFunctions());
-            unset($client);
-
-            $templateDir    = dirname(__FILE__) . DIRECTORY_SEPARATOR .
-                              'Generator' . DIRECTORY_SEPARATOR;
-            $methodTemplate = new Text_Template(
-                                $templateDir . 'wsdl_method.tpl'
-                              );
-            $methodsBuffer  = '';
-
-            foreach ($_methods as $method) {
-                $nameStart = strpos($method, ' ') + 1;
-                $nameEnd   = strpos($method, '(');
-                $name      = substr($method, $nameStart, $nameEnd - $nameStart);
-
-                if (empty($methods) || in_array($name, $methods)) {
-                    $args    = explode(
-                                 ',',
-                                 substr(
-                                   $method,
-                                   $nameEnd + 1,
-                                   strpos($method, ')') - $nameEnd - 1
-                                 )
-                               );
-                    $numArgs = count($args);
-
-                    for ($i = 0; $i < $numArgs; $i++) {
-                        $args[$i] = substr($args[$i], strpos($args[$i], '$'));
-                    }
-
-                    $methodTemplate->setVar(
-                      array(
-                        'method_name' => $name,
-                        'arguments'   => join(', ', $args)
-                      )
-                    );
-
-                    $methodsBuffer .= $methodTemplate->render();
-                }
-            }
-
-            $optionsBuffer = 'array(';
-            foreach ($options as $key => $value) {
-                $optionsBuffer .= $key . ' => ' . $value;
-            }
-
-            $optionsBuffer .= ')';
-
-            $classTemplate = new Text_Template(
-              $templateDir . 'wsdl_class.tpl'
-            );
-
-            $namespace = '';
-            if(strpos($originalClassName, '\\') !== FALSE) {
-                $parts = explode('\\', $originalClassName);
-                $originalClassName = array_pop($parts);
-                $namespace = 'namespace ' . join('\\', $parts) . ';';
-            }
-
-            $classTemplate->setVar(
-              array(
-                'namespace'  => $namespace,
-                'class_name' => $originalClassName,
-                'wsdl'       => $wsdlFile,
-                'options'    => $optionsBuffer,
-                'methods'    => $methodsBuffer
-              )
-            );
-
-            return $classTemplate->render();
-        } else {
-            throw new PHPUnit_Framework_Exception(
-              'The SOAP extension is required to generate a mock object ' .
-              'from WSDL.'
-            );
-        }
-    }
-
-    /**
-     * @param  string     $originalClassName
-     * @param  array|null $methods
-     * @param  string     $mockClassName
-     * @param  boolean    $callOriginalClone
-     * @param  boolean    $callAutoload
-     * @param  boolean    $cloneArguments
-     * @return array
-     */
-    protected static function generateMock($originalClassName, $methods, $mockClassName, $callOriginalClone, $callAutoload, $cloneArguments = TRUE)
-    {
-        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
-                         DIRECTORY_SEPARATOR;
-        $classTemplate = new Text_Template(
-                           $templateDir . 'mocked_class.tpl'
-                         );
-        $cloneTemplate = '';
-        $isClass       = FALSE;
-        $isInterface   = FALSE;
-
-        $mockClassName = self::generateClassName(
-          $originalClassName, $mockClassName, 'Mock_'
-        );
-
-        if (class_exists($mockClassName['fullClassName'], $callAutoload)) {
-            $isClass = TRUE;
-        } else {
-            if (interface_exists($mockClassName['fullClassName'], $callAutoload)) {
-                $isInterface = TRUE;
-            }
-        }
-
-        if (!class_exists($mockClassName['fullClassName'], $callAutoload) &&
-            !interface_exists($mockClassName['fullClassName'], $callAutoload)) {
-            $prologue = 'class ' . $mockClassName['originalClassName'] . "\n{\n}\n\n";
-
-            if (!empty($mockClassName['namespaceName'])) {
-                $prologue = 'namespace ' . $mockClassName['namespaceName'] .
-                            " {\n\n" . $prologue . "}\n\n" .
-                            "namespace {\n\n";
-
-                $epilogue = "\n\n}";
-            }
-
-            $cloneTemplate = new Text_Template(
-              $templateDir . 'mocked_clone.tpl'
-            );
-        } else {
-            $class = new ReflectionClass($mockClassName['fullClassName']);
-
-            if ($class->isFinal()) {
-                throw new PHPUnit_Framework_Exception(
-                  sprintf(
-                    'Class "%s" is declared "final" and cannot be mocked.',
-                    $mockClassName['fullClassName']
-                  )
-                );
-            }
-
-            if ($class->hasMethod('__clone')) {
-                $cloneMethod = $class->getMethod('__clone');
-
-                if (!$cloneMethod->isFinal()) {
-                    if ($callOriginalClone && !$isInterface) {
-                        $cloneTemplate = new Text_Template(
-                          $templateDir . 'unmocked_clone.tpl'
-                        );
-                    } else {
-                        $cloneTemplate = new Text_Template(
-                          $templateDir . 'mocked_clone.tpl'
-                        );
-                    }
-                }
-            } else {
-                $cloneTemplate = new Text_Template(
-                  $templateDir . 'mocked_clone.tpl'
-                );
-            }
-        }
-
-        if (is_object($cloneTemplate)) {
-            $cloneTemplate = $cloneTemplate->render();
-        }
-
-        if (is_array($methods) && empty($methods) &&
-            ($isClass || $isInterface)) {
-            $methods = get_class_methods($mockClassName['fullClassName']);
-        }
-
-        if (!is_array($methods)) {
-            $methods = array();
-        }
-
-        $mockedMethods = '';
-
-        if (isset($class)) {
-            foreach ($methods as $methodName) {
-                try {
-                    $method = $class->getMethod($methodName);
-
-                    if (self::canMockMethod($method)) {
-                        $mockedMethods .= self::generateMockedMethodDefinitionFromExisting(
-                          $templateDir, $method, $cloneArguments
-                        );
-                    }
-                }
-
-                catch (ReflectionException $e) {
-                    $mockedMethods .= self::generateMockedMethodDefinition(
-                      $templateDir, $mockClassName['fullClassName'], $methodName, $cloneArguments
-                    );
-                }
-            }
-        } else {
-            foreach ($methods as $methodName) {
-                $mockedMethods .= self::generateMockedMethodDefinition(
-                  $templateDir, $mockClassName['fullClassName'], $methodName, $cloneArguments
-                );
-            }
-        }
-
-        $classTemplate->setVar(
-          array(
-            'prologue'          => isset($prologue) ? $prologue : '',
-            'epilogue'          => isset($epilogue) ? $epilogue : '',
-            'class_declaration' => self::generateMockClassDeclaration(
-                                     $mockClassName, $isInterface
-                                   ),
-            'clone'             => $cloneTemplate,
-            'mock_class_name'   => $mockClassName['className'],
-            'mocked_methods'    => $mockedMethods
-          )
-        );
-
-        return array(
-          'code'          => $classTemplate->render(),
-          'mockClassName' => $mockClassName['className']
-        );
-    }
-
-    /**
-     * @param  string $originalClassName
-     * @param  string $className
-     * @param  string $prefix
-     * @return array
-     */
-    protected static function generateClassName($originalClassName, $className, $prefix)
-    {
-        if ($originalClassName[0] == '\\') {
-            $originalClassName = substr($originalClassName, 1);
-        }
-
-        $classNameParts = explode('\\', $originalClassName);
-
-        if (count($classNameParts) > 1) {
-            $originalClassName = array_pop($classNameParts);
-            $namespaceName     = join('\\', $classNameParts);
-            $fullClassName     = $namespaceName . '\\' . $originalClassName;
-        } else {
-            $namespaceName = '';
-            $fullClassName = $originalClassName;
-        }
-
-        if ($className == '') {
-            do {
-                $className = $prefix . $originalClassName . '_' .
-                             substr(md5(microtime()), 0, 8);
-            }
-            while (class_exists($className, FALSE));
-        }
-
-        return array(
-          'className'         => $className,
-          'originalClassName' => $originalClassName,
-          'fullClassName'     => $fullClassName,
-          'namespaceName'     => $namespaceName
-        );
-    }
-
-    /**
-     * @param  array   $mockClassName
-     * @param  boolean $isInterface
-     * @return array
-     */
-    protected static function generateMockClassDeclaration(array $mockClassName, $isInterface)
-    {
-        $buffer = 'class ';
-
-        if ($isInterface) {
-            $buffer .= sprintf(
-              "%s implements PHPUnit_Framework_MockObject_MockObject, %s%s",
-              $mockClassName['className'],
-              !empty($mockClassName['namespaceName']) ? $mockClassName['namespaceName'] . '\\' : '',
-              $mockClassName['originalClassName']
-            );
-        } else {
-            $buffer .= sprintf(
-              "%s extends %s%s implements PHPUnit_Framework_MockObject_MockObject",
-              $mockClassName['className'],
-              !empty($mockClassName['namespaceName']) ? $mockClassName['namespaceName'] . '\\' : '',
-              $mockClassName['originalClassName']
-            );
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * @param  string           $templateDir
-     * @param  ReflectionMethod $method
-     * @param  boolean          $cloneArguments
-     * @return string
-     */
-    protected static function generateMockedMethodDefinitionFromExisting($templateDir, ReflectionMethod $method, $cloneArguments = TRUE)
-    {
-        if ($method->isPrivate()) {
-            $modifier = 'private';
-        }
-
-        else if ($method->isProtected()) {
-            $modifier = 'protected';
-        }
-
-        else {
-            $modifier = 'public';
-        }
-
-        if ($method->isStatic()) {
-            $static = TRUE;
-        } else {
-            $static = FALSE;
-        }
-
-        if ($method->returnsReference()) {
-            $reference = '&';
-        } else {
-            $reference = '';
-        }
-
-        return self::generateMockedMethodDefinition(
-          $templateDir,
-          $method->getDeclaringClass()->getName(),
-          $method->getName(),
-          $cloneArguments,
-          $modifier,
-          PHPUnit_Util_Class::getMethodParameters($method),
-          PHPUnit_Util_Class::getMethodParameters($method, TRUE),
-          $reference,
-          $static
-        );
-    }
-
-    /**
-     * @param  string  $templateDir
-     * @param  string  $className
-     * @param  string  $methodName
-     * @param  boolean $cloneArguments
-     * @param  string  $modifier
-     * @param  string  $arguments_decl
-     * @param  string  $arguments_call
-     * @param  string  $reference
-     * @param  boolean $static
-     * @return string
-     */
-    protected static function generateMockedMethodDefinition($templateDir, $className, $methodName, $cloneArguments = TRUE, $modifier = 'public', $arguments_decl = '', $arguments_call = '', $reference = '', $static = FALSE)
-    {
-        if ($static) {
-            $template = new Text_Template(
-              $templateDir . 'mocked_static_method.tpl'
-            );
-        } else {
-            $template = new Text_Template(
-              $templateDir . 'mocked_object_method.tpl'
-            );
-        }
-
-        $template->setVar(
-          array(
-            'arguments_decl'  => $arguments_decl,
-            'arguments_call'  => $arguments_call,
-            'arguments_count' => !empty($arguments_call) ? count(explode(',', $arguments_call)) : 0,
-            'class_name'      => $className,
-            'method_name'     => $methodName,
-            'modifier'        => $modifier,
-            'reference'       => $reference,
-            'clone_arguments' => $cloneArguments ? 'TRUE' : 'FALSE'
-          )
-        );
-
-        return $template->render();
-    }
-
-    /**
-     * @param  ReflectionMethod $method
-     * @return boolean
-     */
-    protected static function canMockMethod(ReflectionMethod $method)
-    {
-        if ($method->isConstructor() || $method->isFinal() ||
-            isset(self::$blacklistedMethodNames[$method->getName()])) {
-            return FALSE;
-        }
-
-        return TRUE;
-    }
-}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_class.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_class.tpl.dist
deleted file mode 100644
index 0b41d1ac530835d036bf0ac011c9083f5dcbed6c..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_class.tpl.dist
+++ /dev/null
@@ -1,52 +0,0 @@
-{prologue}{class_declaration}
-{
-    private static $__phpunit_staticInvocationMocker;
-    private $__phpunit_invocationMocker;
-
-{clone}{mocked_methods}
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        self::__phpunit_getStaticInvocationMocker()->verify();
-        $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
-    }
-}{epilogue}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_static_method.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_static_method.tpl.dist
deleted file mode 100644
index 06df0706f4b6c6e3fc5415b450f376cf7978801a..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_static_method.tpl.dist
+++ /dev/null
@@ -1,22 +0,0 @@
-
-    {modifier} static function {reference}{method_name}({arguments_decl})
-    {
-        $arguments = array({arguments_call});
-        $count     = func_num_args();
-
-        if ($count > {arguments_count}) {
-            $_arguments = func_get_args();
-
-            for ($i = {arguments_count}; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = self::__phpunit_getStaticInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Static(
-            '{class_name}', '{method_name}', $arguments, {clone_arguments}
-          )
-        );
-
-        return $result;
-    }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/trait_class.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/trait_class.tpl.dist
deleted file mode 100644
index 48b4bbf26865356c3bea906ff8bd9172caefe06b..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/trait_class.tpl.dist
+++ /dev/null
@@ -1,4 +0,0 @@
-class {class_name}
-{
-    use {trait_name};
-}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/README.md b/core/vendor/phpunit/phpunit-mock-objects/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..cb855a8a76a4fd92c44f7571ae29ef28b899983a
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/README.md
@@ -0,0 +1,21 @@
+[![Latest Stable Version](https://poser.pugx.org/phpunit/phpunit-mock-objects/v/stable.png)](https://packagist.org/packages/phpunit/phpunit-mock-objects)
+[![Build Status](https://travis-ci.org/sebastianbergmann/phpunit-mock-objects.png?branch=master)](https://travis-ci.org/sebastianbergmann/phpunit-mock-objects)
+
+# PHPUnit_MockObject
+
+**PHPUnit_MockObject** is the default mock object library for PHPUnit.
+
+## Requirements
+
+* PHP 5.3.3 is required but using the latest version of PHP is highly recommended
+
+## Installation
+
+To add PHPUnit_MockObject as a local, per-project dependency to your project, simply add a dependency on `phpunit/phpunit-mock-objects` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on PHPUnit_MockObject 2.0:
+
+    {
+        "require": {
+            "phpunit/phpunit-mock-objects": "2.1.*"
+        }
+    }
+
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/GeneratorTest.php b/core/vendor/phpunit/phpunit-mock-objects/Tests/GeneratorTest.php
deleted file mode 100644
index 2ffbbc3125246aa363799d56651fd2c58ab278af..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/GeneratorTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-class Framework_MockObject_GeneratorTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMock
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testGetMockFailsWhenInvalidFunctionNameIsPassedInAsAFunctionToMock()
-    {
-        PHPUnit_Framework_MockObject_Generator::getMock('StdClass', array(0));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMock
-     */
-    public function testGetMockCanCreateNonExistingFunctions()
-    {
-        $mock = PHPUnit_Framework_MockObject_Generator::getMock('StdClass', array('testFunction'));
-        $this->assertTrue(method_exists($mock, 'testFunction'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMock
-     * @expectedException PHPUnit_Framework_Exception
-     * @expectedExceptionMessage duplicates: "foo, foo"
-     */
-    public function testGetMockGeneratorFails()
-    {
-        $mock = PHPUnit_Framework_MockObject_Generator::getMock('StdClass', array('foo', 'foo'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     */
-    public function testGetMockForAbstractClassDoesNotFailWhenFakingInterfaces()
-    {
-        $mock = PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass('Countable');
-        $this->assertTrue(method_exists($mock, 'count'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     */
-    public function testGetMockForAbstractClassStubbingAbstractClass()
-    {
-        $mock = PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass('AbstractMockTestClass');
-        $this->assertTrue(method_exists($mock, 'doSomething'));
-    }
-
-    /**
-     * @dataProvider getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testGetMockForAbstractClassExpectingInvalidArgumentException($className, $mockClassName)
-    {
-        $mock = PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass($className, array(), $mockClassName);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testGetMockForAbstractClassAnstractClassDoesNotExist()
-    {
-        $mock = PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass('Tux');
-    }
-
-    /**
-     * Dataprovider for test "testGetMockForAbstractClassExpectingInvalidArgumentException"
-     */
-    public static function getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider()
-    {
-        return array(
-            'className not a string' => array(array(), ''),
-            'mockClassName not a string' => array('Countable', new StdClass),
-        );
-    }
-}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/invocation_static_clone_object.phpt b/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/invocation_static_clone_object.phpt
deleted file mode 100644
index 469b0b3c793e65aa1016ab0f68705c3ab2925cc2..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/invocation_static_clone_object.phpt
+++ /dev/null
@@ -1,130 +0,0 @@
---TEST--
-PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE, TRUE)
---FILE--
-<?php
-class Foo
-{
-    public static function bar(Foo $foo)
-    {
-    }
-
-    public static function baz(Foo $foo)
-    {
-    }
-}
-
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
-
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
-  'Foo',
-  array(),
-  'MockFoo',
-  TRUE,
-  TRUE,
-  TRUE
-);
-
-print $mock['code'];
-?>
---EXPECTF--
-class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
-{
-    private static $__phpunit_staticInvocationMocker;
-    private $__phpunit_invocationMocker;
-
-    public function __clone()
-    {
-        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
-    }
-
-    public static function bar(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = self::__phpunit_getStaticInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Static(
-            'Foo', 'bar', $arguments, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public static function baz(Foo $foo)
-    {
-        $arguments = array($foo);
-        $count     = func_num_args();
-
-        if ($count > 1) {
-            $_arguments = func_get_args();
-
-            for ($i = 1; $i < $count; $i++) {
-                $arguments[] = $_arguments[$i];
-            }
-        }
-
-        $result = self::__phpunit_getStaticInvocationMocker()->invoke(
-          new PHPUnit_Framework_MockObject_Invocation_Static(
-            'Foo', 'baz', $arguments, TRUE
-          )
-        );
-
-        return $result;
-    }
-
-    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return $this->__phpunit_getInvocationMocker()->expects($matcher);
-    }
-
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
-    {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
-    }
-
-    public function __phpunit_getInvocationMocker()
-    {
-        if ($this->__phpunit_invocationMocker === NULL) {
-            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return $this->__phpunit_invocationMocker;
-    }
-
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
-    public function __phpunit_hasMatchers()
-    {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
-    }
-
-    public function __phpunit_verify()
-    {
-        self::__phpunit_getStaticInvocationMocker()->verify();
-        $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
-    }
-}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/build.xml b/core/vendor/phpunit/phpunit-mock-objects/build.xml
index 6eefc407e0e6933919a2d09a597c8294f62c4093..aa44cbece74f2b5c3677d3c8bf5cde26d3916241 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/build.xml
+++ b/core/vendor/phpunit/phpunit-mock-objects/build.xml
@@ -1,162 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<project name="PHPUnit_MockObject" default="build">
- <property name="php" value="php"/>
- <property name="phpunit" value="phpunit"/>
-
- <target name="build"
-   depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpcb"/>
-
- <target name="build-parallel"
-   depends="prepare,lint,tools-parallel,phpunit,phpcb"/>
-
- <target name="tools-parallel"
-         description="Run tools in parallel">
-  <parallel threadCount="2">
-   <sequential>
-    <antcall target="pdepend"/>
-    <antcall target="phpmd-ci"/>
-   </sequential>
-   <antcall target="phpcpd"/>
-   <antcall target="phpcs-ci"/>
-   <antcall target="phploc"/>
-  </parallel>
- </target>
-
+<project name="PHPUnit_MockObjects">
  <target name="clean" description="Cleanup build artifacts">
-  <delete dir="${basedir}/build/api"/>
-  <delete dir="${basedir}/build/code-browser"/>
-  <delete dir="${basedir}/build/coverage"/>
-  <delete dir="${basedir}/build/logs"/>
-  <delete dir="${basedir}/build/pdepend"/>
- </target>
-
- <target name="prepare" depends="clean,phpab"
-         description="Prepare for build">
-  <mkdir dir="${basedir}/build/api"/>
-  <mkdir dir="${basedir}/build/code-browser"/>
-  <mkdir dir="${basedir}/build/coverage"/>
-  <mkdir dir="${basedir}/build/logs"/>
-  <mkdir dir="${basedir}/build/pdepend"/>
- </target>
-
- <target name="phpab" description="Generate autoloader scripts">
-  <exec executable="phpab">
-   <arg value="--output" />
-   <arg path="PHPUnit/Framework/MockObject/Autoload.php" />
-   <arg value="--template" />
-   <arg path="PHPUnit/Framework/MockObject/Autoload.php.in" />
-   <arg value="--indent" />
-   <arg value="            " />
-   <arg path="PHPUnit" />
-  </exec>
- </target>
-
- <target name="lint">
-  <apply executable="${php}" failonerror="true">
-   <arg value="-l" />
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
 
-   <fileset dir="${basedir}/PHPUnit">
-    <include name="**/*.php" />
-    <modified />
+  <delete>
+   <fileset dir="${basedir}/build">
+    <include name="**/*.phar" />
    </fileset>
+  </delete>
+ </target>
 
-   <fileset dir="${basedir}/Tests">
-    <include name="**/*.php" />
-    <modified />
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
    </fileset>
-  </apply>
- </target>
+  </delete>
 
- <target name="phploc" description="Measure project size using PHPLOC">
-  <exec executable="phploc">
-   <arg value="--log-csv" />
-   <arg value="${basedir}/build/logs/phploc.csv" />
-   <arg path="${basedir}/PHPUnit" />
-  </exec>
- </target>
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
 
- <target name="pdepend"
-         description="Calculate software metrics using PHP_Depend">
-  <exec executable="pdepend">
-   <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
-   <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
-   <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}/PHPUnit" />
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
   </exec>
  </target>
 
- <target name="phpmd"
-         description="Perform project mess detection using PHPMD">
-  <exec executable="phpmd">
-   <arg path="${basedir}/PHPUnit" />
-   <arg value="text" />
-   <arg value="${basedir}/build/phpmd.xml" />
-  </exec>
- </target>
-
- <target name="phpmd-ci"
-         description="Perform project mess detection using PHPMD">
-  <exec executable="phpmd">
-   <arg path="${basedir}/PHPUnit" />
-   <arg value="xml" />
-   <arg value="${basedir}/build/phpmd.xml" />
-   <arg value="--reportfile" />
-   <arg value="${basedir}/build/logs/pmd.xml" />
+ <target name="phpab" description="Generate autoloader script">
+  <exec executable="phpab">
+   <arg value="--output" />
+   <arg path="tests/autoload.php" />
+   <arg path="tests" />
   </exec>
  </target>
 
- <target name="phpcs"
-         description="Find coding standard violations using PHP_CodeSniffer">
+ <target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer">
   <exec executable="phpcs">
-   <arg value="--standard=${basedir}/build/PHPCS" />
-   <arg value="--extensions=php" />
-   <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHPUnit" />
-   <arg path="${basedir}/Tests" />
-  </exec>
- </target>
-
- <target name="phpcs-ci"
-         description="Find coding standard violations using PHP_CodeSniffer">
-  <exec executable="phpcs" output="/dev/null">
-   <arg value="--report=checkstyle" />
-   <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
-   <arg value="--standard=${basedir}/build/PHPCS" />
+   <arg value="--standard=PSR2" />
    <arg value="--extensions=php" />
-   <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHPUnit" />
-   <arg path="${basedir}/Tests" />
-  </exec>
- </target>
-
- <target name="phpcpd" description="Find duplicate code using PHPCPD">
-  <exec executable="phpcpd">
-   <arg value="--log-pmd" />
-   <arg value="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/PHPUnit" />
-  </exec>
- </target>
-
- <target name="phpunit" description="Run unit tests with PHPUnit">
-  <condition property="phpunit_cmd" value="${php} ${phpunit}" else="${phpunit}">
-   <not>
-    <equals arg1="${phpunit}" arg2="phpunit" />
-   </not>
-  </condition>
-
-  <exec executable="${phpunit_cmd}" failonerror="true"/>
- </target>
-
- <target name="phpcb"
-         description="Aggregate tool output with PHP_CodeBrowser">
-  <exec executable="phpcb">
-   <arg value="--log" />
-   <arg path="${basedir}/build/logs" />
-   <arg value="--source" />
-   <arg path="${basedir}/PHPUnit" />
-   <arg value="--output" />
-   <arg path="${basedir}/build/code-browser" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
   </exec>
  </target>
 </project>
+
diff --git a/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php b/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
deleted file mode 100644
index bf9d520d3842e61c4602b5c46b5aaef140451248..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class PHPCS_Sniffs_ControlStructures_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
-{
-    public function __construct()
-    {
-        parent::__construct(true);
-    }
-
-    protected function getPatterns()
-    {
-        return array(
-          'do {EOL...} while (...);EOL',
-          'while (...) {EOL',
-          'for (...) {EOL',
-          'if (...) {EOL',
-          'foreach (...) {EOL',
-          '}EOLelse if (...) {EOL',
-          '}EOLelse {EOL',
-          'do {EOL',
-        );
-    }
-}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php b/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
deleted file mode 100644
index e91d6c6dd543832cfdb097d8430b656eb8d7ff0d..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class PHPCS_Sniffs_Whitespace_ConcatenationSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-    public function register()
-    {
-        return array(T_STRING_CONCAT);
-    }
-
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[($stackPtr - 1)]['code'] !== T_WHITESPACE ||
-            $tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
-
-            $phpcsFile->addError(
-              'Concatenation operator must be surrounded by whitespace',
-              $stackPtr
-            );
-        }
-    }
-}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/ruleset.xml b/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/ruleset.xml
deleted file mode 100644
index 402f2140b598cc2774a08155070c91900996c87a..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/build/PHPCS/ruleset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Sebastian">
- <description>Sebastian Bergmann's coding standard</description>
-
- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
- <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
- <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
- <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
- <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
- <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
-
- <rule ref="Generic.Commenting.Todo"/>
-
- <rule ref="Generic.ControlStructures.InlineControlStructure"/>
-
- <rule ref="Generic.Files.LineEndings"/>
-
- <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
- <rule ref="Generic.Formatting.NoSpaceAfterCast"/>
-
- <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
- <rule ref="PEAR.Functions.ValidDefaultValue"/>
-
- <rule ref="Generic.NamingConventions.ConstructorName"/>
- <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
- <rule ref="PEAR.NamingConventions.ValidClassName"/>
-
- <rule ref="Generic.PHP.DisallowShortOpenTag"/>
- <rule ref="Generic.PHP.NoSilencedErrors"/>
- <rule ref="Generic.PHP.UpperCaseConstant"/>
-
- <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
- <rule ref="Generic.WhiteSpace.ScopeIndent"/>
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
-</ruleset>
diff --git a/core/vendor/phpunit/phpunit-mock-objects/build/phpmd.xml b/core/vendor/phpunit/phpunit-mock-objects/build/phpmd.xml
deleted file mode 100644
index 23ecb8b0b6310c84cba60ba87378fa04aa7ee361..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/build/phpmd.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<ruleset name="Sebastian"
-         xmlns="http://pmd.sf.net/ruleset/1.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
-         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-  <description>Sebastian Bergmann's ruleset</description>
-
-  <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
-  <rule ref="rulesets/codesize.xml/NPathComplexity" />
-  <rule ref="rulesets/codesize.xml/ExcessiveClassComplexity" />
-  <rule ref="rulesets/codesize.xml/ExcessiveClassLength" />
-  <rule ref="rulesets/codesize.xml/ExcessiveMethodLength" />
-  <rule ref="rulesets/codesize.xml/ExcessiveParameterList" />
-
-  <rule ref="rulesets/design.xml/EvalExpression" />
-  <rule ref="rulesets/design.xml/ExitExpression" />
-  <rule ref="rulesets/design.xml/GotoStatement" />
-
-  <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass" />
-
-  <rule ref="rulesets/unusedcode.xml/UnusedFormalParameter" />
-  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable" />
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField" />
-  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod" />
-</ruleset>
diff --git a/core/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml b/core/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
index 66dad14f2fcac0c4f2f9611d1fa5555732470b5d..f2b2216a82ff5211518c47960106e42802671afe 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
+++ b/core/vendor/phpunit/phpunit-mock-objects/build/travis-ci.xml
@@ -1,28 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         colors="true">
-  <php>
-    <const name="PHPUNIT_TESTSUITE" value="true"/>
-  </php>
-
-  <testsuites>
-    <testsuite name="PHPUnit Mock Objects">
-      <directory suffix="Test.php">../Tests</directory>
-      <directory suffix=".phpt">../Tests</directory>
-    </testsuite>
-  </testsuites>
-
-  <logging>
-    <log type="coverage-text" target="php://stdout"/>
-  </logging>
-
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../PHPUnit</directory>
-      <exclude>
-       <file>../PHPUnit/Framework/MockObject/Autoload.php</file>
-      </exclude>
-    </whitelist>
-  </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="../tests/bootstrap.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuite name="PHPUnit Mock Objects">
+    <directory suffix="Test.php">../tests</directory>
+    <directory suffix=".phpt">../tests</directory>
+  </testsuite>
 </phpunit>
+
diff --git a/core/vendor/phpunit/phpunit-mock-objects/composer.json b/core/vendor/phpunit/phpunit-mock-objects/composer.json
index 6789c2996f377c4dd0dad0994c354bf7c22570d6..46fda2b5db25b5c426e4ca3bdc129138b422e630 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/composer.json
+++ b/core/vendor/phpunit/phpunit-mock-objects/composer.json
@@ -21,17 +21,26 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "phpunit/php-text-template": ">=1.1.1@stable"
+        "phpunit/php-text-template": "~1.2"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.1"
     },
     "suggest": {
         "ext-soap": "*"
     },
     "autoload": {
         "classmap": [
-            "PHPUnit/"
+            "src/"
         ]
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.1.x-dev"
+        }
+    },
     "include-path": [
         ""
     ]
 }
+
diff --git a/core/vendor/phpunit/phpunit-mock-objects/package.xml b/core/vendor/phpunit/phpunit-mock-objects/package.xml
deleted file mode 100644
index dfa8129612a664a0fff6823d66be21898087cc52..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit-mock-objects/package.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.10" version="2.0"
-  xmlns="http://pear.php.net/dtd/package-2.0"
-  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-                      http://pear.php.net/dtd/tasks-1.0.xsd
-                      http://pear.php.net/dtd/package-2.0
-                      http://pear.php.net/dtd/package-2.0.xsd">
- <name>PHPUnit_MockObject</name>
- <channel>pear.phpunit.de</channel>
- <summary>Mock Object library for PHPUnit</summary>
- <description>Mock Object library for PHPUnit</description>
- <lead>
-  <name>Sebastian Bergmann</name>
-  <user>sb</user>
-  <email>sb@sebastian-bergmann.de</email>
-  <active>yes</active>
- </lead>
- <date>2013-01-13</date>
- <version>
-  <release>1.2.3</release>
-  <api>1.2.0</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license>The BSD 3-Clause License</license>
- <notes>http://github.com/sebastianbergmann/phpunit-mock-objects/blob/master/README.markdown</notes>
- <contents>
-  <dir name="/">
-   <dir name="PHPUnit">
-    <dir name="Framework">
-     <dir name="MockObject">
-      <dir name="Builder">
-       <file baseinstalldir="/" name="Identity.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="InvocationMocker.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="Match.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="MethodNameMatch.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="Namespace.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="ParametersMatch.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="Stub.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-      </dir>
-      <dir name="Generator">
-       <file baseinstalldir="/" name="mocked_class.tpl.dist" role="php" />
-       <file baseinstalldir="/" name="mocked_clone.tpl.dist" role="php" />
-       <file baseinstalldir="/" name="mocked_object_method.tpl.dist" role="php" />
-       <file baseinstalldir="/" name="mocked_static_method.tpl.dist" role="php" />
-       <file baseinstalldir="/" name="trait_class.tpl.dist" role="php" />
-       <file baseinstalldir="/" name="unmocked_clone.tpl.dist" role="php" />
-       <file baseinstalldir="/" name="wsdl_class.tpl.dist" role="php" />
-       <file baseinstalldir="/" name="wsdl_method.tpl.dist" role="php" />
-      </dir>
-      <dir name="Invocation">
-       <file baseinstalldir="/" name="Object.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="Static.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-      </dir>
-      <dir name="Matcher">
-       <file baseinstalldir="/" name="AnyInvokedCount.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="AnyParameters.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="Invocation.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="InvokedAtIndex.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="InvokedAtLeastOnce.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="InvokedCount.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="InvokedRecorder.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="MethodName.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="Parameters.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="StatelessInvocation.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-      </dir>
-      <dir name="Stub">
-       <file baseinstalldir="/" name="ConsecutiveCalls.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="Exception.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="MatcherCollection.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="Return.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="ReturnArgument.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="ReturnCallback.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="ReturnSelf.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-       <file baseinstalldir="/" name="ReturnValueMap.php" role="php">
-        <tasks:replace from="@package_version@" to="version" type="package-info" />
-       </file>
-      </dir>
-      <file baseinstalldir="/" name="Autoload.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="Generator.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="InvocationMocker.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="Invocation.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="Invokable.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="Matcher.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="MockBuilder.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="MockObject.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="Stub.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-      <file baseinstalldir="/" name="Verifiable.php" role="php">
-       <tasks:replace from="@package_version@" to="version" type="package-info" />
-      </file>
-     </dir>
-    </dir>
-   </dir>
-   <file baseinstalldir="/" name="ChangeLog.markdown" role="doc"/>
-   <file baseinstalldir="/" name="LICENSE" role="doc"/>
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.3.3</min>
-   </php>
-   <pearinstaller>
-    <min>1.9.4</min>
-   </pearinstaller>
-   <package>
-    <name>Text_Template</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.1.1</min>
-   </package>
-  </required>
-  <optional>
-   <extension>
-    <name>soap</name>
-   </extension>
-  </optional>
- </dependencies>
- <phprelease/>
-</package>
diff --git a/core/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist b/core/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
index 0ce22dffc23e1e6f8dfcad11d1aaf313b522e0de..84db1114592b1e382b684af968f936ee96094293 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
+++ b/core/vendor/phpunit/phpunit-mock-objects/phpunit.xml.dist
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false">
-  <php>
-    <const name="PHPUNIT_TESTSUITE" value="true"/>
-  </php>
-
-  <testsuites>
-    <testsuite name="PHPUnit Mock Objects">
-      <directory suffix="Test.php">Tests</directory>
-      <directory suffix=".phpt">Tests</directory>
-    </testsuite>
-  </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         backupGlobals="false"
+         verbose="true">
+  <testsuite name="PHPUnit Mock Objects">
+    <directory suffix="Test.php">tests</directory>
+    <directory suffix=".phpt">tests</directory>
+  </testsuite>
 
   <logging>
-    <log type="coverage-html" target="build/coverage" title="PHPUnit Mock Objects"
-         charset="UTF-8" yui="true" highlight="true"
-         lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-    <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+    <log type="coverage-html" target="build/coverage"/>
   </logging>
 
   <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">PHPUnit</directory>
-      <exclude>
-       <file>PHPUnit/Framework/MockObject/Autoload.php</file>
-      </exclude>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src</directory>
     </whitelist>
   </filter>
 </phpunit>
+
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Identity.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php
similarity index 88%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Identity.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php
index 0c66818fd80e0b4217493af962093a37b4c3f2c5..67c2b6c07245de6909a50fbaeba4f7bbc629c6de 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Identity.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -51,8 +51,8 @@
  * PHPUnit_Framework_MockObject_Builder_Match::after().
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/InvocationMocker.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php
similarity index 58%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/InvocationMocker.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php
index ba4e5b318fb5faab6df2274e88099a200d7ccc30..9b83c1734c53c07bf393421e37c65a70d691b182 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/InvocationMocker.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -51,8 +51,8 @@
  * with the test case PHPUnit_Framework_MockObject_TestCase.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -72,7 +72,7 @@ class PHPUnit_Framework_MockObject_Builder_InvocationMocker implements PHPUnit_F
 
     /**
      * @param PHPUnit_Framework_MockObject_Stub_MatcherCollection $collection
-     * @param PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher
+     * @param PHPUnit_Framework_MockObject_Matcher_Invocation     $invocationMatcher
      */
     public function __construct(PHPUnit_Framework_MockObject_Stub_MatcherCollection $collection, PHPUnit_Framework_MockObject_Matcher_Invocation $invocationMatcher)
     {
@@ -93,7 +93,7 @@ public function getMatcher()
     }
 
     /**
-     * @param  mixed $id
+     * @param  mixed                                                 $id
      * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */
     public function id($id)
@@ -104,7 +104,7 @@ public function id($id)
     }
 
     /**
-     * @param  PHPUnit_Framework_MockObject_Stub $stub
+     * @param  PHPUnit_Framework_MockObject_Stub                     $stub
      * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */
     public function will(PHPUnit_Framework_MockObject_Stub $stub)
@@ -115,24 +115,109 @@ public function will(PHPUnit_Framework_MockObject_Stub $stub)
     }
 
     /**
-     * @param  mixed $id
+     * @param  mixed                                                 $value
      * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */
-    public function after($id)
+    public function willReturn($value)
     {
-        $this->matcher->afterMatchBuilderId = $id;
+        $stub = new PHPUnit_Framework_MockObject_Stub_Return(
+          $value
+        );
 
-        return $this;
+        return $this->will($stub);
     }
 
     /**
-     * @param  mixed $argument, ...
+     * @param  array                                                 $valueMap
      * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */
-    public function with()
+    public function willReturnMap(array $valueMap)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnValueMap(
+          $valueMap
+        );
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  mixed                                                 $argumentIndex
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnArgument($argumentIndex)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnArgument(
+          $argumentIndex
+        );
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  callable                                              $callback
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnCallback($callback)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnCallback(
+          $callback
+        );
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnSelf()
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_ReturnSelf();
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  mixed                                                 $value, ...
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willReturnOnConsecutiveCalls()
     {
         $args = func_get_args();
 
+        $stub = new PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls($args);
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  Exception                                             $exception
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function willThrowException(Exception $exception)
+    {
+        $stub = new PHPUnit_Framework_MockObject_Stub_Exception($exception);
+
+        return $this->will($stub);
+    }
+
+    /**
+     * @param  mixed                                                 $id
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function after($id)
+    {
+        $this->matcher->afterMatchBuilderId = $id;
+
+        return $this;
+    }
+
+    /**
+     * Validate that a parameters matcher can be defined, throw exceptions otherwise.
+     *
+     * @throws PHPUnit_Framework_Exception
+     */
+    private function canDefineParameters()
+    {
         if ($this->matcher->methodNameMatcher === NULL) {
             throw new PHPUnit_Framework_Exception(
               'Method name matcher is not defined, cannot define parameter ' .
@@ -145,29 +230,45 @@ public function with()
               'Parameter matcher is already defined, cannot redefine'
             );
         }
+    }
+
+    /**
+     * @param  mixed                                                 $argument, ...
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function with()
+    {
+        $args = func_get_args();
+
+        $this->canDefineParameters();
 
         $this->matcher->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_Parameters($args);
 
         return $this;
     }
 
+    /**
+     * @param  mixed ...$argument
+     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
+     */
+    public function withConsecutive() {
+
+        $args = func_get_args();
+
+        $this->canDefineParameters();
+
+        $this->matcher->parametersMatcher =
+          new PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters($args);
+
+        return $this;
+    }
+
     /**
      * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */
     public function withAnyParameters()
     {
-        if ($this->matcher->methodNameMatcher === NULL) {
-            throw new PHPUnit_Framework_Exception(
-              'Method name matcher is not defined, cannot define parameter ' .
-              'matcher without one'
-            );
-        }
-
-        if ($this->matcher->parametersMatcher !== NULL) {
-            throw new PHPUnit_Framework_Exception(
-              'Parameter matcher is already defined, cannot redefine'
-            );
-        }
+        $this->canDefineParameters();
 
         $this->matcher->parametersMatcher = new PHPUnit_Framework_MockObject_Matcher_AnyParameters;
 
@@ -175,7 +276,7 @@ public function withAnyParameters()
     }
 
     /**
-     * @param  PHPUnit_Framework_Constraint|string $constraint
+     * @param  PHPUnit_Framework_Constraint|string                   $constraint
      * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */
     public function method($constraint)
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Match.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php
similarity index 82%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Match.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php
index ce2ee18f50cd512adb66b59f37aa936d35ab9917..4acedd30ca289af0fe5189bd8e3ec2aa74320ac8 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Match.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Builder interface for invocation order matches.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -58,8 +58,8 @@ interface PHPUnit_Framework_MockObject_Builder_Match extends PHPUnit_Framework_M
     /**
      * Defines the expectation which must occur before the current is valid.
      *
-     * @param string $id The identification of the expectation that should
-     *                   occur before this one.
+     * @param  string                                    $id The identification of the expectation that should
+     *                                                       occur before this one.
      * @return PHPUnit_Framework_MockObject_Builder_Stub
      */
     public function after($id);
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/MethodNameMatch.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php
similarity index 79%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/MethodNameMatch.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php
index 9569d38ec1c7285856d2c8c233c4db56750176a5..3576a56faea2a3a9fe12f143fb2d862335126b91 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/MethodNameMatch.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Builder interface for matcher of method names.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -59,9 +59,9 @@ interface PHPUnit_Framework_MockObject_Builder_MethodNameMatch extends PHPUnit_F
      * Adds a new method name match and returns the parameter match object for
      * further matching possibilities.
      *
-     * @param  PHPUnit_Framework_Constraint $name
-     *         Constraint for matching method, if a string is passed it will use
-     *         the PHPUnit_Framework_Constraint_IsEqual.
+     * @param  PHPUnit_Framework_Constraint                         $name
+     *                                                                    Constraint for matching method, if a string is passed it will use
+     *                                                                    the PHPUnit_Framework_Constraint_IsEqual.
      * @return PHPUnit_Framework_MockObject_Builder_ParametersMatch
      */
     public function method($name);
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Namespace.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php
similarity index 82%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Namespace.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php
index dfa0bd7762971e0365d3df3b11afd1c20fe2ed4a..7b5c70273eb23efacca52785b4a801e0c7502c20 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Namespace.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -48,8 +48,8 @@
  * This interface relates to PHPUnit_Framework_MockObject_Builder_Identity.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -60,7 +60,7 @@ interface PHPUnit_Framework_MockObject_Builder_Namespace
     /**
      * Looks up the match builder with identification $id and returns it.
      *
-     * @param string $id The identifiction of the match builder.
+     * @param  string                                     $id The identifiction of the match builder.
      * @return PHPUnit_Framework_MockObject_Builder_Match
      */
     public function lookupId($id);
@@ -71,9 +71,9 @@ public function lookupId($id);
      * has been invoked.
      *
      * @param string                                     $id
-     *        The identification of the match builder.
+     *                                                            The identification of the match builder.
      * @param PHPUnit_Framework_MockObject_Builder_Match $builder
-     *        The builder which is being registered.
+     *                                                            The builder which is being registered.
      */
     public function registerId($id, PHPUnit_Framework_MockObject_Builder_Match $builder);
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/ParametersMatch.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php
similarity index 90%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/ParametersMatch.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php
index 61c53bf5cdfbd7778b120107848c007a99d44b0b..2bd8849c714b28589639cd34ee5675a23d61e1bc 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/ParametersMatch.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Builder interface for parameter matchers.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Stub.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php
similarity index 86%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Stub.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php
index 86a091e3d6999dba849b735459d82d2dfa98cd97..156e0f800c15d060f1e49e79706e0f241a5169b4 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Builder/Stub.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Builder interface for stubs which are actions replacing an invocation.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -59,7 +59,7 @@ interface PHPUnit_Framework_MockObject_Builder_Stub extends PHPUnit_Framework_Mo
      * Stubs the matching method with the stub object $stub. Any invocations of
      * the matched method will now be handled by the stub instead.
      *
-     * @param PHPUnit_Framework_MockObject_Stub $stub The stub object.
+     * @param  PHPUnit_Framework_MockObject_Stub             $stub The stub object.
      * @return PHPUnit_Framework_MockObject_Builder_Identity
      */
     public function will(PHPUnit_Framework_MockObject_Stub $stub);
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
new file mode 100644
index 0000000000000000000000000000000000000000..a0cd1f30377ee5a159a5be3393387bc577d979ff
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 2.0.6
+ */
+
+/**
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 2.0.6
+ */
+class PHPUnit_Framework_MockObject_BadMethodCallException extends BadMethodCallException implements PHPUnit_Framework_MockObject_Exception
+{
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
new file mode 100644
index 0000000000000000000000000000000000000000..8ce99ff2a8c764a73b7c615fd596cf724523d1e9
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * Interface for exceptions used by PHPUnit_MockObject.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Interface available since Release 2.0.6
+ */
+interface PHPUnit_Framework_MockObject_Exception
+{
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
new file mode 100644
index 0000000000000000000000000000000000000000..b13ab68568b5d89e477249c7b617089499938bd1
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 2.0.6
+ */
+
+/**
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 2.0.6
+ */
+class PHPUnit_Framework_MockObject_RuntimeException extends RuntimeException implements PHPUnit_Framework_MockObject_Exception
+{
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
new file mode 100644
index 0000000000000000000000000000000000000000..a24171ad72db06ef3d5c976db91546c99bea6e18
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php
@@ -0,0 +1,1114 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      File available since Release 1.0.0
+ */
+
+if (!function_exists('trait_exists')) {
+    function trait_exists($traitname, $autoload = true)
+    {
+        return false;
+    }
+}
+
+/**
+ * Mock Object Code Generator
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ * @since      Class available since Release 1.0.0
+ */
+class PHPUnit_Framework_MockObject_Generator
+{
+    /**
+     * @var array
+     */
+    private static $cache = array();
+
+    /**
+     * @var array
+     */
+    protected $blacklistedMethodNames = array(
+      '__CLASS__' => TRUE,
+      '__DIR__' => TRUE,
+      '__FILE__' => TRUE,
+      '__FUNCTION__' => TRUE,
+      '__LINE__' => TRUE,
+      '__METHOD__' => TRUE,
+      '__NAMESPACE__' => TRUE,
+      '__TRAIT__' => TRUE,
+      '__clone' => TRUE,
+      '__halt_compiler' => TRUE,
+      'abstract' => TRUE,
+      'and' => TRUE,
+      'array' => TRUE,
+      'as' => TRUE,
+      'break' => TRUE,
+      'callable' => TRUE,
+      'case' => TRUE,
+      'catch' => TRUE,
+      'class' => TRUE,
+      'clone' => TRUE,
+      'const' => TRUE,
+      'continue' => TRUE,
+      'declare' => TRUE,
+      'default' => TRUE,
+      'die' => TRUE,
+      'do' => TRUE,
+      'echo' => TRUE,
+      'else' => TRUE,
+      'elseif' => TRUE,
+      'empty' => TRUE,
+      'enddeclare' => TRUE,
+      'endfor' => TRUE,
+      'endforeach' => TRUE,
+      'endif' => TRUE,
+      'endswitch' => TRUE,
+      'endwhile' => TRUE,
+      'eval' => TRUE,
+      'exit' => TRUE,
+      'expects' => TRUE,
+      'extends' => TRUE,
+      'final' => TRUE,
+      'for' => TRUE,
+      'foreach' => TRUE,
+      'function' => TRUE,
+      'global' => TRUE,
+      'goto' => TRUE,
+      'if' => TRUE,
+      'implements' => TRUE,
+      'include' => TRUE,
+      'include_once' => TRUE,
+      'instanceof' => TRUE,
+      'insteadof' => TRUE,
+      'interface' => TRUE,
+      'isset' => TRUE,
+      'list' => TRUE,
+      'namespace' => TRUE,
+      'new' => TRUE,
+      'or' => TRUE,
+      'print' => TRUE,
+      'private' => TRUE,
+      'protected' => TRUE,
+      'public' => TRUE,
+      'require' => TRUE,
+      'require_once' => TRUE,
+      'return' => TRUE,
+      'static' => TRUE,
+      'switch' => TRUE,
+      'throw' => TRUE,
+      'trait' => TRUE,
+      'try' => TRUE,
+      'unset' => TRUE,
+      'use' => TRUE,
+      'var' => TRUE,
+      'while' => TRUE,
+      'xor' => TRUE
+    );
+
+    /**
+     * @var boolean
+     */
+    protected $soapLoaded = NULL;
+
+    /**
+     * Returns a mock object for the specified class.
+     *
+     * @param  array|string                $type
+     * @param  array                       $methods
+     * @param  array                       $arguments
+     * @param  string                      $mockClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  boolean                     $cloneArguments
+     * @param  boolean                     $callOriginalMethods
+     * @param  object                      $proxyTarget
+     * @return object
+     * @throws InvalidArgumentException
+     * @throws PHPUnit_Framework_Exception
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @since  Method available since Release 1.0.0
+     */
+    public function getMock($type, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE, $callOriginalMethods = FALSE, $proxyTarget = NULL)
+    {
+        if (!is_array($type) && !is_string($type)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'array or string');
+        }
+
+        if (!is_string($mockClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(4, 'string');
+        }
+
+        if (!is_array($methods) && !is_null($methods)) {
+            throw new InvalidArgumentException;
+        }
+
+        if (NULL !== $methods) {
+            foreach ($methods as $method) {
+                if (!preg_match('~[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*~', $method)) {
+                    throw new PHPUnit_Framework_Exception(
+                      sprintf(
+                        'Cannot stub or mock method with invalid name "%s"',
+                        $method
+                      )
+                    );
+                }
+            }
+
+            if ($methods != array_unique($methods)) {
+                throw new PHPUnit_Framework_MockObject_RuntimeException(
+                  sprintf(
+                    'Cannot stub or mock using a method list that contains duplicates: "%s"',
+                    implode(', ', $methods)
+                  )
+                );
+            }
+        }
+
+        if ($mockClassName != '' && class_exists($mockClassName, FALSE)) {
+            $reflect = new ReflectionClass($mockClassName);
+
+            if (!$reflect->implementsInterface("PHPUnit_Framework_MockObject_MockObject")) {
+                throw new PHPUnit_Framework_MockObject_RuntimeException(
+                  sprintf(
+                    'Class "%s" already exists.',
+                    $mockClassName
+                  )
+                );
+            }
+        }
+
+        $mock = $this->generate(
+          $type,
+          $methods,
+          $mockClassName,
+          $callOriginalClone,
+          $callAutoload,
+          $cloneArguments,
+          $callOriginalMethods
+        );
+
+        return $this->getObject(
+          $mock['code'],
+          $mock['mockClassName'],
+          $type,
+          $callOriginalConstructor,
+          $callAutoload,
+          $arguments,
+          $callOriginalMethods,
+          $proxyTarget
+        );
+    }
+
+    /**
+     * @param  string       $code
+     * @param  string       $className
+     * @param  array|string $type
+     * @param  boolean      $callOriginalConstructor
+     * @param  boolean      $callAutoload
+     * @param  array        $arguments
+     * @param  boolean      $callOriginalMethods
+     * @param  object       $proxyTarget
+     * @return object
+     */
+    protected function getObject($code, $className, $type = '', $callOriginalConstructor = FALSE, $callAutoload = FALSE, array $arguments = array(), $callOriginalMethods = FALSE, $proxyTarget = NULL)
+    {
+        $this->evalClass($code, $className);
+
+        if ($callOriginalConstructor &&
+            is_string($type) &&
+            !interface_exists($type, $callAutoload)) {
+            if (count($arguments) == 0) {
+                $object = new $className;
+            } else {
+                $class  = new ReflectionClass($className);
+                $object = $class->newInstanceArgs($arguments);
+            }
+        } else {
+            $class = new ReflectionClass('ReflectionClass');
+            $hasNewInstanceWithoutConstructor = $class->hasMethod('newInstanceWithoutConstructor');;
+
+            $class      = new ReflectionClass($className);
+            $isInternal = $this->isInternalClass($class);
+
+            if ($isInternal && !$this->unserializeHackIsSupported()) {
+                throw new PHPUnit_Framework_MockObject_RuntimeException(
+                    'Internal classes cannot be mocked without invoking their constructor in PHP ' . PHP_VERSION
+                );
+            }
+
+            if ($isInternal || !$hasNewInstanceWithoutConstructor) {
+                $object = unserialize(
+                    sprintf('O:%d:"%s":0:{}', strlen($className), $className)
+                );
+            } else {
+                $object = $class->newInstanceWithoutConstructor();
+            }
+        }
+
+        if ($callOriginalMethods) {
+            if (!is_object($proxyTarget)) {
+                if (count($arguments) == 0) {
+                    $proxyTarget = new $type;
+                } else {
+                    $class       = new ReflectionClass($type);
+                    $proxyTarget = $class->newInstanceArgs($arguments);
+                }
+            }
+
+            $object->__phpunit_setOriginalObject($proxyTarget);
+        }
+
+        return $object;
+    }
+
+    /**
+     * @param string $code
+     * @param string $className
+     */
+    protected function evalClass($code, $className)
+    {
+        if (!class_exists($className, FALSE)) {
+            eval($code);
+        }
+    }
+
+    /**
+     * Returns a mock object for the specified abstract class with all abstract
+     * methods of the class mocked. Concrete methods to mock can be specified with
+     * the last parameter
+     *
+     * @param  string                      $originalClassName
+     * @param  array                       $arguments
+     * @param  string                      $mockClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  array                       $mockedMethods
+     * @param  boolean                     $cloneArguments
+     * @return object
+     * @since  Method available since Release 1.0.0
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $mockedMethods = array(), $cloneArguments = TRUE)
+    {
+        if (!is_string($originalClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($mockClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
+        }
+
+        if (class_exists($originalClassName, $callAutoload) ||
+            interface_exists($originalClassName, $callAutoload)) {
+            $reflector = new ReflectionClass($originalClassName);
+            $methods   = $mockedMethods;
+
+            foreach ($reflector->getMethods() as $method) {
+                if ($method->isAbstract() && !in_array($method->getName(), $methods)) {
+                    $methods[] = $method->getName();
+                }
+            }
+
+            if (empty($methods)) {
+                $methods = NULL;
+            }
+
+            return $this->getMock(
+              $originalClassName,
+              $methods,
+              $arguments,
+              $mockClassName,
+              $callOriginalConstructor,
+              $callOriginalClone,
+              $callAutoload,
+              $cloneArguments
+            );
+        } else {
+            throw new PHPUnit_Framework_MockObject_RuntimeException(
+              sprintf('Class "%s" does not exist.', $originalClassName)
+            );
+        }
+    }
+
+    /**
+     * Returns a mock object for the specified trait with all abstract methods
+     * of the trait mocked. Concrete methods to mock can be specified with the
+     * `$mockedMethods` parameter.
+     *
+     * @param  string                   $traitName
+     * @param  array                    $arguments
+     * @param  string                   $mockClassName
+     * @param  boolean                  $callOriginalConstructor
+     * @param  boolean                  $callOriginalClone
+     * @param  boolean                  $callAutoload
+     * @param  array                    $mockedMethods
+     * @param  boolean                  $cloneArguments
+     * @return object
+     * @since  Method available since Release 1.2.3
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $mockedMethods = array(), $cloneArguments = TRUE)
+    {
+        if (!is_string($traitName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($mockClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
+        }
+
+        if (!trait_exists($traitName, $callAutoload)) {
+            throw new PHPUnit_Framework_MockObject_RuntimeException(
+              sprintf(
+                'Trait "%s" does not exist.',
+                $traitName
+              )
+            );
+        }
+
+        $className = $this->generateClassName(
+          $traitName, '', 'Trait_'
+        );
+
+        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
+                         DIRECTORY_SEPARATOR;
+        $classTemplate = new Text_Template(
+                           $templateDir . 'trait_class.tpl'
+                         );
+
+        $classTemplate->setVar(
+          array(
+            'prologue'   => 'abstract ',
+            'class_name' => $className['className'],
+            'trait_name' => $traitName
+          )
+        );
+
+        $this->evalClass(
+          $classTemplate->render(),
+          $className['className']
+        );
+
+        return $this->getMockForAbstractClass($className['className'], $arguments, $mockClassName, $callOriginalConstructor, $callOriginalClone, $callAutoload, $mockedMethods, $cloneArguments);
+    }
+
+    /**
+     * Returns an object for the specified trait.
+     *
+     * @param  string                      $traitName
+     * @param  array                       $arguments
+     * @param  string                      $traitClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @return object
+     * @since  Method available since Release 1.1.0
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE)
+    {
+        if (!is_string($traitName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_string($traitClassName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'string');
+        }
+
+        if (!trait_exists($traitName, $callAutoload)) {
+            throw new PHPUnit_Framework_MockObject_RuntimeException(
+              sprintf(
+                'Trait "%s" does not exist.',
+                $traitName
+              )
+            );
+        }
+
+        $className = $this->generateClassName(
+          $traitName, $traitClassName, 'Trait_'
+        );
+
+        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
+                         DIRECTORY_SEPARATOR;
+        $classTemplate = new Text_Template(
+                           $templateDir . 'trait_class.tpl'
+                         );
+
+        $classTemplate->setVar(
+          array(
+            'prologue'   => '',
+            'class_name' => $className['className'],
+            'trait_name' => $traitName
+          )
+        );
+
+        return $this->getObject(
+          $classTemplate->render(),
+          $className['className']
+        );
+    }
+
+    /**
+     * @param  array|string $type
+     * @param  array        $methods
+     * @param  string       $mockClassName
+     * @param  boolean      $callOriginalClone
+     * @param  boolean      $callAutoload
+     * @param  boolean      $cloneArguments
+     * @param  boolean      $callOriginalMethods
+     * @return array
+     */
+    public function generate($type, array $methods = NULL, $mockClassName = '', $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = TRUE, $callOriginalMethods = FALSE)
+    {
+        if (is_array($type)) {
+            sort($type);
+        }
+
+        if ($mockClassName == '') {
+            $key = md5(
+              is_array($type) ? join('_', $type) : $type .
+              serialize($methods) .
+              serialize($callOriginalClone) .
+              serialize($cloneArguments) .
+              serialize($callOriginalMethods)
+            );
+
+            if (isset(self::$cache[$key])) {
+                return self::$cache[$key];
+            }
+        }
+
+        $mock = $this->generateMock(
+          $type,
+          $methods,
+          $mockClassName,
+          $callOriginalClone,
+          $callAutoload,
+          $cloneArguments,
+          $callOriginalMethods
+        );
+
+        if (isset($key)) {
+            self::$cache[$key] = $mock;
+        }
+
+        return $mock;
+    }
+
+    /**
+     * @param  string                      $wsdlFile
+     * @param  string                      $className
+     * @param  array                       $methods
+     * @param  array                       $options
+     * @return string
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     */
+    public function generateClassFromWsdl($wsdlFile, $className, array $methods = array(), array $options = array())
+    {
+        if ($this->soapLoaded === NULL) {
+            $this->soapLoaded = extension_loaded('soap');
+        }
+
+        if ($this->soapLoaded) {
+            $options = array_merge($options, array('cache_wsdl'=>FALSE));
+            $client   = new SoapClient($wsdlFile, $options);
+            $_methods = array_unique($client->__getFunctions());
+            unset($client);
+
+            sort($_methods);
+
+            $templateDir    = dirname(__FILE__) . DIRECTORY_SEPARATOR .
+                              'Generator' . DIRECTORY_SEPARATOR;
+            $methodTemplate = new Text_Template(
+                                $templateDir . 'wsdl_method.tpl'
+                              );
+            $methodsBuffer  = '';
+
+            foreach ($_methods as $method) {
+                $nameStart = strpos($method, ' ') + 1;
+                $nameEnd   = strpos($method, '(');
+                $name      = substr($method, $nameStart, $nameEnd - $nameStart);
+
+                if (empty($methods) || in_array($name, $methods)) {
+                    $args    = explode(
+                                 ',',
+                                 substr(
+                                   $method,
+                                   $nameEnd + 1,
+                                   strpos($method, ')') - $nameEnd - 1
+                                 )
+                               );
+                    $numArgs = count($args);
+
+                    for ($i = 0; $i < $numArgs; $i++) {
+                        $args[$i] = substr($args[$i], strpos($args[$i], '$'));
+                    }
+
+                    $methodTemplate->setVar(
+                      array(
+                        'method_name' => $name,
+                        'arguments'   => join(', ', $args)
+                      )
+                    );
+
+                    $methodsBuffer .= $methodTemplate->render();
+                }
+            }
+
+            $optionsBuffer = 'array(';
+
+            foreach ($options as $key => $value) {
+                $optionsBuffer .= $key . ' => ' . $value;
+            }
+
+            $optionsBuffer .= ')';
+
+            $classTemplate = new Text_Template(
+              $templateDir . 'wsdl_class.tpl'
+            );
+
+            $namespace = '';
+
+            if (strpos($className, '\\') !== FALSE) {
+                $parts     = explode('\\', $className);
+                $className = array_pop($parts);
+                $namespace = 'namespace ' . join('\\', $parts) . ';' . "\n\n";
+            }
+
+            $classTemplate->setVar(
+              array(
+                'namespace'  => $namespace,
+                'class_name' => $className,
+                'wsdl'       => $wsdlFile,
+                'options'    => $optionsBuffer,
+                'methods'    => $methodsBuffer
+              )
+            );
+
+            return $classTemplate->render();
+        } else {
+            throw new PHPUnit_Framework_MockObject_RuntimeException(
+              'The SOAP extension is required to generate a mock object ' .
+              'from WSDL.'
+            );
+        }
+    }
+
+    /**
+     * @param  array|string                $type
+     * @param  array|null                  $methods
+     * @param  string                      $mockClassName
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  boolean                     $cloneArguments
+     * @param  boolean                     $callOriginalMethods
+     * @return array
+     * @throws PHPUnit_Framework_Exception
+     */
+    protected function generateMock($type, $methods, $mockClassName, $callOriginalClone, $callAutoload, $cloneArguments, $callOriginalMethods)
+    {
+        $templateDir   = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'Generator' .
+                         DIRECTORY_SEPARATOR;
+        $classTemplate = new Text_Template(
+                           $templateDir . 'mocked_class.tpl'
+                         );
+
+        $additionalInterfaces = array();
+        $cloneTemplate        = '';
+        $isClass              = FALSE;
+        $isInterface          = FALSE;
+
+        $mockClassName = $this->generateClassName(
+          $type, $mockClassName, 'Mock_'
+        );
+
+        if (is_array($type)) {
+            foreach ($type as $_type) {
+                if (!interface_exists($_type, $callAutoload)) {
+                    throw new PHPUnit_Framework_Exception(
+                      sprintf(
+                        'Interface "%s" does not exist.', $_type
+                      )
+                    );
+                }
+
+                $additionalInterfaces[] = $_type;
+
+                foreach (get_class_methods($_type) as $method) {
+                    if (in_array($method, $methods)) {
+                        throw new PHPUnit_Framework_Exception(
+                          sprintf(
+                            'Duplicate method "%s" not allowed.', $method
+                          )
+                        );
+                    }
+
+                    $methods[] = $method;
+                }
+            }
+        }
+
+        if (class_exists($mockClassName['fullClassName'], $callAutoload)) {
+            $isClass = TRUE;
+        } else {
+            if (interface_exists($mockClassName['fullClassName'], $callAutoload)) {
+                $isInterface = TRUE;
+            }
+        }
+
+        if (!class_exists($mockClassName['fullClassName'], $callAutoload) &&
+            !interface_exists($mockClassName['fullClassName'], $callAutoload)) {
+            $prologue = 'class ' . $mockClassName['originalClassName'] . "\n{\n}\n\n";
+
+            if (!empty($mockClassName['namespaceName'])) {
+                $prologue = 'namespace ' . $mockClassName['namespaceName'] .
+                            " {\n\n" . $prologue . "}\n\n" .
+                            "namespace {\n\n";
+
+                $epilogue = "\n\n}";
+            }
+
+            $cloneTemplate = new Text_Template(
+              $templateDir . 'mocked_clone.tpl'
+            );
+        } else {
+            $class = new ReflectionClass($mockClassName['fullClassName']);
+
+            if ($class->isFinal()) {
+                throw new PHPUnit_Framework_Exception(
+                  sprintf(
+                    'Class "%s" is declared "final" and cannot be mocked.',
+                    $mockClassName['fullClassName']
+                  )
+                );
+            }
+
+            if ($class->hasMethod('__clone')) {
+                $cloneMethod = $class->getMethod('__clone');
+
+                if (!$cloneMethod->isFinal()) {
+                    if ($callOriginalClone && !$isInterface) {
+                        $cloneTemplate = new Text_Template(
+                          $templateDir . 'unmocked_clone.tpl'
+                        );
+                    } else {
+                        $cloneTemplate = new Text_Template(
+                          $templateDir . 'mocked_clone.tpl'
+                        );
+                    }
+                }
+            } else {
+                $cloneTemplate = new Text_Template(
+                  $templateDir . 'mocked_clone.tpl'
+                );
+            }
+        }
+
+        if (is_object($cloneTemplate)) {
+            $cloneTemplate = $cloneTemplate->render();
+        }
+
+        if (is_array($methods) && empty($methods) &&
+            ($isClass || $isInterface)) {
+            $methods = get_class_methods($mockClassName['fullClassName']);
+        }
+
+        if (!is_array($methods)) {
+            $methods = array();
+        }
+
+        $mockedMethods = '';
+
+        if (isset($class)) {
+            // https://github.com/sebastianbergmann/phpunit-mock-objects/issues/103
+            if ($isInterface && $class->implementsInterface('Traversable') &&
+                !$class->implementsInterface('Iterator') &&
+                !$class->implementsInterface('IteratorAggregate')) {
+                $additionalInterfaces[] = 'Iterator';
+                $methods = array_merge($methods, get_class_methods('Iterator'));
+            }
+
+            foreach ($methods as $methodName) {
+                try {
+                    $method = $class->getMethod($methodName);
+
+                    if ($this->canMockMethod($method)) {
+                        $mockedMethods .= $this->generateMockedMethodDefinitionFromExisting(
+                          $templateDir,
+                          $method,
+                          $cloneArguments,
+                          $callOriginalMethods
+                        );
+                    }
+                } catch (ReflectionException $e) {
+                    $mockedMethods .= $this->generateMockedMethodDefinition(
+                      $templateDir, $mockClassName['fullClassName'], $methodName, $cloneArguments
+                    );
+                }
+            }
+        } else {
+            foreach ($methods as $methodName) {
+                $mockedMethods .= $this->generateMockedMethodDefinition(
+                  $templateDir, $mockClassName['fullClassName'], $methodName, $cloneArguments
+                );
+            }
+        }
+
+        $method = '';
+
+        if (!in_array('method', $methods)) {
+            $methodTemplate = new Text_Template(
+                $templateDir . 'mocked_class_method.tpl'
+            );
+
+            $method = $methodTemplate->render();
+        }
+
+        $classTemplate->setVar(
+          array(
+            'prologue'          => isset($prologue) ? $prologue : '',
+            'epilogue'          => isset($epilogue) ? $epilogue : '',
+            'class_declaration' => $this->generateMockClassDeclaration(
+                                     $mockClassName,
+                                     $isInterface,
+                                     $additionalInterfaces
+                                   ),
+            'clone'             => $cloneTemplate,
+            'mock_class_name'   => $mockClassName['className'],
+            'mocked_methods'    => $mockedMethods,
+            'method'            => $method
+          )
+        );
+
+        return array(
+          'code'          => $classTemplate->render(),
+          'mockClassName' => $mockClassName['className']
+        );
+    }
+
+    /**
+     * @param  array|string $type
+     * @param  string       $className
+     * @param  string       $prefix
+     * @return array
+     */
+    protected function generateClassName($type, $className, $prefix)
+    {
+        if (is_array($type)) {
+            $type = join('_', $type);
+        }
+
+        if ($type[0] == '\\') {
+            $type = substr($type, 1);
+        }
+
+        $classNameParts = explode('\\', $type);
+
+        if (count($classNameParts) > 1) {
+            $type          = array_pop($classNameParts);
+            $namespaceName = join('\\', $classNameParts);
+            $fullClassName = $namespaceName . '\\' . $type;
+        } else {
+            $namespaceName = '';
+            $fullClassName = $type;
+        }
+
+        if ($className == '') {
+            do {
+                $className = $prefix . $type . '_' .
+                             substr(md5(microtime()), 0, 8);
+            } while (class_exists($className, FALSE));
+        }
+
+        return array(
+          'className'         => $className,
+          'originalClassName' => $type,
+          'fullClassName'     => $fullClassName,
+          'namespaceName'     => $namespaceName
+        );
+    }
+
+    /**
+     * @param  array   $mockClassName
+     * @param  boolean $isInterface
+     * @param  array   $additionalInterfaces
+     * @return array
+     */
+    protected function generateMockClassDeclaration(array $mockClassName, $isInterface, array $additionalInterfaces = array())
+    {
+        $buffer = 'class ';
+
+        $additionalInterfaces[] = 'PHPUnit_Framework_MockObject_MockObject';
+        $interfaces = implode(', ', $additionalInterfaces);
+
+        if ($isInterface) {
+            $buffer .= sprintf(
+              "%s implements %s, %s%s",
+              $mockClassName['className'],
+              $interfaces,
+              !empty($mockClassName['namespaceName']) ? $mockClassName['namespaceName'] . '\\' : '',
+              $mockClassName['originalClassName']
+            );
+        } else {
+            $buffer .= sprintf(
+              "%s extends %s%s implements %s",
+              $mockClassName['className'],
+              !empty($mockClassName['namespaceName']) ? $mockClassName['namespaceName'] . '\\' : '',
+              $mockClassName['originalClassName'],
+              $interfaces
+            );
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @param  string           $templateDir
+     * @param  ReflectionMethod $method
+     * @param  boolean          $cloneArguments
+     * @param  boolean          $callOriginalMethods
+     * @return string
+     */
+    protected function generateMockedMethodDefinitionFromExisting($templateDir, ReflectionMethod $method, $cloneArguments, $callOriginalMethods)
+    {
+        if ($method->isPrivate()) {
+            $modifier = 'private';
+        } elseif ($method->isProtected()) {
+            $modifier = 'protected';
+        } else {
+            $modifier = 'public';
+        }
+
+        if ($method->isStatic()) {
+            $modifier .= ' static';
+        }
+
+        if ($method->returnsReference()) {
+            $reference = '&';
+        } else {
+            $reference = '';
+        }
+
+        return $this->generateMockedMethodDefinition(
+          $templateDir,
+          $method->getDeclaringClass()->getName(),
+          $method->getName(),
+          $cloneArguments,
+          $modifier,
+          $this->getMethodParameters($method),
+          $this->getMethodParameters($method, TRUE),
+          $reference,
+          $callOriginalMethods,
+          $method->isStatic()
+        );
+    }
+
+    /**
+     * @param  string  $templateDir
+     * @param  string  $className
+     * @param  string  $methodName
+     * @param  boolean $cloneArguments
+     * @param  string  $modifier
+     * @param  string  $arguments_decl
+     * @param  string  $arguments_call
+     * @param  string  $reference
+     * @param  boolean $callOriginalMethods
+     * @param  boolean $static
+     * @return string
+     */
+    protected function generateMockedMethodDefinition($templateDir, $className, $methodName, $cloneArguments = TRUE, $modifier = 'public', $arguments_decl = '', $arguments_call = '', $reference = '', $callOriginalMethods = FALSE, $static = FALSE)
+    {
+        if ($static) {
+            $templateFile = 'mocked_static_method.tpl';
+        } else {
+            $templateFile = sprintf(
+              '%s_method.tpl',
+              $callOriginalMethods ? 'proxied' : 'mocked'
+            );
+        }
+
+        $template = new Text_Template($templateDir . $templateFile);
+
+        $template->setVar(
+          array(
+            'arguments_decl'  => $arguments_decl,
+            'arguments_call'  => $arguments_call,
+            'arguments_count' => !empty($arguments_call) ? count(explode(',', $arguments_call)) : 0,
+            'class_name'      => $className,
+            'method_name'     => $methodName,
+            'modifier'        => $modifier,
+            'reference'       => $reference,
+            'clone_arguments' => $cloneArguments ? 'TRUE' : 'FALSE'
+          )
+        );
+
+        return $template->render();
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     */
+    protected function canMockMethod(ReflectionMethod $method)
+    {
+        if ($method->isConstructor() ||
+            $method->isFinal() ||
+            isset($this->blacklistedMethodNames[$method->getName()])) {
+            return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * Returns the parameters of a function or method.
+     *
+     * @param  ReflectionMethod $method
+     * @param  boolean          $forCall
+     * @return string
+     * @throws PHPUnit_Framework_MockObject_RuntimeException
+     * @since  Method available since Release 2.0.0
+     */
+    protected function getMethodParameters(ReflectionMethod $method, $forCall = FALSE)
+    {
+        $parameters = array();
+
+        foreach ($method->getParameters() as $i => $parameter) {
+            $name = '$' . $parameter->getName();
+
+            /* Note: PHP extensions may use empty names for reference arguments
+             * or "..." for methods taking a variable number of arguments.
+             */
+            if ($name === '$' || $name === '$...') {
+                $name = '$arg' . $i;
+            }
+
+            $default   = '';
+            $reference = '';
+            $typeHint  = '';
+
+            if (!$forCall) {
+                if ($parameter->isArray()) {
+                    $typeHint = 'array ';
+                } elseif ((defined('HHVM_VERSION') || version_compare(PHP_VERSION, '5.4.0', '>='))
+                          && $parameter->isCallable()) {
+                    $typeHint = 'callable ';
+                } else {
+                    try {
+                        $class = $parameter->getClass();
+                    } catch (ReflectionException $e) {
+                        throw new PHPUnit_Framework_MockObject_RuntimeException(
+                          sprintf(
+                            'Cannot mock %s::%s() because a class or ' .
+                            'interface used in the signature is not loaded',
+                            $method->getDeclaringClass()->getName(),
+                            $method->getName()
+                          ),
+                          0,
+                          $e
+                        );
+                    }
+
+                    if ($class !== NULL) {
+                        $typeHint = $class->getName() . ' ';
+                    }
+                }
+
+                if ($parameter->isDefaultValueAvailable()) {
+                    $value   = $parameter->getDefaultValue();
+                    $default = ' = ' . var_export($value, TRUE);
+                } elseif ($parameter->isOptional()) {
+                    $default = ' = null';
+                }
+            }
+
+            if ($parameter->isPassedByReference()) {
+                $reference = '&';
+            }
+
+            $parameters[] = $typeHint . $reference . $name . $default;
+        }
+
+        return join(', ', $parameters);
+    }
+
+    /**
+     * @param  ReflectionClass $class
+     * @return boolean
+     * @since  Method available since Release 2.0.8
+     */
+    private function isInternalClass(ReflectionClass $class)
+    {
+        while ($class) {
+            if ($class->isInternal()) {
+                return true;
+            }
+
+            $class = $class->getParentClass();
+        }
+
+        return false;
+    }
+
+    /**
+     * @return boolean
+     * @since  Method available since Release 2.0.9
+     */
+    private function unserializeHackIsSupported()
+    {
+        if (PHP_VERSION == '5.4.29' || PHP_VERSION == '5.5.13' ||
+            version_compare(PHP_VERSION, '5.6.0', '>=')) {
+            return FALSE;
+        }
+
+        return TRUE;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist
new file mode 100644
index 0000000000000000000000000000000000000000..a9a94cd07c213577d2224b5eb014f78d4d6554eb
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class.tpl.dist
@@ -0,0 +1,36 @@
+{prologue}{class_declaration}
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+{clone}{mocked_methods}
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+{method}
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}{epilogue}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist
new file mode 100644
index 0000000000000000000000000000000000000000..9e29c0d5c7f78c2a24cd8ba5a25bfc1127a1788c
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_class_method.tpl.dist
@@ -0,0 +1,7 @@
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_clone.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_clone.tpl.dist
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_clone.tpl.dist
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_object_method.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/mocked_object_method.tpl.dist
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_method.tpl.dist
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
new file mode 100644
index 0000000000000000000000000000000000000000..5454b2f39f476bd9b7697b2c0786609dd14b7819
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/mocked_static_method.tpl.dist
@@ -0,0 +1,5 @@
+
+    {modifier} function {reference}{method_name}({arguments_decl})
+    {
+        throw new PHPUnit_Framework_MockObject_BadMethodCallException;
+    }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist
new file mode 100644
index 0000000000000000000000000000000000000000..15e89bd6f4333a53b2b1ade700bc4a04ac5efa6f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/proxied_method.tpl.dist
@@ -0,0 +1,22 @@
+
+    {modifier} function {reference}{method_name}({arguments_decl})
+    {
+        $arguments = array({arguments_call});
+        $count     = func_num_args();
+
+        if ($count > {arguments_count}) {
+            $_arguments = func_get_args();
+
+            for ($i = {arguments_count}; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            '{class_name}', '{method_name}', $arguments, $this, {clone_arguments}
+          )
+        );
+
+        return call_user_func_array(array($this->__phpunit_originalObject, "{method_name}"), $arguments);
+    }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist
new file mode 100644
index 0000000000000000000000000000000000000000..4143b0f66affadc7ac31dd8eef4a2b5e46476189
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/trait_class.tpl.dist
@@ -0,0 +1,4 @@
+{prologue}class {class_name}
+{
+    use {trait_name};
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/unmocked_clone.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/unmocked_clone.tpl.dist
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/unmocked_clone.tpl.dist
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/wsdl_class.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist
similarity index 71%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/wsdl_class.tpl.dist
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist
index 05ad1d78695871bcc25c99a921c0fa1af16bf273..cc69fd341cc30eefb06066bcd5743ffd6632641a 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/wsdl_class.tpl.dist
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_class.tpl.dist
@@ -1,6 +1,4 @@
-{namespace}
-
-class {class_name} extends \SOAPClient
+{namespace}class {class_name} extends \SoapClient
 {
     public function __construct($wsdl, array $options)
     {
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/wsdl_method.tpl.dist b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Generator/wsdl_method.tpl.dist
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator/wsdl_method.tpl.dist
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php
similarity index 86%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php
index d044b24a0d7b20140c1800ba172f022221638284..992b927a7ac47ae12cd3480e889c7f3a23c94a95 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Interface for invocations.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Object.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php
similarity index 89%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Object.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php
index 1a608087c2a261b91b7a4283bf5267a9b926c903..6cb98e7076142056f91c682f239c3d71025341b3 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Object.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Represents a non-static invocation.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Static.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php
similarity index 91%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Static.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php
index 58bc643e3325a0db08f157517a008b0991f3491f..862367a0f367b506bddda1b8ebcd6790a8687344 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invocation/Static.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,19 +35,21 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
  */
 
+use SebastianBergmann\Exporter\Exporter;
+
 /**
  * Represents a static invocation.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -123,6 +125,8 @@ public function __construct($className, $methodName, array $parameters, $cloneOb
      */
     public function toString()
     {
+        $exporter = new Exporter;
+
         return sprintf(
           "%s::%s(%s)",
 
@@ -131,7 +135,7 @@ public function toString()
           join(
             ', ',
             array_map(
-              array('PHPUnit_Util_Type', 'shortenedExport'),
+              array($exporter, 'shortenedExport'),
               $this->parameters
             )
           )
@@ -179,9 +183,7 @@ protected function cloneObject($original)
         if ($cloneable) {
             try {
                 return clone $original;
-            }
-
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 return $original;
             }
         } else {
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/InvocationMocker.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php
similarity index 89%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/InvocationMocker.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php
index d2803ab23055c13025c9ee3c112b383ddf9cf32a..ac407207ff09cc1f122008d270feb72fb13228c4 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/InvocationMocker.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -50,8 +50,8 @@
  * identifications for builders.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -82,12 +82,8 @@ public function addMatcher(PHPUnit_Framework_MockObject_Matcher_Invocation $matc
      */
     public function hasMatchers()
     {
-        if (empty($this->matchers)) {
-            return FALSE;
-        }
-
         foreach ($this->matchers as $matcher) {
-            if (!$matcher instanceof PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount) {
+            if ($matcher->hasMatchers()) {
                 return TRUE;
             }
         }
@@ -96,7 +92,7 @@ public function hasMatchers()
     }
 
     /**
-     * @param  mixed $id
+     * @param  mixed        $id
      * @return boolean|null
      */
     public function lookupId($id)
@@ -125,7 +121,7 @@ public function registerId($id, PHPUnit_Framework_MockObject_Builder_Match $buil
     }
 
     /**
-     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation $matcher
+     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation       $matcher
      * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
@@ -160,9 +156,7 @@ public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
                         $hasReturnValue = TRUE;
                     }
                 }
-            }
-
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 $exception = $e;
             }
         }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invokable.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php
similarity index 84%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invokable.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php
index 5286a2e96ba2dee62da889534234e87261ea89f2..e02b2c29e81d6af2bc6ae3de338f85422ec12c1e 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Invokable.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -49,8 +49,8 @@
  * of this class.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -63,7 +63,7 @@ interface PHPUnit_Framework_MockObject_Invokable extends PHPUnit_Framework_MockO
      * expectations or matched against stubs.
      *
      * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *         The invocation object passed from mock object.
+     *                                                             The invocation object passed from mock object.
      * @return object
      */
     public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
@@ -72,7 +72,7 @@ public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
      * Checks if the invocation matches.
      *
      * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *         The invocation object passed from mock object.
+     *                                                             The invocation object passed from mock object.
      * @return boolean
      */
     public function matches(PHPUnit_Framework_MockObject_Invocation $invocation);
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php
similarity index 89%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php
index 01c569af4a4c3a3b6715405bf05a8e93fdbd26c7..219c0d02bb50279cd003f7d3d136584083781a27 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -52,8 +52,8 @@
  * All properties are public so that they can easily be accessed by the builder.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -174,9 +174,7 @@ public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
                 !$this->parametersMatcher->matches($invocation)) {
                 $this->parametersMatcher->verify();
             }
-        }
-
-        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
             throw new PHPUnit_Framework_ExpectationFailedException(
               sprintf(
                 "Expectation failed for %s when %s\n%s",
@@ -246,9 +244,7 @@ public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
             if (!$this->methodNameMatcher->matches($invocation)) {
                 return FALSE;
             }
-        }
-
-        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
             throw new PHPUnit_Framework_ExpectationFailedException(
               sprintf(
                 "Expectation failed for %s when %s\n%s",
@@ -288,21 +284,33 @@ public function verify()
             }
 
             $invocationIsAny = get_class($this->invocationMatcher) === 'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount';
-            if (!$invocationIsAny) {
+            $invocationIsNever = get_class($this->invocationMatcher) === 'PHPUnit_Framework_MockObject_Matcher_InvokedCount' && $this->invocationMatcher->isNever();
+            if (!$invocationIsAny && !$invocationIsNever) {
                 $this->parametersMatcher->verify();
             }
-        }
-
-        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
             throw new PHPUnit_Framework_ExpectationFailedException(
               sprintf(
                 "Expectation failed for %s when %s.\n%s",
 
                 $this->methodNameMatcher->toString(),
                 $this->invocationMatcher->toString(),
-                $e->getMessage()
+                PHPUnit_Framework_TestFailure::exceptionToString($e)
               )
             );
         }
     }
+
+    /**
+     * @since Method available since Release 1.2.4
+     */
+    public function hasMatchers()
+    {
+        if ($this->invocationMatcher !== NULL &&
+            !$this->invocationMatcher instanceof PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount) {
+            return TRUE;
+        }
+
+        return FALSE;
+    }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyInvokedCount.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php
similarity index 88%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyInvokedCount.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php
index 8c1ce608f74b1af2bfee3d1a16cfc2cdbb8051b4..cf066da8266cfff0da169b5378b08d26057437de 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyInvokedCount.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -47,8 +47,8 @@
  * times. This matcher will always match.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyParameters.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php
similarity index 88%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyParameters.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php
index a06d420c321aa2de07def5a81a2b361661dff5d7..5a0e11b1367562bb3c0a6896ae8e7ab4f7a01193 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/AnyParameters.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Invocation matcher which allos any parameters to a method.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f17225a398a143066092fb2ef9c1059d34525f2
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ */
+
+/**
+ * Invocation matcher which looks for sets of specific parameters in the invocations.
+ *
+ * Checks the parameters of the incoming invocations, the parameter list is
+ * checked against the defined constraints in $parameters. If the constraint
+ * is met it will return true in matches().
+ *
+ * It takes a list of match groups and and increases a call index after each invocation.
+ * So the first invocation uses the first group of constraints, the second the next and so on.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
+ */
+class PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters
+  extends PHPUnit_Framework_MockObject_Matcher_StatelessInvocation
+{
+
+  /**
+   * @var array
+   */
+  private $_parameterGroups = array();
+
+  /**
+   * @var array
+   */
+  private $_invocations = array();
+
+  /**
+   * @param array $parameterGroups
+   */
+  public function __construct(array $parameterGroups)
+  {
+      foreach ($parameterGroups as $index => $parameters) {
+          foreach ($parameters as $parameter) {
+              if (!($parameter instanceof \PHPUnit_Framework_Constraint))
+              {
+                  $parameter = new \PHPUnit_Framework_Constraint_IsEqual($parameter);
+              }
+              $this->_parameterGroups[$index][] = $parameter;
+          }
+      }
+  }
+
+    /**
+     * @return string
+     */
+    public function toString()
+    {
+        $text = 'with consecutive parameters';
+
+        return $text;
+    }
+
+  /**
+   * @param PHPUnit_Framework_MockObject_Invocation $invocation
+   * @return bool
+   */
+  public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
+  {
+      $this->_invocations[] = $invocation;
+      $callIndex = count($this->_invocations) - 1;
+      $this->verifyInvocation($invocation, $callIndex);
+      return FALSE;
+  }
+
+  public function verify()
+  {
+      foreach ($this->_invocations as $callIndex => $invocation) {
+        $this->verifyInvocation($invocation, $callIndex);
+      }
+  }
+
+  /**
+   * Verify a single invocation
+   *
+   * @param PHPUnit_Framework_MockObject_Invocation $invocation
+   * @param int $callIndex
+   * @throws PHPUnit_Framework_ExpectationFailedException
+   */
+  private function verifyInvocation(PHPUnit_Framework_MockObject_Invocation $invocation, $callIndex)
+  {
+
+      if (isset($this->_parameterGroups[$callIndex])) {
+          $parameters = $this->_parameterGroups[$callIndex];
+      }
+
+      if ($invocation === NULL) {
+          throw new PHPUnit_Framework_ExpectationFailedException(
+            'Mocked method does not exist.'
+          );
+      }
+
+      if (count($invocation->parameters) < count($parameters)) {
+          throw new PHPUnit_Framework_ExpectationFailedException(
+              sprintf(
+                'Parameter count for invocation %s is too low.',
+                $invocation->toString()
+              )
+          );
+      }
+
+      foreach ($parameters as $i => $parameter) {
+          $parameter->evaluate(
+              $invocation->parameters[$i],
+              sprintf(
+                'Parameter %s for invocation #%d %s does not match expected ' .
+                'value.',
+                $i,
+                $callIndex,
+                $invocation->toString()
+              )
+          );
+      }
+  }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Invocation.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php
similarity index 82%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Invocation.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php
index 59b30be862e06b3a45338c48f91d0865fda7db2d..7891a7b491b3d80b1481fe7536f06a5c6315b37d 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Invocation.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -47,8 +47,8 @@
  * method name, argument, order or call count.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -68,8 +68,8 @@ interface PHPUnit_Framework_MockObject_Matcher_Invocation extends PHPUnit_Framew
      * If the matcher is a stub it will also have a return value.
      *
      * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *         Object containing information on a mocked or stubbed method which
-     *         was invoked.
+     *                                                             Object containing information on a mocked or stubbed method which
+     *                                                             was invoked.
      * @return mixed
      */
     public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation);
@@ -80,8 +80,8 @@ public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation);
      * expectation is met.
      *
      * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *         Object containing information on a mocked or stubbed method which
-     *         was invoked.
+     *                                                             Object containing information on a mocked or stubbed method which
+     *                                                             was invoked.
      * @return bool
      */
     public function matches(PHPUnit_Framework_MockObject_Invocation $invocation);
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtIndex.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php
similarity index 92%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtIndex.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php
index cf969b772c79cc54a8815bdb8c911ae8dab4e777..0d3a8e8970ed03c86494a43dcc68427cc149c61e 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtIndex.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -53,8 +53,8 @@
  * If the index is never reached it will throw an exception in index.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtLeastOnce.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
similarity index 90%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
index 1fb89ad22305292cc2103072994ed78fe64ef056..5b4d36f2102737b7575302c68aa438169a531a3c 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -49,8 +49,8 @@
  * If the number of invocations is 0 it will throw an exception in verify.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedCount.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php
similarity index 89%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedCount.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php
index e5948cc9fcd93becba5c98e7e316197cea43540d..848f420e2cb0f5749973de04c7faf0ef0964ed82 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedCount.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -51,8 +51,8 @@
  * exception.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -66,13 +66,21 @@ class PHPUnit_Framework_MockObject_Matcher_InvokedCount extends PHPUnit_Framewor
     protected $expectedCount;
 
     /**
-     * @param interger $expectedCount
+     * @param integer $expectedCount
      */
     public function __construct($expectedCount)
     {
         $this->expectedCount = $expectedCount;
     }
 
+    /**
+     * @return boolean
+     */
+    public function isNever()
+    {
+        return $this->expectedCount == 0;
+    }
+
     /**
      * @return string
      */
@@ -82,7 +90,7 @@ public function toString()
     }
 
     /**
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
+     * @param  PHPUnit_Framework_MockObject_Invocation      $invocation
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
     public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedRecorder.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php
similarity index 91%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedRecorder.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php
index 146a277c67b2bc13544dd136ecfb458c5db54c26..9a34516472bc9cb0a5202177fd9e58be21e3b306 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/InvokedRecorder.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -49,8 +49,8 @@
  * number of times an invocation has occured.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/MethodName.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php
similarity index 91%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/MethodName.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php
index b889e3ee0e1aa44667ee9e75581f6de9fe5978bb..8b9ec10dcba4ab5d2f9b6e1ac07c6be8af0bfddd 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/MethodName.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -50,8 +50,8 @@
  * true in matches().
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Parameters.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php
similarity index 88%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Parameters.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php
index e3284a41a61da7dd6ed7eb052c30789e53f1eb69..90abaa59c8ad5693a59f1e291ecd45c49b98377b 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/Parameters.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -50,8 +50,8 @@
  * is met it will return true in matches().
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -110,9 +110,7 @@ public function toString()
     public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
     {
         $this->invocation = $invocation;
-        $this->verify();
-
-        return count($invocation->parameters) < count($this->parameters);
+        return $this->verify();
     }
 
     /**
@@ -120,9 +118,9 @@ public function matches(PHPUnit_Framework_MockObject_Invocation $invocation)
      * does the matcher will get the invoked() method called which should check
      * if an expectation is met.
      *
-     * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *         Object containing information on a mocked or stubbed method which
-     *         was invoked.
+     * @param  PHPUnit_Framework_MockObject_Invocation      $invocation
+     *                                                                  Object containing information on a mocked or stubbed method which
+     *                                                                  was invoked.
      * @return bool
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
@@ -156,5 +154,7 @@ public function verify()
               )
             );
         }
+
+        return true;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/StatelessInvocation.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php
similarity index 82%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/StatelessInvocation.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php
index 2f914470418780c50f3db32a2e0c360a4d303a0b..3d0283ee07c113a564afb137e40efd94272f3a93 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Matcher/StatelessInvocation.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -50,8 +50,8 @@
  * state but only the current run-time value of the invocation itself.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -72,8 +72,8 @@ abstract class PHPUnit_Framework_MockObject_Matcher_StatelessInvocation implemen
      * If the matcher is a stub it will also have a return value.
      *
      * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *         Object containing information on a mocked or stubbed method which
-     *         was invoked.
+     *                                                             Object containing information on a mocked or stubbed method which
+     *                                                             was invoked.
      * @return mixed
      */
     public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
@@ -86,8 +86,8 @@ public function invoked(PHPUnit_Framework_MockObject_Invocation $invocation)
      * expectation is met.
      *
      * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *         Object containing information on a mocked or stubbed method which
-     *         was invoked.
+     *                                                             Object containing information on a mocked or stubbed method which
+     *                                                             was invoked.
      * @return bool
      */
     public function verify()
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockBuilder.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php
similarity index 71%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockBuilder.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php
index 0aa569dc30c97707049d3d65ff969e6e5d8f4843..3ff865567c821443a79b194fdad07147656904ba 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockBuilder.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHPUnit_MockObject
  * @author     Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -48,8 +48,8 @@
  *
  * @package    PHPUnit_MockObject
  * @author     Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -59,56 +59,66 @@ class PHPUnit_Framework_MockObject_MockBuilder
     /**
      * @var PHPUnit_Framework_TestCase
      */
-    protected $testCase;
+    private $testCase;
 
     /**
      * @var string
      */
-    protected $className;
+    private $type;
 
     /**
      * @var array
      */
-    protected $methods = array();
+    private $methods = array();
 
     /**
      * @var string
      */
-    protected $mockClassName = '';
+    private $mockClassName = '';
 
     /**
      * @var array
      */
-    protected $constructorArgs = array();
+    private $constructorArgs = array();
 
     /**
      * @var boolean
      */
-    protected $originalConstructor = TRUE;
+    private $originalConstructor = TRUE;
 
     /**
      * @var boolean
      */
-    protected $originalClone = TRUE;
+    private $originalClone = TRUE;
 
     /**
      * @var boolean
      */
-    protected $autoload = TRUE;
+    private $autoload = TRUE;
 
     /**
      * @var boolean
      */
-    protected $cloneArguments = FALSE;
+    private $cloneArguments = FALSE;
 
     /**
-     * @param PHPUnit_Framework_TestCase
-     * @param string
+     * @var boolean
+     */
+    private $callOriginalMethods = FALSE;
+
+    /**
+     * @var object
+     */
+    private $proxyTarget = NULL;
+
+    /**
+     * @param PHPUnit_Framework_TestCase $testCase
+     * @param array|string               $type
      */
-    public function __construct(PHPUnit_Framework_TestCase $testCase, $className)
+    public function __construct(PHPUnit_Framework_TestCase $testCase, $type)
     {
-        $this->testCase  = $testCase;
-        $this->className = $className;
+        $this->testCase = $testCase;
+        $this->type     = $type;
     }
 
     /**
@@ -119,14 +129,16 @@ public function __construct(PHPUnit_Framework_TestCase $testCase, $className)
     public function getMock()
     {
         return $this->testCase->getMock(
-          $this->className,
+          $this->type,
           $this->methods,
           $this->constructorArgs,
           $this->mockClassName,
           $this->originalConstructor,
           $this->originalClone,
           $this->autoload,
-          $this->cloneArguments
+          $this->cloneArguments,
+          $this->callOriginalMethods,
+          $this->proxyTarget
         );
     }
 
@@ -138,7 +150,26 @@ public function getMock()
     public function getMockForAbstractClass()
     {
         return $this->testCase->getMockForAbstractClass(
-          $this->className,
+          $this->type,
+          $this->constructorArgs,
+          $this->mockClassName,
+          $this->originalConstructor,
+          $this->originalClone,
+          $this->autoload,
+          $this->methods,
+          $this->cloneArguments
+        );
+    }
+
+    /**
+     * Creates a mock object for a trait using a fluent interface.
+     *
+     * @return PHPUnit_Framework_MockObject_MockObject
+     */
+    public function getMockForTrait()
+    {
+        return $this->testCase->getMockForTrait(
+          $this->type,
           $this->constructorArgs,
           $this->mockClassName,
           $this->originalConstructor,
@@ -152,7 +183,7 @@ public function getMockForAbstractClass()
     /**
      * Specifies the subset of methods to mock. Default is to mock all of them.
      *
-     * @param  array|null $methods
+     * @param  array|null                               $methods
      * @return PHPUnit_Framework_MockObject_MockBuilder
      */
     public function setMethods($methods)
@@ -165,7 +196,7 @@ public function setMethods($methods)
     /**
      * Specifies the arguments for the constructor.
      *
-     * @param  array $args
+     * @param  array                                    $args
      * @return PHPUnit_Framework_MockObject_MockBuilder
      */
     public function setConstructorArgs(array $args)
@@ -178,7 +209,7 @@ public function setConstructorArgs(array $args)
     /**
      * Specifies the name for the mock class.
      *
-     * @param string $name
+     * @param  string                                   $name
      * @return PHPUnit_Framework_MockObject_MockBuilder
      */
     public function setMockClassName($name)
@@ -288,4 +319,45 @@ public function enableArgumentCloning()
 
         return $this;
     }
+
+    /**
+     * Enables the invocation of the original methods.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 2.0.0
+     */
+    public function enableProxyingToOriginalMethods()
+    {
+        $this->callOriginalMethods = TRUE;
+
+        return $this;
+    }
+
+    /**
+     * Disables the invocation of the original methods.
+     *
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 2.0.0
+     */
+    public function disableProxyingToOriginalMethods()
+    {
+        $this->callOriginalMethods = FALSE;
+        $this->proxyTarget         = NULL;
+
+        return $this;
+    }
+
+    /**
+     * Sets the proxy target.
+     *
+     * @param  object                                   $object
+     * @return PHPUnit_Framework_MockObject_MockBuilder
+     * @since  Method available since Release 2.0.0
+     */
+    public function setProxyTarget($object)
+    {
+        $this->proxyTarget = $object;
+
+        return $this;
+    }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockObject.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php
similarity index 78%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockObject.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php
index f60fa70a3c65e9027e73bb341cb8f69ac3a1118c..f7534b38362db9bb81575f1b72482c4b6818c6b9 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/MockObject.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -47,8 +47,8 @@
  * PHPUnit_Framework_MockObject_Mock.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -60,29 +60,21 @@ interface PHPUnit_Framework_MockObject_MockObject /*extends PHPUnit_Framework_Mo
      * Registers a new expectation in the mock object and returns the match
      * object which can be infused with further details.
      *
-     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation $matcher
+     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation       $matcher
      * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
      */
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher);
 
-    /**
-     * Registers a new static expectation in the mock object and returns the
-     * match object which can be infused with further details.
-     *
-     * @param  PHPUnit_Framework_MockObject_Matcher_Invocation $matcher
-     * @return PHPUnit_Framework_MockObject_Builder_InvocationMocker
-     */
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher);
-
     /**
      * @return PHPUnit_Framework_MockObject_InvocationMocker
+     * @since  Method available since Release 2.0.0
      */
-    public function __phpunit_getInvocationMocker();
+    public function __phpunit_setOriginalObject($originalObject);
 
     /**
      * @return PHPUnit_Framework_MockObject_InvocationMocker
      */
-    public static function __phpunit_getStaticInvocationMocker();
+    public function __phpunit_getInvocationMocker();
 
     /**
      * Verifies that the current expectation is valid. If everything is OK the
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php
similarity index 83%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php
index 56555bfce80ee3d9d4fe95c4466db66b7be13fe5..ca8f26279b3349290f9e498b82702c48be4fb225 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -49,8 +49,8 @@
  * specific value instead of the original value.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -63,8 +63,8 @@ interface PHPUnit_Framework_MockObject_Stub extends PHPUnit_Framework_SelfDescri
      * specific value.
      *
      * @param  PHPUnit_Framework_MockObject_Invocation $invocation
-     *         The invocation which was mocked and matched by the current method
-     *         and argument matchers.
+     *                                                             The invocation which was mocked and matched by the current method
+     *                                                             and argument matchers.
      * @return mixed
      */
     public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation);
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php
similarity index 88%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php
index 9f54bdd9165dcefdcf7f5bcfff8a8e3fc6da4ccf..10563c187d2bc5416f12d29f35e0d8e25b1387d8 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHPUnit_MockObject
  * @author     Patrick Müller <elias0@gmx.net>
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -48,8 +48,8 @@
  *
  * @package    PHPUnit_MockObject
  * @author     Patrick Müller <elias0@gmx.net>
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -81,7 +81,7 @@ public function toString()
         return sprintf(
           'return user-specified value %s',
 
-          PHPUnit_Util_Type::toString($this->value)
+          PHPUnit_Util_Type::export($this->value)
         );
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Exception.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php
similarity index 87%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Exception.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php
index dc8152cdbc184d6680cea9a87140600f871e1768..1a4d476c550ebdd92805a652c9639fd7788f8170 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Exception.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,8 @@
  *
  * @package    PHPUnit_MockObject
  * @author     Oliver Schlicht <o.schlicht@bitExpert.de>
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -48,8 +48,8 @@
  *
  * @package    PHPUnit_MockObject
  * @author     Oliver Schlicht <o.schlicht@bitExpert.de>
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -74,7 +74,7 @@ public function toString()
         return sprintf(
           'raise user-specified exception %s',
 
-          PHPUnit_Util_Type::toString($this->exception)
+          PHPUnit_Util_Type::export($this->exception)
         );
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/MatcherCollection.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php
similarity index 85%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/MatcherCollection.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php
index 2040fd5a5d43f8551394e42b07a8f310300fae0b..cfdd6b778baab0265432ac1eea6f75b09a3c7a99 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/MatcherCollection.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Stubs a method by returning a user-defined value.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -60,7 +60,7 @@ interface PHPUnit_Framework_MockObject_Stub_MatcherCollection
      * or a stub.
      *
      * @param PHPUnit_Framework_MockObject_Matcher_Invocation $matcher
-     *        Matcher for invocations to mock objects.
+     *                                                                 Matcher for invocations to mock objects.
      */
     public function addMatcher(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher);
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Return.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php
similarity index 87%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Return.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php
index c67353696f0605daa1603d969095cb54fb2555c0..9ef71ef65eb9e6079ec703eee3e69dc7497924cf 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/Return.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Stubs a method by returning a user-defined value.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
@@ -72,7 +72,7 @@ public function toString()
         return sprintf(
           'return user-specified value %s',
 
-          PHPUnit_Util_Type::toString($this->value)
+          PHPUnit_Util_Type::export($this->value)
         );
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnArgument.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php
similarity index 89%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnArgument.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php
index d5b668c4329c155bd5043e124b65a56250beb047..68f6564c3664f8c921e9cbb3036ee6f4684ce00c 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnArgument.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Stubs a method by returning an argument that was passed to the mocked method.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnCallback.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php
similarity index 90%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnCallback.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php
index 282fd35d124d36b55be2a066e7b37cfff74a8203..a093abf1df1e8119e8a0b5b5550b4770d980c53f 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnCallback.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  *
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php
similarity index 89%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php
index 66959447f84715c5e5bfd2ce4508a866a875c836..b24bdb537e506a11e3ea64089c2c60cb2184bba9 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,9 +35,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Kris Wallsmith <kris.wallsmith@gmail.com>
- * @copyright  2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2010 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.1.0
@@ -47,9 +47,9 @@
  * Stubs a method by returning the current object.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Kris Wallsmith <kris.wallsmith@gmail.com>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php
similarity index 89%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php
index f743fdee524eb59f2e3ba2eee20782ad0e39b767..36e82c667096334264c0aae066750ff487286def 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.1.0
@@ -46,8 +46,8 @@
  * Stubs a method by returning a value from a map.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Verifiable.php b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php
similarity index 88%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Verifiable.php
rename to core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php
index 9c70ba79192f6f1b4fd2f06cb2d7b536c6508f23..21ccbf48ae315e7533355ce9201d54ed725d5fe2 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Verifiable.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,8 +35,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
@@ -46,8 +46,8 @@
  * Interface for classes which must verify a given expectation.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php b/core/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..6663ab46143cf949bc034d38406f5ebb060e5c96
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/GeneratorTest.php
@@ -0,0 +1,142 @@
+<?php
+class Framework_MockObject_GeneratorTest extends PHPUnit_Framework_TestCase
+{
+    protected $generator;
+
+    protected function setUp()
+    {
+        $this->generator = new PHPUnit_Framework_MockObject_Generator;
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMock
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetMockFailsWhenInvalidFunctionNameIsPassedInAsAFunctionToMock()
+    {
+        $this->generator->getMock('StdClass', array(0));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMock
+     */
+    public function testGetMockCanCreateNonExistingFunctions()
+    {
+        $mock = $this->generator->getMock('StdClass', array('testFunction'));
+        $this->assertTrue(method_exists($mock, 'testFunction'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMock
+     * @expectedException PHPUnit_Framework_MockObject_RuntimeException
+     * @expectedExceptionMessage duplicates: "foo, foo"
+     */
+    public function testGetMockGeneratorFails()
+    {
+        $mock = $this->generator->getMock('StdClass', array('foo', 'foo'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassDoesNotFailWhenFakingInterfaces()
+    {
+        $mock = $this->generator->getMockForAbstractClass('Countable');
+        $this->assertTrue(method_exists($mock, 'count'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassStubbingAbstractClass()
+    {
+        $mock = $this->generator->getMockForAbstractClass('AbstractMockTestClass');
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassWithNonExistentMethods()
+    {
+        $mock = $this->generator->getMockForAbstractClass(
+            'AbstractMockTestClass', array(), '',  true,
+            true, true, array('nonexistentMethod')
+        );
+
+        $this->assertTrue(method_exists($mock, 'nonexistentMethod'));
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     */
+    public function testGetMockForAbstractClassShouldCreateStubsOnlyForAbstractMethodWhenNoMethodsWereInformed()
+    {
+        $mock = $this->generator->getMockForAbstractClass('AbstractMockTestClass');
+
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturn('testing');
+
+        $this->assertEquals('testing', $mock->doSomething());
+        $this->assertEquals(1, $mock->returnAnything());
+    }
+
+    /**
+     * @dataProvider getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetMockForAbstractClassExpectingInvalidArgumentException($className, $mockClassName)
+    {
+        $mock = $this->generator->getMockForAbstractClass($className, array(), $mockClassName);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass
+     * @expectedException PHPUnit_Framework_MockObject_RuntimeException
+     */
+    public function testGetMockForAbstractClassAnstractClassDoesNotExist()
+    {
+        $mock = $this->generator->getMockForAbstractClass('Tux');
+    }
+
+    /**
+     * Dataprovider for test "testGetMockForAbstractClassExpectingInvalidArgumentException"
+     */
+    public static function getMockForAbstractClassExpectsInvalidArgumentExceptionDataprovider()
+    {
+        return array(
+            'className not a string' => array(array(), ''),
+            'mockClassName not a string' => array('Countable', new StdClass),
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_MockObject_Generator::getMockForTrait
+     * @requires PHP 5.4.0
+     */
+    public function testGetMockForTraitWithNonExistentMethodsAndNonAbstractMethods()
+    {
+        $mock = $this->generator->getMockForTrait(
+            'AbstractTrait', array(), '',  true,
+            true, true, array('nonexistentMethod')
+        );
+
+        $this->assertTrue(method_exists($mock, 'nonexistentMethod'));
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+        $this->assertTrue($mock->mockableMethod());
+        $this->assertTrue($mock->anotherMockableMethod());
+    }
+
+    /**
+     * @covers   PHPUnit_Framework_MockObject_Generator::getMockForTrait
+     * @requires PHP 5.4.0
+     */
+    public function testGetMockForTraitStubbingAbstractMethod()
+    {
+        $mock = $this->generator->getMockForTrait('AbstractTrait');
+        $this->assertTrue(method_exists($mock, 'doSomething'));
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockBuilderTest.php b/core/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php
similarity index 91%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockBuilderTest.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php
index 4acc2f47fe7a9b45e8d0e230bbcbc4d13f991fa7..c770e2a936f1da45b9b49f104056581de6c5d237 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockBuilderTest.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockBuilderTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,22 +36,18 @@
  *
  * @package    PHPUnit_MockObject
  * @author     Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Mockable.php';
-
 /**
  * @package    PHPUnit_MockObject
  * @author     Giorgio Sironi <piccoloprincipeazzurro@gmail.com>
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
  * @since      File available since Release 1.0.0
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/Invocation/ObjectTest.php b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php
similarity index 99%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/Invocation/ObjectTest.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php
index b28b1246f24058b2d7b516a55f82dd4c364629be..110ee75a341ba15490c2534b3589feb87e9fd484 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/Invocation/ObjectTest.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/ObjectTest.php
@@ -79,4 +79,3 @@ public function testConstructorAllowToSetFlagCloneObjectsInParameters()
         $this->assertNotSame($parameters, $invocation->parameters);
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/Invocation/StaticTest.php b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/Invocation/StaticTest.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Invocation/StaticTest.php
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d12ba5b969b8b423bf0725410c9e2e4825e2ac45
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/Matcher/ConsecutiveParametersTest.php
@@ -0,0 +1,32 @@
+<?php
+class Framework_MockObject_Matcher_ConsecutiveParametersTest extends PHPUnit_Framework_TestCase
+{
+    public function testIntegration()
+    {
+        $mock = $this->getMock('stdClass', array('foo'));
+        $mock
+            ->expects($this->any())
+            ->method('foo')
+            ->withConsecutive(
+                array('bar'),
+                array(21, 42)
+            );
+        $mock->foo('bar');
+        $mock->foo(21, 42);
+    }
+
+    public function testIntegrationExpectingException()
+    {
+        $mock = $this->getMock('stdClass', array('foo'));
+        $mock
+            ->expects($this->any())
+            ->method('foo')
+            ->withConsecutive(
+                array('bar'),
+                array(21, 42)
+            );
+        $mock->foo('bar');
+        $this->setExpectedException('PHPUnit_Framework_ExpectationFailedException');
+        $mock->foo('invalid');
+    }
+}
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt
similarity index 69%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt
index bdeecb845ad7d5a76caf4c7d6a3254fd5e5a66d6..2e40328c717c38bf28f36cdcd56beccfe7b24ad4 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class.phpt
@@ -13,9 +13,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -28,8 +30,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -85,9 +87,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -99,30 +108,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_call_parent_clone.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt
similarity index 53%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_call_parent_clone.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt
index 784031f825e654dce4e0491b3a505d68df9d8b13..0f91a986608f883e28dbc47f628ea71838f42b5a 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_call_parent_clone.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_clone.phpt
@@ -9,10 +9,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -24,8 +25,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -38,9 +39,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -52,31 +60,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_call_parent_constructor.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt
similarity index 52%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_call_parent_constructor.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt
index f9c1040154e99bf5af1c253fe73ccbd4f926ac53..6f037ee229b35e3eac2a7b8c08650ae9bf8263c2 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_call_parent_constructor.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_call_parent_constructor.phpt
@@ -9,10 +9,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -24,8 +25,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -37,9 +38,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -51,31 +59,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_dont_call_parent_clone.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt
similarity index 52%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_dont_call_parent_clone.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt
index 5d337bc421bb68459ee0b74cdcb88114acbf2a19..dc829389187456cd9945b1049798d57bc8b39629 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_dont_call_parent_clone.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_clone.phpt
@@ -9,10 +9,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -24,8 +25,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -37,9 +38,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -51,31 +59,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_dont_call_parent_constructor.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt
similarity index 52%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_dont_call_parent_constructor.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt
index f9c1040154e99bf5af1c253fe73ccbd4f926ac53..6f037ee229b35e3eac2a7b8c08650ae9bf8263c2 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_dont_call_parent_constructor.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_dont_call_parent_constructor.phpt
@@ -9,10 +9,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -24,8 +25,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -37,9 +38,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -51,31 +59,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
similarity index 54%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
index 66a2af86e5cec815809a9bc6e8b9fe56e2353cd2..cfc43d89238c47146d05ddc228a14c5899729558 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_call_parent_constructor.phpt
@@ -14,10 +14,11 @@ class Foo implements IFoo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -29,8 +30,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -42,9 +43,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -56,31 +64,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
similarity index 54%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
index 66a2af86e5cec815809a9bc6e8b9fe56e2353cd2..cfc43d89238c47146d05ddc228a14c5899729558 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt
@@ -14,10 +14,11 @@ class Foo implements IFoo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -29,8 +30,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -42,9 +43,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -56,31 +64,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_partial.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt
similarity index 63%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_partial.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt
index 0720b13fbb311122de67c5eebc956d24e5727e26..b8332aedf4218f4e54f964b7d251f131fb2cf4b7 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/class_partial.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_partial.phpt
@@ -13,10 +13,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array('bar'),
   'MockFoo',
@@ -29,8 +30,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -64,9 +65,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -78,30 +86,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt
similarity index 53%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt
index f5be8d25ce18061cbe8a999fc303365bb6860be3..6e1ddf638bdbbf00c04ad8ee81ada7b664db5b13 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/class_with_method_named_method.phpt
@@ -2,10 +2,18 @@
 PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
 --FILE--
 <?php
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+class Foo
+{
+    public function method()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -16,28 +24,46 @@ $mock = PHPUnit_Framework_MockObject_Generator::generate(
 print $mock['code'];
 ?>
 --EXPECTF--
-class Foo
-{
-}
-
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
         $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
     }
 
+    public function method()
+    {
+        $arguments = array();
+        $count     = func_num_args();
+
+        if ($count > 0) {
+            $_arguments = func_get_args();
+
+            for ($i = 0; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'method', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
     public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -49,30 +75,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/interface.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt
similarity index 62%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/interface.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt
index 6a4c84367075eb5704d315e9ebf7eeab7cc1a168..2d38209ef63e8fe6520f9c761b0fe6fa8e88bb00 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/interface.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/interface.phpt
@@ -7,10 +7,11 @@ interface Foo
     public function bar(Foo $foo);
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -23,8 +24,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -58,9 +59,16 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -72,30 +80,14 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/invocation_object_clone_object.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt
similarity index 69%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/invocation_object_clone_object.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt
index 685bf2e8146c2a9a11290682f9d35be499fc3d57..87a979e9fb2815aea0f602409bb0742e451cfcc6 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/invocation_object_clone_object.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/invocation_object_clone_object.phpt
@@ -13,10 +13,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'Foo',
   array(),
   'MockFoo',
@@ -30,8 +31,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -87,9 +88,16 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -101,30 +109,14 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt
similarity index 69%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt
index d63c4ceb372fc0126627d5185481985bb0d7686e..e30bddc09e5c3c9dbfc42d87e73ea4fdf11e611c 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class.phpt
@@ -15,10 +15,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -31,8 +32,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -88,9 +89,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -102,30 +110,14 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_call_parent_clone.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt
similarity index 53%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_call_parent_clone.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt
index 1531f1dea19aef7d4449d1007d8107413fc294f1..3dee9c91266542c4013f10d926e97e8913a79b49 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_call_parent_clone.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_clone.phpt
@@ -11,10 +11,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -26,8 +27,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -40,9 +41,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -54,31 +62,14 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_call_parent_constructor.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt
similarity index 53%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_call_parent_constructor.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt
index 20b3bb9b8e6e55b5e41cdef4c6be7bde558526f2..105a372bc96cdaab385bf15b614a0924e362e63e 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_call_parent_constructor.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_call_parent_constructor.phpt
@@ -11,10 +11,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -26,8 +27,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -39,9 +40,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -53,31 +61,14 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_dont_call_parent_clone.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
similarity index 53%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
index 1c800797662c214261ddf4b1ceef0f17cd93a92e..1de9253f83f78a6405d0d3ae29a028209d345f0c 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_clone.phpt
@@ -11,10 +11,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -26,8 +27,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -39,9 +40,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -53,31 +61,14 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
similarity index 53%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
index 20b3bb9b8e6e55b5e41cdef4c6be7bde558526f2..105a372bc96cdaab385bf15b614a0924e362e63e 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_dont_call_parent_constructor.phpt
@@ -11,10 +11,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -26,8 +27,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -39,9 +40,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -53,31 +61,14 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
similarity index 55%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
index ffee89775c8f523f9098903751ea4726b7532f97..6b9f6bcb5fa7f55c02c2a5317359089c93d8bd2e 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_call_parent_constructor.phpt
@@ -16,10 +16,11 @@ class Foo implements IFoo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -31,8 +32,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -44,9 +45,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -58,31 +66,14 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
similarity index 55%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
index ffee89775c8f523f9098903751ea4726b7532f97..6b9f6bcb5fa7f55c02c2a5317359089c93d8bd2e 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_implementing_interface_dont_call_parent_constructor.phpt
@@ -16,10 +16,11 @@ class Foo implements IFoo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -31,8 +32,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -44,9 +45,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -58,31 +66,14 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
-
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_partial.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt
similarity index 63%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_partial.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt
index 3bea847bb6d38d115b9ac5073f0bbfeaa029ce63..86fee1cb6073253e3b64519bbcbf86633d23f32b 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_class_partial.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_class_partial.phpt
@@ -15,10 +15,11 @@ class Foo
     }
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array('bar'),
   'MockFoo',
@@ -31,8 +32,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -66,9 +67,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -80,30 +88,14 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_interface.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt
similarity index 62%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_interface.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt
index 077ac08aa7cf7d22c11624cfd3fa06374d39f760..80486463307241eb9bdc6f3325bf042c87cfe2a2 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/namespaced_interface.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/namespaced_interface.phpt
@@ -9,10 +9,11 @@ interface Foo
     public function bar(Foo $foo);
 }
 
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = \PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new \PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -25,8 +26,8 @@ print $mock['code'];
 --EXPECTF--
 class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -60,9 +61,16 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -74,30 +82,14 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, NS\Foo
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..5dbb385248f4b4fcfc6e7762fe42c0097d27622f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class.phpt
@@ -0,0 +1,70 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class Foo
+{
+}
+
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class_with_namespace.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt
similarity index 53%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class_with_namespace.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt
index b6c8f54666322c83a54aeb24a2ed3fb999ec87f9..78689775ab71f1565796f04a603e27d29991d562 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class_with_namespace.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace.phpt
@@ -2,10 +2,11 @@
 PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
 --FILE--
 <?php
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   'NS\Foo',
   array(),
   'MockFoo',
@@ -28,8 +29,8 @@ namespace {
 
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -41,9 +42,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -55,31 +63,15 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
 
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
similarity index 53%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
index 2e0bfb2ba2ae5652ec27e4525c7ddc12d734e923..b59d1ddf99dfc61951769a3faa11aa2d27bd55a3 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/nonexistent_class_with_namespace_starting_with_separator.phpt
@@ -2,10 +2,11 @@
 PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
 --FILE--
 <?php
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-$mock = PHPUnit_Framework_MockObject_Generator::generate(
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
   '\NS\Foo',
   array(),
   'MockFoo',
@@ -28,8 +29,8 @@ namespace {
 
 class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
 {
-    private static $__phpunit_staticInvocationMocker;
     private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
 
     public function __clone()
     {
@@ -41,9 +42,16 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
-    public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
     {
-        return self::__phpunit_getStaticInvocationMocker()->expects($matcher);
+        $this->__phpunit_originalObject = $originalObject;
     }
 
     public function __phpunit_getInvocationMocker()
@@ -55,31 +63,15 @@ class MockFoo extends NS\Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_invocationMocker;
     }
 
-    public static function __phpunit_getStaticInvocationMocker()
-    {
-        if (self::$__phpunit_staticInvocationMocker === NULL) {
-            self::$__phpunit_staticInvocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
-        }
-
-        return self::$__phpunit_staticInvocationMocker;
-    }
-
     public function __phpunit_hasMatchers()
     {
-        return self::__phpunit_getStaticInvocationMocker()->hasMatchers() ||
-               $this->__phpunit_getInvocationMocker()->hasMatchers();
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
     }
 
     public function __phpunit_verify()
     {
-        self::__phpunit_getStaticInvocationMocker()->verify();
         $this->__phpunit_getInvocationMocker()->verify();
-    }
-
-    public function __phpunit_cleanup()
-    {
-        self::$__phpunit_staticInvocationMocker = NULL;
-        $this->__phpunit_invocationMocker       = NULL;
+        $this->__phpunit_invocationMocker = NULL;
     }
 }
 
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..f31bf3ffc24d3215a71bc3497160468d09d744b9
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/proxy.phpt
@@ -0,0 +1,117 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', NULL, 'ProxyFoo', TRUE, TRUE, TRUE, TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function bar(Foo $foo)
+    {
+    }
+
+    public function baz(Foo $foo)
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo', array(), 'ProxyFoo', TRUE, TRUE, TRUE, TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class ProxyFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function bar(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'bar', $arguments, $this, TRUE
+          )
+        );
+
+        return call_user_func_array(array($this->__phpunit_originalObject, "bar"), $arguments);
+    }
+
+    public function baz(Foo $foo)
+    {
+        $arguments = array($foo);
+        $count     = func_num_args();
+
+        if ($count > 1) {
+            $_arguments = func_get_args();
+
+            for ($i = 1; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'baz', $arguments, $this, TRUE
+          )
+        );
+
+        return call_user_func_array(array($this->__phpunit_originalObject, "baz"), $arguments);
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+        $this->__phpunit_invocationMocker = NULL;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt
similarity index 72%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt
index 52c9839efce9f56d423c965af4c6f626ae71c7b2..06b255f1e633bff8ce2a4a7221f6753ef23c3808 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class.phpt
@@ -6,31 +6,32 @@ if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
 ?>
 --FILE--
 <?php
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-print PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl(
-  dirname(dirname(__FILE__)) . '/_files/GoogleSearch.wsdl',
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+print $generator->generateClassFromWsdl(
+  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
   'GoogleSearch'
 );
 ?>
 --EXPECTF--
-class GoogleSearch extends \SOAPClient
+class GoogleSearch extends \SoapClient
 {
     public function __construct($wsdl, array $options)
     {
         parent::__construct('%s/GoogleSearch.wsdl', $options);
     }
 
-    public function doGetCachedPage($key, $url)
+    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
     {
     }
 
-    public function doSpellingSuggestion($key, $phrase)
+    public function doGetCachedPage($key, $url)
     {
     }
 
-    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
+    public function doSpellingSuggestion($key, $phrase)
     {
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class_namespace.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt
similarity index 73%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class_namespace.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt
index b3075c543a0d645bd5205767a31835e8f166e7bf..9460e6b440ed93bdad92c50aafecd56a26e0e1c2 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class_namespace.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_namespace.phpt
@@ -6,33 +6,34 @@ if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
 ?>
 --FILE--
 <?php
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-print PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl(
-  dirname(dirname(__FILE__)) . '/_files/GoogleSearch.wsdl',
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+print $generator->generateClassFromWsdl(
+  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
   'My\\Space\\GoogleSearch'
 );
 ?>
 --EXPECTF--
 namespace My\Space;
 
-class GoogleSearch extends \SOAPClient
+class GoogleSearch extends \SoapClient
 {
     public function __construct($wsdl, array $options)
     {
         parent::__construct('%s/GoogleSearch.wsdl', $options);
     }
 
-    public function doGetCachedPage($key, $url)
+    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
     {
     }
 
-    public function doSpellingSuggestion($key, $phrase)
+    public function doGetCachedPage($key, $url)
     {
     }
 
-    public function doGoogleSearch($key, $q, $start, $maxResults, $filter, $restrict, $safeSearch, $lr, $ie, $oe)
+    public function doSpellingSuggestion($key, $phrase)
     {
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class_partial.phpt b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt
similarity index 69%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class_partial.phpt
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt
index 4a69f266c057abd76279c00d52725446c0dc3adc..fc814bd1469661979966cb735c9935c82968fdd5 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObject/wsdl_class_partial.phpt
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObject/wsdl_class_partial.phpt
@@ -6,17 +6,18 @@ if (!extension_loaded('soap')) echo 'skip: SOAP extension is required';
 ?>
 --FILE--
 <?php
-require_once 'PHPUnit/Autoload.php';
-require_once 'Text/Template.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
-print PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl(
-  dirname(dirname(__FILE__)) . '/_files/GoogleSearch.wsdl',
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+print $generator->generateClassFromWsdl(
+  dirname(dirname(__FILE__)) . '/_fixture/GoogleSearch.wsdl',
   'GoogleSearch',
   array('doGoogleSearch')
 );
 ?>
 --EXPECTF--
-class GoogleSearch extends \SOAPClient
+class GoogleSearch extends \SoapClient
 {
     public function __construct($wsdl, array $options)
     {
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObjectTest.php b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
similarity index 64%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/MockObjectTest.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
index 7e8c5cf21807c1393b397cecd0d54ebf4d30d9eb..ec195f125a7984212259f4a73514a4efe2e63bab 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/MockObjectTest.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/MockObjectTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2010-2013, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,32 +35,21 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'AbstractMockTestClass.php';
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'AnInterface.php';
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'FunctionCallback.php';
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MethodCallback.php';
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MethodCallbackByReference.php';
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'PartialMockTestClass.php';
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'SomeClass.php';
-require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'StaticMockTestClass.php';
-
 /**
  *
  *
  * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Patrick Mueller <elias0@gmx.net>
  * @author     Frank Kleine <mikey@stubbles.net>
- * @copyright  2010-2013 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @version    Release: @package_version@
  * @link       http://www.phpunit.de/
@@ -75,6 +64,14 @@ public function testMockedMethodIsNeverCalled()
              ->method('doSomething');
     }
 
+    public function testMockedMethodIsNeverCalledWithParameter()
+    {
+        $mock = $this->getMock('SomeClass');
+        $mock->expects($this->never())
+            ->method('doSomething')
+            ->with('someArg');
+    }
+
     public function testMockedMethodIsNotCalledWhenExpectsAnyWithParameter()
     {
         $mock = $this->getMock('SomeClass');
@@ -83,6 +80,13 @@ public function testMockedMethodIsNotCalledWhenExpectsAnyWithParameter()
              ->with('someArg');
     }
 
+    public function testMockedMethodIsNotCalledWhenMethodSpecifiedDirectlyWithParameter()
+    {
+        $mock = $this->getMock('SomeClass');
+        $mock->method('doSomethingElse')
+            ->with('someArg');
+    }
+
     public function testMockedMethodIsCalledAtLeastOnce()
     {
         $mock = $this->getMock('AnInterface');
@@ -140,9 +144,23 @@ public function testStubbedException()
 
         try {
             $mock->doSomething();
+        } catch (Exception $e) {
+            return;
         }
 
-        catch (Exception $e) {
+        $this->fail();
+    }
+
+    public function testStubbedWillThrowException()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willThrowException(new Exception);
+
+        try {
+            $mock->doSomething();
+        } catch (Exception $e) {
             return;
         }
 
@@ -157,6 +175,13 @@ public function testStubbedReturnValue()
              ->will($this->returnValue('something'));
 
         $this->assertEquals('something', $mock->doSomething());
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturn('something');
+
+        $this->assertEquals('something', $mock->doSomething());
     }
 
     public function testStubbedReturnValueMap()
@@ -174,6 +199,32 @@ public function testStubbedReturnValueMap()
         $this->assertEquals('d', $mock->doSomething('a', 'b', 'c'));
         $this->assertEquals('h', $mock->doSomething('e', 'f', 'g'));
         $this->assertEquals(NULL, $mock->doSomething('foo', 'bar'));
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnMap($map);
+
+        $this->assertEquals('d', $mock->doSomething('a', 'b', 'c'));
+        $this->assertEquals('h', $mock->doSomething('e', 'f', 'g'));
+        $this->assertEquals(NULL, $mock->doSomething('foo', 'bar'));
+    }
+
+    public function testStubbedReturnArgument()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->returnArgument(1));
+
+        $this->assertEquals('b', $mock->doSomething('a', 'b'));
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnArgument(1);
+
+        $this->assertEquals('b', $mock->doSomething('a', 'b'));
     }
 
     public function testFunctionCallback()
@@ -184,6 +235,51 @@ public function testFunctionCallback()
              ->will($this->returnCallback('functionCallback'));
 
         $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
+
+        $mock = $this->getMock('SomeClass', array('doSomething'), array(), '', FALSE);
+        $mock->expects($this->once())
+             ->method('doSomething')
+             ->willReturnCallback('functionCallback');
+
+        $this->assertEquals('pass', $mock->doSomething('foo', 'bar'));
+    }
+
+    public function testStubbedReturnSelf()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->returnSelf());
+
+        $this->assertEquals($mock, $mock->doSomething());
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnSelf();
+
+        $this->assertEquals($mock, $mock->doSomething());
+    }
+
+    public function testStubbedReturnOnConsecutiveCalls()
+    {
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->will($this->onConsecutiveCalls('a', 'b', 'c'));
+
+        $this->assertEquals('a', $mock->doSomething());
+        $this->assertEquals('b', $mock->doSomething());
+        $this->assertEquals('c', $mock->doSomething());
+
+        $mock = $this->getMock('AnInterface');
+        $mock->expects($this->any())
+             ->method('doSomething')
+             ->willReturnOnConsecutiveCalls('a', 'b', 'c');
+
+        $this->assertEquals('a', $mock->doSomething());
+        $this->assertEquals('b', $mock->doSomething());
+        $this->assertEquals('c', $mock->doSomething());
     }
 
     public function testStaticMethodCallback()
@@ -278,47 +374,38 @@ public function testOriginalCloneSettingConsidered()
         $this->assertNotEquals(get_class($mock1), get_class($mock2));
     }
 
-    public function testStubbedReturnValueForStaticMethod()
+    public function testGetMockForAbstractClass()
     {
-        $this->getMockClass(
-          'StaticMockTestClass',
-          array('doSomething'),
-          array(),
-          'StaticMockTestClassMock'
-        );
-
-        StaticMockTestClassMock::staticExpects($this->any())
-          ->method('doSomething')
-          ->will($this->returnValue('something'));
-
-        $this->assertEquals(
-          'something', StaticMockTestClassMock::doSomething()
-        );
+        $mock = $this->getMock('AbstractMockTestClass');
+        $mock->expects($this->never())
+             ->method('doSomething');
     }
 
-    public function testStubbedReturnValueForStaticMethod2()
+    public function testGetMockForTraversableInterface()
     {
-        $this->getMockClass(
-          'StaticMockTestClass',
-          array('doSomething'),
-          array(),
-          'StaticMockTestClassMock2'
-        );
-
-        StaticMockTestClassMock2::staticExpects($this->any())
-          ->method('doSomething')
-          ->will($this->returnValue('something'));
+        $mock = $this->getMock('TraversableMockTestInterface');
+        $this->assertInstanceOf('Traversable', $mock);
+    }
 
-        $this->assertEquals(
-          'something', StaticMockTestClassMock2::doSomethingElse()
-        );
+    public function testMultipleInterfacesCanBeMockedInSingleObject()
+    {
+        $mock = $this->getMock(array('AnInterface', 'AnotherInterface'));
+        $this->assertInstanceOf('AnInterface', $mock);
+        $this->assertInstanceOf('AnotherInterface', $mock);
     }
 
-    public function testGetMockForAbstractClass()
+    /**
+     * @requires PHP 5.4.0
+     */
+    public function testGetMockForTrait()
     {
-        $mock = $this->getMock('AbstractMockTestClass');
-        $mock->expects($this->never())
-             ->method('doSomething');
+        $mock = $this->getMockForTrait('AbstractTrait');
+        $mock->expects($this->never())->method('doSomething');
+
+        $parent = get_parent_class($mock);
+        $traits = class_uses($parent, FALSE);
+
+        $this->assertContains('AbstractTrait', $traits);
     }
 
     public function testClonedMockObjectShouldStillEqualTheOriginal()
@@ -362,65 +449,6 @@ public function testClonedMockObjectIsNotIdenticalToOriginalOne()
         $mock->foo($y);
     }
 
-    public function testStaticMethodCallWithArgumentCloningEnabled()
-    {
-        $expectedObject = new StdClass;
-
-        $this->getMockClass(
-          'StaticMockTestClass',
-          array('doSomething'),
-          array(),
-          'StaticMockTestClassMock3',
-          FALSE,
-          TRUE,
-          TRUE,
-          TRUE
-        );
-
-        $actualArguments = array();
-
-        StaticMockTestClassMock3::staticExpects($this->any())
-        ->method('doSomething')
-        ->will($this->returnCallback(function() use (&$actualArguments) {
-            $actualArguments = func_get_args();
-        }));
-
-        StaticMockTestClassMock3::doSomething($expectedObject);
-
-        $this->assertEquals(1, count($actualArguments));
-        $this->assertNotSame($expectedObject, $actualArguments[0]);
-    }
-
-    public function testStaticMethodCallWithArgumentCloningDisabled()
-    {
-        $expectedObject = new StdClass;
-
-        $this->getMockClass(
-          'StaticMockTestClass',
-          array('doSomething'),
-          array(),
-          'StaticMockTestClassMock4',
-          FALSE,
-          TRUE,
-          TRUE,
-          FALSE
-        );
-
-        $actualArguments = array();
-
-        StaticMockTestClassMock4::staticExpects($this->any())
-        ->method('doSomething')
-        ->will($this->returnCallback(function() use (&$actualArguments) {
-            $actualArguments = func_get_args();
-        }));
-
-        StaticMockTestClassMock4::doSomething($expectedObject);
-
-        $this->assertEquals(1, count($actualArguments));
-        $this->assertEquals($expectedObject, $actualArguments[0]);
-        $this->assertSame($expectedObject, $actualArguments[0]);
-    }
-
     public function testObjectMethodCallWithArgumentCloningEnabled()
     {
         $expectedObject = new StdClass;
@@ -434,7 +462,7 @@ public function testObjectMethodCallWithArgumentCloningEnabled()
 
         $mock->expects($this->any())
         ->method('doSomethingElse')
-        ->will($this->returnCallback(function() use (&$actualArguments) {
+        ->will($this->returnCallback(function () use (&$actualArguments) {
             $actualArguments = func_get_args();
         }));
 
@@ -458,7 +486,7 @@ public function testObjectMethodCallWithArgumentCloningDisabled()
 
         $mock->expects($this->any())
         ->method('doSomethingElse')
-        ->will($this->returnCallback(function() use (&$actualArguments) {
+        ->will($this->returnCallback(function () use (&$actualArguments) {
             $actualArguments = func_get_args();
         }));
 
@@ -496,7 +524,7 @@ public function testVerificationOfMethodNameFailsWithoutParameters()
         } catch (PHPUnit_Framework_ExpectationFailedException $e) {
             $this->assertSame(
                 "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
-                . 'Method was expected to be called 1 times, actually called 0 times.',
+                . "Method was expected to be called 1 times, actually called 0 times.\n",
                 $e->getMessage()
             );
         }
@@ -517,7 +545,48 @@ public function testVerificationOfMethodNameFailsWithParameters()
         } catch (PHPUnit_Framework_ExpectationFailedException $e) {
             $this->assertSame(
                 "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
-                . 'Method was expected to be called 1 times, actually called 0 times.',
+                . "Method was expected to be called 1 times, actually called 0 times.\n",
+                $e->getMessage()
+            );
+        }
+
+        $this->resetMockObjects();
+    }
+
+    public function testVerificationOfMethodNameFailsWithWrongParameters()
+    {
+        $mock = $this->getMock('SomeClass', array('right', 'wrong'), array(), '', TRUE, TRUE, TRUE);
+        $mock->expects($this->once())
+             ->method('right')
+             ->with(array('first', 'second'));
+
+        try {
+            $mock->right(array('second'));
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertSame(
+                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s)\n"
+                . "Parameter 0 for invocation SomeClass::right(Array (...)) does not match expected value.\n"
+                . "Failed asserting that two arrays are equal.",
+                $e->getMessage()
+            );
+        }
+
+        try {
+            $mock->__phpunit_verify();
+            $this->fail('Expected exception');
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertSame(
+                "Expectation failed for method name is equal to <string:right> when invoked 1 time(s).\n"
+                . "Parameter 0 for invocation SomeClass::right(Array (...)) does not match expected value.\n"
+                . "Failed asserting that two arrays are equal.\n"
+                . "--- Expected\n"
+                . "+++ Actual\n"
+                . "@@ @@\n"
+                . " Array (\n"
+                . "-    0 => 'first'\n"
+                . "-    1 => 'second'\n"
+                . "+    0 => 'second'\n"
+                . " )\n",
                 $e->getMessage()
             );
         }
@@ -565,7 +634,11 @@ public function testVerificationOfNeverFailsWithAnyParameters()
         $this->resetMockObjects();
     }
 
-    public function testMockArgumentsPassedByReference() {
+    /**
+     * See https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81
+     */
+    public function testMockArgumentsPassedByReference()
+    {
         $foo = $this->getMockBuilder('MethodCallbackByReference')
                     ->setMethods(array('bar'))
                     ->disableOriginalConstructor()
@@ -583,7 +656,11 @@ public function testMockArgumentsPassedByReference() {
         $this->assertEquals(1, $b);
     }
 
-    public function testMockArgumentsPassedByReference2() {
+    /**
+     * See https://github.com/sebastianbergmann/phpunit-mock-objects/issues/81
+     */
+    public function testMockArgumentsPassedByReference2()
+    {
         $foo = $this->getMockBuilder('MethodCallbackByReference')
                     ->disableOriginalConstructor()
                     ->disableArgumentCloning()
@@ -592,7 +669,7 @@ public function testMockArgumentsPassedByReference2() {
         $foo->expects($this->any())
             ->method('bar')
             ->will($this->returnCallback(
-            function ($a, &$b, $c) {
+            function (&$a, &$b, $c) {
                 $b = 1;
             }
             ));
@@ -604,12 +681,56 @@ function ($a, &$b, $c) {
         $this->assertEquals(1, $b);
     }
 
+    /**
+     * https://github.com/sebastianbergmann/phpunit-mock-objects/issues/116
+     */
+    public function testMockArgumentsPassedByReference3()
+    {
+        $foo = $this->getMockBuilder('MethodCallbackByReference')
+                    ->setMethods(array('bar'))
+                    ->disableOriginalConstructor()
+                    ->disableArgumentCloning()
+                    ->getMock();
+
+        $a = new stdClass();
+        $b = $c = 0;
+
+        $foo->expects($this->any())
+            ->method('bar')
+            ->with($a, $b, $c)
+            ->will($this->returnCallback(array($foo, 'callback')));
+
+        $foo->bar($a, $b, $c);
+    }
+
+    /**
+     * https://github.com/sebastianbergmann/phpunit/issues/796
+     */
+    public function testMockArgumentsPassedByReference4()
+    {
+        $foo = $this->getMockBuilder('MethodCallbackByReference')
+                    ->setMethods(array('bar'))
+                    ->disableOriginalConstructor()
+                    ->disableArgumentCloning()
+                    ->getMock();
+
+        $a = new stdClass();
+        $b = $c = 0;
+
+        $foo->expects($this->any())
+            ->method('bar')
+            ->with($this->isInstanceOf("stdClass"), $b, $c)
+            ->will($this->returnCallback(array($foo, 'callback')));
+
+        $foo->bar($a, $b, $c);
+    }
+
     /**
      * @requires extension soap
      */
     public function testCreateMockFromWsdl()
     {
-        $mock = $this->getMockFromWsdl(__DIR__ . '/_files/GoogleSearch.wsdl', 'WsdlMock');
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl', 'WsdlMock');
         $this->assertStringStartsWith(
             'Mock_WsdlMock_',
             get_class($mock)
@@ -621,7 +742,7 @@ public function testCreateMockFromWsdl()
      */
     public function testCreateNamespacedMockFromWsdl()
     {
-        $mock = $this->getMockFromWsdl(__DIR__ . '/_files/GoogleSearch.wsdl', 'My\\Space\\WsdlMock');
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl', 'My\\Space\\WsdlMock');
         $this->assertStringStartsWith(
             'Mock_WsdlMock_',
             get_class($mock)
@@ -633,8 +754,43 @@ public function testCreateNamespacedMockFromWsdl()
      */
     public function testCreateTwoMocksOfOneWsdlFile()
     {
-        $mock = $this->getMockFromWsdl(__DIR__ . '/_files/GoogleSearch.wsdl');
-        $mock = $this->getMockFromWsdl(__DIR__ . '/_files/GoogleSearch.wsdl');
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl');
+        $mock = $this->getMockFromWsdl(__DIR__ . '/_fixture/GoogleSearch.wsdl');
+    }
+
+    /**
+     * @see    https://github.com/sebastianbergmann/phpunit-mock-objects/issues/156
+     * @ticket 156
+     */
+    public function testInterfaceWithStaticMethodCanBeStubbed()
+    {
+        $this->assertInstanceOf(
+            'InterfaceWithStaticMethod',
+            $this->getMock('InterfaceWithStaticMethod')
+        );
+    }
+
+    /**
+     * @expectedException PHPUnit_Framework_MockObject_BadMethodCallException
+     */
+    public function testInvokingStubbedStaticMethodRaisesException()
+    {
+        $mock = $this->getMock('ClassWithStaticMethod');
+        $mock->staticMethod();
+    }
+
+    /**
+     * @see    https://github.com/sebastianbergmann/phpunit-mock-objects/issues/171
+     * @ticket 171
+     */
+    public function testStubForClassThatImplementsSerializableCanBeCreatedWithoutInvokingTheConstructor()
+    {
+        $this->assertInstanceOf(
+            'ClassThatImplementsSerializable',
+            $this->getMockBuilder('ClassThatImplementsSerializable')
+                 ->disableOriginalConstructor()
+                 ->getMock()
+        );
     }
 
     private function resetMockObjects()
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php b/core/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e735211fbd84cf27041843405141959edcc677f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/ProxyObjectTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2010-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ * @package    PHPUnit_MockObject
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2010-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @version    Release: @package_version@
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class Framework_ProxyObjectTest extends PHPUnit_Framework_TestCase
+{
+    public function testMockedMethodIsProxiedToOriginalMethod()
+    {
+        $proxy = $this->getMockBuilder('Bar')
+                      ->enableProxyingToOriginalMethods()
+                      ->getMock();
+
+        $proxy->expects($this->once())
+              ->method('doSomethingElse');
+
+        $foo = new Foo;
+        $this->assertEquals('result', $foo->doSomething($proxy));
+    }
+
+    public function testMockedMethodWithReferenceIsProxiedToOriginalMethod()
+    {
+        $proxy = $this->getMockBuilder('MethodCallbackByReference')
+                      ->enableProxyingToOriginalMethods()
+                      ->getMock();
+        $a = $b = $c = 0;
+
+        $proxy->callback($a, $b, $c);
+
+        $this->assertEquals(1, $b);
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php
new file mode 100644
index 0000000000000000000000000000000000000000..87576cad6e053606182a22d9707edc015f12d45a
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassThatImplementsSerializable.php
@@ -0,0 +1,15 @@
+<?php
+class ClassThatImplementsSerializable implements Serializable
+{
+    public function serialize()
+    {
+        return get_object_vars($this);
+    }
+
+    public function unserialize($serialized)
+    {
+        foreach (unserialize($serialized) as $key => $value) {
+            $this->{$key} = $value;
+        }
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php
new file mode 100644
index 0000000000000000000000000000000000000000..0c13c120fae6acb791808c7daf0d4fd6b1ff6220
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_files/ClassWithStaticMethod.php
@@ -0,0 +1,7 @@
+<?php
+class ClassWithStaticMethod
+{
+    public static function staticMethod()
+    {
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/AbstractMockTestClass.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php
similarity index 57%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/AbstractMockTestClass.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php
index 1f2641f1e2be8b31440df973712aecfa4c3325e4..b006e2d5f48344771a134924144444c44595fbfe 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/AbstractMockTestClass.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractMockTestClass.php
@@ -2,4 +2,9 @@
 abstract class AbstractMockTestClass
 {
     abstract public function doSomething();
+
+    public function returnAnything()
+    {
+        return 1;
+    }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..071535c895b646febbe2f73d8b45a6d7a953a95f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AbstractTrait.php
@@ -0,0 +1,15 @@
+<?php
+trait AbstractTrait
+{
+    abstract public function doSomething();
+
+    public function mockableMethod()
+    {
+        return TRUE;
+    }
+
+    public function anotherMockableMethod()
+    {
+        return TRUE;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/AnInterface.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/AnInterface.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnInterface.php
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..62bff0a28000086b9cabc5d41171c4e51b500f30
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/AnotherInterface.php
@@ -0,0 +1,5 @@
+<?php
+interface AnotherInterface
+{
+    public function doSomethingElse();
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php
new file mode 100644
index 0000000000000000000000000000000000000000..4a4d165c81009122602c2bf1c2b7e85e396e1a5a
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Bar.php
@@ -0,0 +1,8 @@
+<?php
+class Bar
+{
+    public function doSomethingElse()
+    {
+        return 'result';
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php
new file mode 100644
index 0000000000000000000000000000000000000000..16a9ed728f3a068bbe5b9dbfdc78683238812036
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Foo.php
@@ -0,0 +1,8 @@
+<?php
+class Foo
+{
+    public function doSomething(Bar $bar)
+    {
+        return $bar->doSomethingElse();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/FunctionCallback.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/FunctionCallback.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/FunctionCallback.php
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/GoogleSearch.wsdl b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/GoogleSearch.wsdl
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/GoogleSearch.wsdl
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php
new file mode 100644
index 0000000000000000000000000000000000000000..9e38d1e878d08bd1236bd4fb29206679d4addc36
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/InterfaceWithStaticMethod.php
@@ -0,0 +1,6 @@
+<?php
+interface InterfaceWithStaticMethod
+{
+    public static function staticMethod();
+}
+
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/MethodCallback.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/MethodCallback.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallback.php
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/MethodCallbackByReference.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php
similarity index 52%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/MethodCallbackByReference.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php
index 9a25db2c19cf0237b1f8a533716ec0371ff486a6..ef26f3e721a1a5988dd1dc19a1299fca96c69345 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/MethodCallbackByReference.php
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/MethodCallbackByReference.php
@@ -1,11 +1,13 @@
 <?php
 class MethodCallbackByReference
 {
-    public function bar($a, &$b, $c) {
+    public function bar(&$a, &$b, $c)
+    {
         Legacy::bar($a, $b, $c);
     }
 
-    public function callback($a, &$b, $c) {
+    public function callback(&$a, &$b, $c)
+    {
         $b = 1;
     }
 }
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/Mockable.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/Mockable.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/Mockable.php
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/PartialMockTestClass.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/PartialMockTestClass.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/PartialMockTestClass.php
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/SomeClass.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/SomeClass.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/SomeClass.php
diff --git a/core/vendor/phpunit/phpunit-mock-objects/Tests/_files/StaticMockTestClass.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php
similarity index 100%
rename from core/vendor/phpunit/phpunit-mock-objects/Tests/_files/StaticMockTestClass.php
rename to core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/StaticMockTestClass.php
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php
new file mode 100644
index 0000000000000000000000000000000000000000..3467cce8ae605fcd011682a5b09fa0f84561cac5
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/_fixture/TraversableMockTestInterface.php
@@ -0,0 +1,4 @@
+<?php
+interface TraversableMockTestInterface extends Traversable
+{
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/autoload.php b/core/vendor/phpunit/phpunit-mock-objects/tests/autoload.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf63f63082d747c4ed2acae035ec0fb4e653bfb5
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/autoload.php
@@ -0,0 +1,41 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'abstractmocktestclass' => '/_fixture/AbstractMockTestClass.php',
+                'abstracttrait' => '/_fixture/AbstractTrait.php',
+                'aninterface' => '/_fixture/AnInterface.php',
+                'anotherinterface' => '/_fixture/AnotherInterface.php',
+                'bar' => '/_fixture/Bar.php',
+                'classthatimplementsserializable' => '/_files/ClassThatImplementsSerializable.php',
+                'classwithstaticmethod' => '/_files/ClassWithStaticMethod.php',
+                'foo' => '/_fixture/Foo.php',
+                'framework_mockbuildertest' => '/MockBuilderTest.php',
+                'framework_mockobject_generatortest' => '/GeneratorTest.php',
+                'framework_mockobject_invocation_objecttest' => '/MockObject/Invocation/ObjectTest.php',
+                'framework_mockobject_invocation_statictest' => '/MockObject/Invocation/StaticTest.php',
+                'framework_mockobject_matcher_consecutiveparameterstest' => '/MockObject/Matcher/ConsecutiveParametersTest.php',
+                'framework_mockobjecttest' => '/MockObjectTest.php',
+                'framework_proxyobjecttest' => '/ProxyObjectTest.php',
+                'interfacewithstaticmethod' => '/_fixture/InterfaceWithStaticMethod.php',
+                'methodcallback' => '/_fixture/MethodCallback.php',
+                'methodcallbackbyreference' => '/_fixture/MethodCallbackByReference.php',
+                'mockable' => '/_fixture/Mockable.php',
+                'partialmocktestclass' => '/_fixture/PartialMockTestClass.php',
+                'someclass' => '/_fixture/SomeClass.php',
+                'staticmocktestclass' => '/_fixture/StaticMockTestClass.php',
+                'traversablemocktestinterface' => '/_fixture/TraversableMockTestInterface.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    }
+);
+// @codeCoverageIgnoreEnd
diff --git a/core/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php b/core/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
new file mode 100644
index 0000000000000000000000000000000000000000..39a9c12aa0c26d489db6f27a3b75eaa2f87cd501
--- /dev/null
+++ b/core/vendor/phpunit/phpunit-mock-objects/tests/bootstrap.php
@@ -0,0 +1,5 @@
+<?php
+require __DIR__ . '/autoload.php';
+require __DIR__ . '/_fixture/FunctionCallback.php';
+require __DIR__ . '/../vendor/autoload.php';
+
diff --git a/core/vendor/phpunit/phpunit/.gitattributes b/core/vendor/phpunit/phpunit/.gitattributes
index 461090b7ecca054b69e8e69e0dbc0f5e4ad705bc..821227aa1ee3181215b39d0d84024ffe4a898a85 100644
--- a/core/vendor/phpunit/phpunit/.gitattributes
+++ b/core/vendor/phpunit/phpunit/.gitattributes
@@ -1 +1,3 @@
 *.php diff=php
+composer.json merge=ours
+src/Runner/Version.php merge=ours
diff --git a/core/vendor/phpunit/phpunit/.gitignore b/core/vendor/phpunit/phpunit/.gitignore
index 2aa9c32b2833190733090e27df723a516cfd4251..5a3b3733da2920d4780a4adecb8ff7cab50f3079 100644
--- a/core/vendor/phpunit/phpunit/.gitignore
+++ b/core/vendor/phpunit/phpunit/.gitignore
@@ -11,8 +11,11 @@ Tests/TextUI/*.exp
 Tests/TextUI/*.log
 Tests/TextUI/*.out
 Tests/TextUI/*.php
+/bin
 /vendor
 /composer.lock
+/composer.phar
 phpunit.xml
 cache.properties
 .idea
+.ant_targets
diff --git a/core/vendor/phpunit/phpunit/.travis.yml b/core/vendor/phpunit/phpunit/.travis.yml
index e0696e42eb329c5581af45a34b1e69bce4414a7e..dcc1f09e36926add7b953c5846a41a36820e2ac2 100644
--- a/core/vendor/phpunit/phpunit/.travis.yml
+++ b/core/vendor/phpunit/phpunit/.travis.yml
@@ -1,21 +1,25 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
-
-env:
-    - INSTALL_PHP_INVOKER=0
-    - INSTALL_PHP_INVOKER=1
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
 
 before_script:
-    - sh -c "if [ '$INSTALL_PHP_INVOKER' = '1' ]; then composer require --dev --prefer-source phpunit/php-invoker:\>=1.1.0,\<1.2.0; else composer install --dev --prefer-source; fi"
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
 
-script: ./phpunit.php --configuration ./build/travis-ci.xml
+script: ./phpunit --configuration ./build/travis-ci.xml
 
 notifications:
   email: false
-  irc:
-    channels:
-      - "irc.freenode.org#phpunit"
-    use_notice: true
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
+    on_success: always
+    on_failure: always
+    on_start: false
+
diff --git a/core/vendor/phpunit/phpunit/CONTRIBUTING.md b/core/vendor/phpunit/phpunit/CONTRIBUTING.md
index 156d2f092d5eb4c2a0fc8b4929f251d23c3e487e..b6421e289336ed93138dd5a5ad341a82d64f8764 100644
--- a/core/vendor/phpunit/phpunit/CONTRIBUTING.md
+++ b/core/vendor/phpunit/phpunit/CONTRIBUTING.md
@@ -1,55 +1,23 @@
-Contributing to PHPUnit
-=======================
+# Contributing to PHPUnit
 
-Contributions to PHPUnit, its related modules, and its documentation are always welcome. You make our lifes easier by sending us your contributions through GitHub pull requests.
+Contributions to PHPUnit, its related modules, and its documentation are always welcome. You make our lives easier by sending us your contributions through GitHub pull requests.
 
-Please note that the `3.6.` branch is closed for features and that pull requests should to be based on `master` or the `3.7.` once it exists.
+Pull requests for bug fixes must be based on the current stable branch whereas pull requests for new features must be based on `master`.
 
-We are trying to keep backwards compatibility breaks in PHPUnit 3.7 to an absolute minimum so please take this into account when proposing changes.
+We are trying to keep backwards compatibility breaks in PHPUnit to an absolute minimum. Please take this into account when proposing changes.
 
 Due to time constraints, we are not always able to respond as quickly as we would like. Please do not take delays personal and feel free to remind us here or on IRC if you feel that we forgot to respond.
 
-Using PHPUnit From a Git Checkout
----------------------------------
+## Using PHPUnit From a Git Checkout
 
-The following commands can be used to perform the initial checkout of PHPUnit and its dependencies from Git:
+The following commands can be used to perform the initial checkout of PHPUnit:
 
-    mkdir phpunit && cd phpunit
     git clone git://github.com/sebastianbergmann/phpunit.git
-    git clone git://github.com/sebastianbergmann/dbunit.git
-    git clone git://github.com/sebastianbergmann/php-file-iterator.git
-    git clone git://github.com/sebastianbergmann/php-text-template.git
-    git clone git://github.com/sebastianbergmann/php-code-coverage.git
-    git clone git://github.com/sebastianbergmann/php-token-stream.git
-    git clone git://github.com/sebastianbergmann/php-timer.git
-    git clone git://github.com/sebastianbergmann/phpunit-mock-objects.git
-    git clone git://github.com/sebastianbergmann/phpunit-selenium.git
-    git clone git://github.com/sebastianbergmann/phpunit-story.git
-    git clone git://github.com/sebastianbergmann/php-invoker.git
+    cd phpunit
 
-The `dbunit`, `php-code-coverage`, `php-file-iterator`, `php-text-template`, `php-timer`, `php-token-stream`, `phpunit`, `phpunit-mock-objects`, `phpunit-selenium`, `phpunit-story`, and `php-invoker` directories need to be added to the `include_path`.
+Retrieve PHPUnit's dependencies using [Composer](http://getcomposer.org/):
 
-In addition to the checkouts listed above, the YAML component that is provided by the Symfony project is required:
+    wget http://getcomposer.org/composer.phar
+    php composer.phar install
 
-    pear install pear.symfony.com/Yaml
-
-The `phpunit/phpunit.php` script can be used to invoke the PHPUnit test runner.
-
-Running the test suite(s)
--------------------------
-
-It is not possible to use a system-wide installed version of PHPUnit to run the test suite of a Git checkout. Because of that is is necessary to change the `include_paths` as described below.
-
-This can be achieved with a small wrapper script designed to work with every module in the PHPUnit stack.
-
-Note that you might have to change the path to your PEAR installation here pointing to `/usr/local/lib/php`. You can find it using `pear config-show | grep php_dir`.
-
-### Linux / MacOS X
-
-    #!/bin/bash
-    php -d include_path='.:../phpunit/:../dbunit/:../php-code-coverage/:../php-file-iterator/:../php-invoker/:../php-text-template/:../php-timer:../php-token-stream:../phpunit-mock-objects/:../phpunit-selenium/:../phpunit-story/:/usr/local/lib/php' ../phpunit/phpunit.php $*
-
-### Windows
-
-    @echo off
-    php -d include_path='.;../phpunit/;../dbunit/;../php-code-coverage/;../php-file-iterator/;../php-invoker/;../php-text-template/;../php-timer;../php-token-stream;../phpunit-mock-objects/;../phpunit-selenium/;../phpunit-story/;C:/Program Files/PHP/pear' ../phpunit/phpunit.php %*
+The `phpunit` script can be used to invoke the PHPUnit test runner.
diff --git a/core/vendor/phpunit/phpunit/ChangeLog.md b/core/vendor/phpunit/phpunit/ChangeLog.md
deleted file mode 100644
index d1390055cae7a9cefc0be2550b008f0fdb74cc67..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/ChangeLog.md
+++ /dev/null
@@ -1,163 +0,0 @@
-PHPUnit 3.7
-===========
-
-This is the list of changes for the PHPUnit 3.7 release series.
-
-PHPUnit 3.7.21
---------------
-
-* Fixed #277: Account for `auto-globals-jit` when setting `$_ENV` and `$_SERVER` variables in the xml config.
-* Fixed #924: PHPUnit depends on packages that broke backwards compatability.
-
-PHPUnit 3.7.20
---------------
-
-* Fixed #883: Stand-alone functions `logicalAnd()`, `logicalOr()`, and `logicalXor()` did not work.
-* Fixed #889: Suppress `open_basedir` warnings while searching for the composer autoloader.
-* Fixed #890: Correctly parse single-line @expectedException annotations.
-* Fixed #891: Better messages when JSON-related assertions receive invalid JSON.
-* Fixed #896: Use the proper `toString()` method inside `PHPUnit_Framework_TestFailure::toString()`.
-* Fixed #902: Allow symfony/yaml >=2.0,<3.0
-* Fixed #908: Don't rely on composer to set up the `include_path` for `ErrorHandler.php`.
-
-PHPUnit 3.7.19
---------------
-
-* Fixed #763: `assertTag()` fails to match content in CDATA sections.
-* Fixed #860: Version requirement for `symfony/yaml` is too restrictive.
-* Fixed #863: Number of tests to run calculated incorrectly when `--repeat` is used.
-
-PHPUnit 3.7.18
---------------
-
-* Make sure the autoloader for PEAR-based installation is not used when PHPUnit is installed via Composer.
-
-PHPUnit 3.7.17
---------------
-
-* Make sure the autoloader for PEAR-based installation is not used when PHPUnit is installed via Composer.
-
-PHPUnit 3.7.16
---------------
-
-* Make sure the autoloader for PEAR-based installation is not used when PHPUnit is installed via Composer.
-
-PHPUnit 3.7.15
---------------
-
-* Fixed #823: Process isolation not working on windows if there are spaces in path to `php.exe`
-* Fixed #830: PHP notice in `PHPUnit_Util_XML`
-
-PHPUnit 3.7.14
---------------
-
-* Fixed #751: NaN is not equal to NaN now to match PHPs behavior
-* Fixed #796 in #799: Mocking a method with a reference to an object made argument matches fail.
-
-PHPUnit 3.7.13
---------------
-
-* Fixed #710: Ensure isolation tests display errors so they can be handled by the test runner.
-* Fixed sebastianbergmann/phpunit-mock-objects#81.
-* Fixed an issue where PHP complained about an undeclared `$time` variable when running tests in strict mode.
-
-PHPUnit 3.7.12
---------------
-
-* Fixed version number.
-
-PHPUnit 3.7.11
---------------
-
-* Fixed installation issue for Symfony/Yaml.
-
-PHPUnit 3.7.10
---------------
-
-* Fixed #734: `phpunit.phar` cannot be executed if it is renamed.
-* Fixed error message when `assertArrayHasKey()` and `assertArrayNotHasKey()` are invoked with wrong arguments.
-* Fixed #709: `assertJsonStringEqualsJsonFile` didn't work with json arrays.
-
-PHPUnit 3.7.9
--------------
-
-* Fixed #708: JSON matcher source files missing from `package.xml`.
-
-PHPUnit 3.7.8
--------------
-
-* Fixed #688: Invoke autoloader when checking for `Symfony\Component\Yaml\Dumper`.
-
-PHPUnit 3.7.7
--------------
-
-* Added missing file to PEAR package.
-
-PHPUnit 3.7.6
--------------
-
-* Fixed #682: `phpunit` script appears in stacktrace (when PHPUnit is installed through Composer).
-
-PHPUnit 3.7.5
--------------
-
-* PHPUnit now uses `$_SERVER['SCRIPT_NAME']` instead of `$_SERVER['_']` to filter the `phpunit` script (as the latter is not set when PHPUnit is invoked from Apache Ant's `<exec>` task, for instance).
-
-PHPUnit 3.7.4
--------------
-
-* Fixed #682: `phpunit` script appears in stacktrace.
-
-PHPUnit 3.7.3
--------------
-
-* Improvements to running PHPUnit from a PHAR.
-
-PHPUnit 3.7.2
--------------
-
-* Implemented #656: Always clean up mock objects (and free up memory).
-* Implemented #664: Do not rely on autoloader class map to populate blacklist.
-* Added the `addUncoveredFilesFromWhitelist` configuration setting back in.
-* Fixed #655: Reverted 'More than two positional arguments provided' check as it turned out to be a BC issue.
-* Disable token caching (in PHP_TokenStream, used by PHP_CodeCoverage) by default (to reduce memory footprint).
-
-PHPUnit 3.7.1
--------------
-
-* The version number is now displayed when using PHPUnit from a Composer install or Git checkout.
-
-PHPUnit 3.7.0
--------------
-
-* PHPUnit 3.7 is only supported on PHP 5.3.3 (or later) and PHP 5.4.7 (or later) is highly recommended.
-* Implemented #200: When using process-isolation don't die silently when unserializing the test result fails.
-* Implemented #206: Added a `callback` constraint that is useful for making complex assertions.
-* Implemented #207: Restore current working directory if is changed by a test case.
-* Implemented #208: Added `--test-suffix` that allows specifying which filename suffixes are recognised by PHPUnit.
-* Implemented #295: `assertArrayHasKey()` and `assertArrayNotHasKey()` now work with objects that implement ArrayAccess.
-* Implemented #333: Improved reporting when there are unused CLI arguments to avoid misconceptions.
-* Implemented #377: Show messages and stracktraces in JSON output for skipped and incomplete tests.
-* Implemented #424: Added `assertJson*` functions that work like the existing `assertXml*` functions.
-* Implemented #492: PHPUnit now provides a `configuration.xsd` schema file at [http://schema.phpunit.de/configuration.xsd]() that can be used to validate your `phpunit.xml` and `phpunit.xml.dist` configuration files.
-* Implemented #495: Added `--testsuite` argument, allowing to filter files/directory by parent testsuite name attribute.
-* Implemented #504: Expanded the `@requires` annotation to allow for checking the existence of functions and extensions using multiple `@requires function name` statements.
-* Implemented #508 #86: `@expectedExceptionCode` and `@expectedExceptionMessage` can now use constants like `Classname::CONST` as their parameters. They will get evaluated if the class constant exists and used for comparison so test authors can avoid duplication.
-* Implemented #512: Test listeners now trigger one autoload call instead of being silently ignored when the class was not loaded.
-* Implemented #514: Failed `assertStringMatchesFormat()` calls now produce a better readable diff by only marking lines as different that don't match the format specifiers.
-* Implemented #515: Added `assertContainsOnlyInstancesOf()` to help checking Collection objects and arrays with a descriptive assertion.
-* Implemented #561: When an `@expectedException` fails it now shows the message of the thrown exception to ease debugging.
-* Implemented #586: Improved reporting of exceptions by printing out the previous exception names, messages and traces.
-* The `@requires` annotation can now be used on the class DocBlock. Required versions can be overridden in the methods annotation, required functions and extensions will be merged.
-* Added `processUncoveredFilesFromWhitelist` configuration setting. When enabled, uncovered whitelisted files are processed to properly calculate the number of executable lines.
-* Fixed #322 #320 thanks to #607: Commandline option now override group/exclude settings in `phpunit.xml`
-* Fixed #440: Possible crash when using `--process-isolation` with PHP 5.3 and `detect_unicode=on`.
-* Fixed #523: `assertAttributeEquals()` now works with classes extending internal classes like `ArrayIterator`.
-* Fixed #581: Generating a diffs could add extra newlines in Windows.
-* Fixed #636, #631: Using Selenium in combination with autoloaders that `die()` or produce errors when a class cannot be found caused broken tests.
-* If no tests where executed, for example because of a `--filter`, PHPUnit now prints a "No tests executed" warning instead of "OK (0 tests...)".
-* It is possible again to expect the generic `Exception` class.
-* Removed `addUncoveredFilesFromWhitelist` configuration setting.
-* Removed deprecated `--skeleton-class` and `--skeleton-test` switches. The functionality is now provided by the `phpunit-skelgen` command of the `PHPUnit_SkeletonGenerator` package.
-* Removed deprecated `PHPUnit_Extensions_OutputTestCase` class.
-
diff --git a/core/vendor/phpunit/phpunit/LICENSE b/core/vendor/phpunit/phpunit/LICENSE
index 7501237f630412a2f4b63cc002bbf1723e45ee70..fe178b08358d9908c890de96aed8022f41d8f94a 100644
--- a/core/vendor/phpunit/phpunit/LICENSE
+++ b/core/vendor/phpunit/phpunit/LICENSE
@@ -1,6 +1,6 @@
 PHPUnit
 
-Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Autoload.php b/core/vendor/phpunit/phpunit/PHPUnit/Autoload.php
deleted file mode 100644
index f1bd633a26b2d54bbab8b0575742c11d8a917668..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/PHPUnit/Autoload.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.5.0
- */
-
-if (defined('PHPUNIT_COMPOSER_INSTALL')) {
-    return;
-}
-
-$paths = array(
-  __DIR__ . '/../vendor',
-  __DIR__ . '/../../..'
-);
-
-foreach ($paths as $path) {
-    if (@is_dir($path . '/composer') &&
-        @is_file($path . '/autoload.php')) {
-        require_once $path . '/autoload.php';
-        define('PHPUNIT_COMPOSER_INSTALL', $path . '/autoload.php');
-
-        return;
-    }
-}
-
-require_once 'File/Iterator/Autoload.php';
-require_once 'PHP/CodeCoverage/Autoload.php';
-require_once 'PHP/Timer/Autoload.php';
-require_once 'PHPUnit/Framework/MockObject/Autoload.php';
-require_once 'Text/Template/Autoload.php';
-
-spl_autoload_register(
-  function ($class)
-  {
-      static $classes = NULL;
-      static $path    = NULL;
-
-      if ($classes === NULL) {
-          $classes = array(
-            'phpunit_extensions_grouptestsuite' => '/Extensions/GroupTestSuite.php',
-            'phpunit_extensions_phpttestcase' => '/Extensions/PhptTestCase.php',
-            'phpunit_extensions_phpttestcase_logger' => '/Extensions/PhptTestCase/Logger.php',
-            'phpunit_extensions_phpttestsuite' => '/Extensions/PhptTestSuite.php',
-            'phpunit_extensions_repeatedtest' => '/Extensions/RepeatedTest.php',
-            'phpunit_extensions_testdecorator' => '/Extensions/TestDecorator.php',
-            'phpunit_extensions_ticketlistener' => '/Extensions/TicketListener.php',
-            'phpunit_framework_assert' => '/Framework/Assert.php',
-            'phpunit_framework_assertionfailederror' => '/Framework/AssertionFailedError.php',
-            'phpunit_framework_comparator' => '/Framework/Comparator.php',
-            'phpunit_framework_comparator_array' => '/Framework/Comparator/Array.php',
-            'phpunit_framework_comparator_domdocument' => '/Framework/Comparator/DOMDocument.php',
-            'phpunit_framework_comparator_double' => '/Framework/Comparator/Double.php',
-            'phpunit_framework_comparator_exception' => '/Framework/Comparator/Exception.php',
-            'phpunit_framework_comparator_mockobject' => '/Framework/Comparator/MockObject.php',
-            'phpunit_framework_comparator_numeric' => '/Framework/Comparator/Numeric.php',
-            'phpunit_framework_comparator_object' => '/Framework/Comparator/Object.php',
-            'phpunit_framework_comparator_resource' => '/Framework/Comparator/Resource.php',
-            'phpunit_framework_comparator_scalar' => '/Framework/Comparator/Scalar.php',
-            'phpunit_framework_comparator_splobjectstorage' => '/Framework/Comparator/SplObjectStorage.php',
-            'phpunit_framework_comparator_type' => '/Framework/Comparator/Type.php',
-            'phpunit_framework_comparatorfactory' => '/Framework/ComparatorFactory.php',
-            'phpunit_framework_comparisonfailure' => '/Framework/ComparisonFailure.php',
-            'phpunit_framework_constraint' => '/Framework/Constraint.php',
-            'phpunit_framework_constraint_and' => '/Framework/Constraint/And.php',
-            'phpunit_framework_constraint_arrayhaskey' => '/Framework/Constraint/ArrayHasKey.php',
-            'phpunit_framework_constraint_attribute' => '/Framework/Constraint/Attribute.php',
-            'phpunit_framework_constraint_callback' => '/Framework/Constraint/Callback.php',
-            'phpunit_framework_constraint_classhasattribute' => '/Framework/Constraint/ClassHasAttribute.php',
-            'phpunit_framework_constraint_classhasstaticattribute' => '/Framework/Constraint/ClassHasStaticAttribute.php',
-            'phpunit_framework_constraint_composite' => '/Framework/Constraint/Composite.php',
-            'phpunit_framework_constraint_count' => '/Framework/Constraint/Count.php',
-            'phpunit_framework_constraint_exception' => '/Framework/Constraint/Exception.php',
-            'phpunit_framework_constraint_exceptioncode' => '/Framework/Constraint/ExceptionCode.php',
-            'phpunit_framework_constraint_exceptionmessage' => '/Framework/Constraint/ExceptionMessage.php',
-            'phpunit_framework_constraint_fileexists' => '/Framework/Constraint/FileExists.php',
-            'phpunit_framework_constraint_greaterthan' => '/Framework/Constraint/GreaterThan.php',
-            'phpunit_framework_constraint_isanything' => '/Framework/Constraint/IsAnything.php',
-            'phpunit_framework_constraint_isempty' => '/Framework/Constraint/IsEmpty.php',
-            'phpunit_framework_constraint_isequal' => '/Framework/Constraint/IsEqual.php',
-            'phpunit_framework_constraint_isfalse' => '/Framework/Constraint/IsFalse.php',
-            'phpunit_framework_constraint_isidentical' => '/Framework/Constraint/IsIdentical.php',
-            'phpunit_framework_constraint_isinstanceof' => '/Framework/Constraint/IsInstanceOf.php',
-            'phpunit_framework_constraint_isjson' => '/Framework/Constraint/IsJson.php',
-            'phpunit_framework_constraint_isnull' => '/Framework/Constraint/IsNull.php',
-            'phpunit_framework_constraint_istrue' => '/Framework/Constraint/IsTrue.php',
-            'phpunit_framework_constraint_istype' => '/Framework/Constraint/IsType.php',
-            'phpunit_framework_constraint_jsonmatches' => '/Framework/Constraint/JsonMatches.php',
-            'phpunit_framework_constraint_jsonmatches_errormessageprovider' => '/Framework/Constraint/JsonMatches/ErrorMessageProvider.php',
-            'phpunit_framework_constraint_lessthan' => '/Framework/Constraint/LessThan.php',
-            'phpunit_framework_constraint_not' => '/Framework/Constraint/Not.php',
-            'phpunit_framework_constraint_objecthasattribute' => '/Framework/Constraint/ObjectHasAttribute.php',
-            'phpunit_framework_constraint_or' => '/Framework/Constraint/Or.php',
-            'phpunit_framework_constraint_pcrematch' => '/Framework/Constraint/PCREMatch.php',
-            'phpunit_framework_constraint_samesize' => '/Framework/Constraint/SameSize.php',
-            'phpunit_framework_constraint_stringcontains' => '/Framework/Constraint/StringContains.php',
-            'phpunit_framework_constraint_stringendswith' => '/Framework/Constraint/StringEndsWith.php',
-            'phpunit_framework_constraint_stringmatches' => '/Framework/Constraint/StringMatches.php',
-            'phpunit_framework_constraint_stringstartswith' => '/Framework/Constraint/StringStartsWith.php',
-            'phpunit_framework_constraint_traversablecontains' => '/Framework/Constraint/TraversableContains.php',
-            'phpunit_framework_constraint_traversablecontainsonly' => '/Framework/Constraint/TraversableContainsOnly.php',
-            'phpunit_framework_constraint_xor' => '/Framework/Constraint/Xor.php',
-            'phpunit_framework_error' => '/Framework/Error.php',
-            'phpunit_framework_error_deprecated' => '/Framework/Error/Deprecated.php',
-            'phpunit_framework_error_notice' => '/Framework/Error/Notice.php',
-            'phpunit_framework_error_warning' => '/Framework/Error/Warning.php',
-            'phpunit_framework_exception' => '/Framework/Exception.php',
-            'phpunit_framework_expectationfailedexception' => '/Framework/ExpectationFailedException.php',
-            'phpunit_framework_incompletetest' => '/Framework/IncompleteTest.php',
-            'phpunit_framework_incompletetesterror' => '/Framework/IncompleteTestError.php',
-            'phpunit_framework_outputerror' => '/Framework/OutputError.php',
-            'phpunit_framework_selfdescribing' => '/Framework/SelfDescribing.php',
-            'phpunit_framework_skippedtest' => '/Framework/SkippedTest.php',
-            'phpunit_framework_skippedtesterror' => '/Framework/SkippedTestError.php',
-            'phpunit_framework_skippedtestsuiteerror' => '/Framework/SkippedTestSuiteError.php',
-            'phpunit_framework_syntheticerror' => '/Framework/SyntheticError.php',
-            'phpunit_framework_test' => '/Framework/Test.php',
-            'phpunit_framework_testcase' => '/Framework/TestCase.php',
-            'phpunit_framework_testfailure' => '/Framework/TestFailure.php',
-            'phpunit_framework_testlistener' => '/Framework/TestListener.php',
-            'phpunit_framework_testresult' => '/Framework/TestResult.php',
-            'phpunit_framework_testsuite' => '/Framework/TestSuite.php',
-            'phpunit_framework_testsuite_dataprovider' => '/Framework/TestSuite/DataProvider.php',
-            'phpunit_framework_warning' => '/Framework/Warning.php',
-            'phpunit_runner_basetestrunner' => '/Runner/BaseTestRunner.php',
-            'phpunit_runner_standardtestsuiteloader' => '/Runner/StandardTestSuiteLoader.php',
-            'phpunit_runner_testsuiteloader' => '/Runner/TestSuiteLoader.php',
-            'phpunit_runner_version' => '/Runner/Version.php',
-            'phpunit_textui_command' => '/TextUI/Command.php',
-            'phpunit_textui_resultprinter' => '/TextUI/ResultPrinter.php',
-            'phpunit_textui_testrunner' => '/TextUI/TestRunner.php',
-            'phpunit_util_class' => '/Util/Class.php',
-            'phpunit_util_configuration' => '/Util/Configuration.php',
-            'phpunit_util_deprecatedfeature' => '/Util/DeprecatedFeature.php',
-            'phpunit_util_deprecatedfeature_logger' => '/Util/DeprecatedFeature/Logger.php',
-            'phpunit_util_diff' => '/Util/Diff.php',
-            'phpunit_util_errorhandler' => '/Util/ErrorHandler.php',
-            'phpunit_util_fileloader' => '/Util/Fileloader.php',
-            'phpunit_util_filesystem' => '/Util/Filesystem.php',
-            'phpunit_util_filter' => '/Util/Filter.php',
-            'phpunit_util_getopt' => '/Util/Getopt.php',
-            'phpunit_util_globalstate' => '/Util/GlobalState.php',
-            'phpunit_util_invalidargumenthelper' => '/Util/InvalidArgumentHelper.php',
-            'phpunit_util_log_json' => '/Util/Log/JSON.php',
-            'phpunit_util_log_junit' => '/Util/Log/JUnit.php',
-            'phpunit_util_log_tap' => '/Util/Log/TAP.php',
-            'phpunit_util_php' => '/Util/PHP.php',
-            'phpunit_util_php_default' => '/Util/PHP/Default.php',
-            'phpunit_util_php_windows' => '/Util/PHP/Windows.php',
-            'phpunit_util_printer' => '/Util/Printer.php',
-            'phpunit_util_string' => '/Util/String.php',
-            'phpunit_util_test' => '/Util/Test.php',
-            'phpunit_util_testdox_nameprettifier' => '/Util/TestDox/NamePrettifier.php',
-            'phpunit_util_testdox_resultprinter' => '/Util/TestDox/ResultPrinter.php',
-            'phpunit_util_testdox_resultprinter_html' => '/Util/TestDox/ResultPrinter/HTML.php',
-            'phpunit_util_testdox_resultprinter_text' => '/Util/TestDox/ResultPrinter/Text.php',
-            'phpunit_util_testsuiteiterator' => '/Util/TestSuiteIterator.php',
-            'phpunit_util_type' => '/Util/Type.php',
-            'phpunit_util_xml' => '/Util/XML.php'
-          );
-
-          $path = dirname(__FILE__);
-      }
-
-      $cn = strtolower($class);
-
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
-);
-
-// Symfony Yaml autoloader
-spl_autoload_register(
-  function ($class) {
-      if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Yaml')) {
-          $file = sprintf(
-            'Symfony/Component/Yaml%s.php',
-
-            substr(
-              str_replace('\\', '/', $class),
-              strlen('Symfony\Component\Yaml')
-            )
-          );
-
-          if (stream_resolve_include_path($file)) {
-              require_once $file;
-          }
-      }
-  }
-);
-
-if (stream_resolve_include_path('PHP/Invoker/Autoload.php')) {
-    require_once 'PHP/Invoker/Autoload.php';
-}
-
-if (stream_resolve_include_path('PHPUnit/Extensions/Database/Autoload.php')) {
-    require_once 'PHPUnit/Extensions/Database/Autoload.php';
-}
-
-if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumCommon/Autoload.php')) {
-    require_once 'PHPUnit/Extensions/SeleniumCommon/Autoload.php';
-}
-
-else if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumTestCase/Autoload.php')) {
-    require_once 'PHPUnit/Extensions/SeleniumTestCase/Autoload.php';
-}
-
-if (stream_resolve_include_path('PHPUnit/Extensions/Story/Autoload.php')) {
-    require_once 'PHPUnit/Extensions/Story/Autoload.php';
-}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Autoload.php.in b/core/vendor/phpunit/phpunit/PHPUnit/Autoload.php.in
deleted file mode 100644
index 2072e7678b8feb5fdc2e0bd112879618949692c9..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/PHPUnit/Autoload.php.in
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.5.0
- */
-
-if (defined('PHPUNIT_COMPOSER_INSTALL')) {
-    return;
-}
-
-$paths = array(
-  __DIR__ . '/../vendor',
-  __DIR__ . '/../../..'
-);
-
-foreach ($paths as $path) {
-    if (@is_dir($path . '/composer') &&
-        @is_file($path . '/autoload.php')) {
-        require_once $path . '/autoload.php';
-        define('PHPUNIT_COMPOSER_INSTALL', $path . '/autoload.php');
-
-        return;
-    }
-}
-
-require_once 'File/Iterator/Autoload.php';
-require_once 'PHP/CodeCoverage/Autoload.php';
-require_once 'PHP/Timer/Autoload.php';
-require_once 'PHPUnit/Framework/MockObject/Autoload.php';
-require_once 'Text/Template/Autoload.php';
-
-spl_autoload_register(
-  function ($class)
-  {
-      static $classes = NULL;
-      static $path    = NULL;
-
-      if ($classes === NULL) {
-          $classes = array(
-            ___CLASSLIST___
-          );
-
-          $path = dirname(__FILE__);
-      }
-
-      $cn = strtolower($class);
-
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
-);
-
-// Symfony Yaml autoloader
-spl_autoload_register(
-  function ($class) {
-      if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Yaml')) {
-          $file = sprintf(
-            'Symfony/Component/Yaml%s.php',
-
-            substr(
-              str_replace('\\', '/', $class),
-              strlen('Symfony\Component\Yaml')
-            )
-          );
-
-          if (stream_resolve_include_path($file)) {
-              require_once $file;
-          }
-      }
-  }
-);
-
-if (stream_resolve_include_path('PHP/Invoker/Autoload.php')) {
-    require_once 'PHP/Invoker/Autoload.php';
-}
-
-if (stream_resolve_include_path('PHPUnit/Extensions/Database/Autoload.php')) {
-    require_once 'PHPUnit/Extensions/Database/Autoload.php';
-}
-
-if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumCommon/Autoload.php')) {
-    require_once 'PHPUnit/Extensions/SeleniumCommon/Autoload.php';
-}
-
-else if (stream_resolve_include_path('PHPUnit/Extensions/SeleniumTestCase/Autoload.php')) {
-    require_once 'PHPUnit/Extensions/SeleniumTestCase/Autoload.php';
-}
-
-if (stream_resolve_include_path('PHPUnit/Extensions/Story/Autoload.php')) {
-    require_once 'PHPUnit/Extensions/Story/Autoload.php';
-}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase.php b/core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase.php
deleted file mode 100644
index 61784bec30ad772c405d7e4227fdf1801a9cff9b..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase.php
+++ /dev/null
@@ -1,269 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Extensions_PhptTestCase
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.1.4
- */
-
-if (stream_resolve_include_path('PEAR/RunTest.php')) {
-    $currentErrorReporting = error_reporting(E_ERROR | E_WARNING | E_PARSE);
-    require_once 'PEAR/RunTest.php';
-    error_reporting($currentErrorReporting);
-}
-
-/**
- * Wrapper to run .phpt test cases.
- *
- * @package    PHPUnit
- * @subpackage Extensions_PhptTestCase
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.1.4
- */
-class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing
-{
-    /**
-     * The filename of the .phpt file.
-     *
-     * @var    string
-     */
-    protected $filename;
-
-    /**
-     * Options for PEAR_RunTest.
-     *
-     * @var    array
-     */
-    protected $options = array();
-
-    /**
-     * Constructs a test case with the given filename.
-     *
-     * @param  string $filename
-     * @param  array  $options
-     */
-    public function __construct($filename, array $options = array())
-    {
-        if (!is_string($filename)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!is_file($filename)) {
-            throw new PHPUnit_Framework_Exception(
-              sprintf(
-                'File "%s" does not exist.',
-                $filename
-              )
-            );
-        }
-
-        $this->filename = $filename;
-        $this->options  = $options;
-    }
-
-    /**
-     * Counts the number of test cases executed by run(TestResult result).
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return 1;
-    }
-
-    /**
-     * Runs a test and collects its result in a TestResult instance.
-     *
-     * @param  PHPUnit_Framework_TestResult $result
-     * @param  array                        $options
-     * @return PHPUnit_Framework_TestResult
-     */
-    public function run(PHPUnit_Framework_TestResult $result = NULL, array $options = array())
-    {
-        if (!class_exists('PEAR_RunTest', FALSE)) {
-            throw new PHPUnit_Framework_Exception('Class PEAR_RunTest not found.');
-        }
-
-        if (isset($GLOBALS['_PEAR_destructor_object_list']) &&
-            is_array($GLOBALS['_PEAR_destructor_object_list']) &&
-            !empty($GLOBALS['_PEAR_destructor_object_list'])) {
-            $pearDestructorObjectListCount = count($GLOBALS['_PEAR_destructor_object_list']);
-        } else {
-            $pearDestructorObjectListCount = 0;
-        }
-
-        if ($result === NULL) {
-            $result = new PHPUnit_Framework_TestResult;
-        }
-
-        $coverage = $result->getCollectCodeCoverageInformation();
-        $options  = array_merge($options, $this->options);
-
-        if (!isset($options['include_path'])) {
-            $options['include_path'] = get_include_path();
-        }
-
-        if ($coverage) {
-            $options['coverage'] = TRUE;
-        } else {
-            $options['coverage'] = FALSE;
-        }
-
-        $currentErrorReporting = error_reporting(E_ERROR | E_WARNING | E_PARSE);
-        $runner                = new PEAR_RunTest(new PHPUnit_Extensions_PhptTestCase_Logger, $options);
-
-        if ($coverage) {
-            $runner->xdebug_loaded = TRUE;
-        } else {
-            $runner->xdebug_loaded = FALSE;
-        }
-
-        $result->startTest($this);
-
-        PHP_Timer::start();
-
-        $buffer = $runner->run($this->filename, $options);
-        $time   = PHP_Timer::stop();
-
-        error_reporting($currentErrorReporting);
-
-        $base         = basename($this->filename);
-        $path         = dirname($this->filename);
-        $coverageFile = $path . DIRECTORY_SEPARATOR . str_replace(
-                          '.phpt', '.xdebug', $base
-                        );
-        $diffFile     = $path . DIRECTORY_SEPARATOR . str_replace(
-                          '.phpt', '.diff', $base
-                        );
-        $expFile      = $path . DIRECTORY_SEPARATOR . str_replace(
-                          '.phpt', '.exp', $base
-                        );
-        $logFile      = $path . DIRECTORY_SEPARATOR . str_replace(
-                          '.phpt', '.log', $base
-                        );
-        $outFile      = $path . DIRECTORY_SEPARATOR . str_replace(
-                          '.phpt', '.out', $base
-                        );
-        $phpFile      = $path . DIRECTORY_SEPARATOR . str_replace(
-                          '.phpt', '.php', $base
-                        );
-
-        if (is_object($buffer) && $buffer instanceof PEAR_Error) {
-            $result->addError(
-              $this,
-              new PHPUnit_Framework_Exception($buffer->getMessage()),
-              $time
-            );
-        }
-
-        else if ($buffer == 'SKIPPED') {
-            $result->addFailure($this, new PHPUnit_Framework_SkippedTestError, 0);
-        }
-
-        else if ($buffer != 'PASSED') {
-            $expContent = file_get_contents($expFile);
-            $outContent = file_get_contents($outFile);
-
-            $result->addFailure(
-              $this,
-              new PHPUnit_Framework_ComparisonFailure(
-                $expContent,
-                $outContent,
-                $expContent,
-                $outContent
-              ),
-              $time
-            );
-        }
-
-        foreach (array($diffFile, $expFile, $logFile, $phpFile, $outFile) as $file) {
-            if (file_exists($file)) {
-                unlink($file);
-            }
-        }
-
-        if ($coverage && file_exists($coverageFile)) {
-            eval('$coverageData = ' . file_get_contents($coverageFile) . ';');
-            unset($coverageData[$phpFile]);
-
-            $result->getCodeCoverage()->append($coverageData, $this);
-            unlink($coverageFile);
-        }
-
-        $result->endTest($this, $time);
-
-        // Do not invoke PEAR's destructor mechanism for PHP 4
-        // as it raises an E_STRICT.
-        if ($pearDestructorObjectListCount == 0) {
-            unset($GLOBALS['_PEAR_destructor_object_list']);
-        } else {
-            $count = count($GLOBALS['_PEAR_destructor_object_list']) - $pearDestructorObjectListCount;
-
-            for ($i = 0; $i < $count; $i++) {
-                array_pop($GLOBALS['_PEAR_destructor_object_list']);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the name of the test case.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Returns a string representation of the test case.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->filename;
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Class.php b/core/vendor/phpunit/phpunit/PHPUnit/Util/Class.php
deleted file mode 100644
index 20500692adffe0a116fca6114673c16bc338c669..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Class.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Util
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.1.0
- */
-
-/**
- * Class helpers.
- *
- * @package    PHPUnit
- * @subpackage Util
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.1.0
- */
-class PHPUnit_Util_Class
-{
-    protected static $buffer = array();
-
-    /**
-     * Starts the collection of loaded classes.
-     *
-     */
-    public static function collectStart()
-    {
-        self::$buffer = get_declared_classes();
-    }
-
-    /**
-     * Stops the collection of loaded classes and
-     * returns the names of the loaded classes.
-     *
-     * @return array
-     */
-    public static function collectEnd()
-    {
-        return array_values(
-          array_diff(get_declared_classes(), self::$buffer)
-        );
-    }
-
-    /**
-     * Returns the class hierarchy for a given class.
-     *
-     * @param  string  $className
-     * @param  boolean $asReflectionObjects
-     * @return array
-     */
-    public static function getHierarchy($className, $asReflectionObjects = FALSE)
-    {
-        if ($asReflectionObjects) {
-            $classes = array(new ReflectionClass($className));
-        } else {
-            $classes = array($className);
-        }
-
-        $done = FALSE;
-
-        while (!$done) {
-            if ($asReflectionObjects) {
-                $class = new ReflectionClass(
-                  $classes[count($classes)-1]->getName()
-                );
-            } else {
-                $class = new ReflectionClass($classes[count($classes)-1]);
-            }
-
-            $parent = $class->getParentClass();
-
-            if ($parent !== FALSE) {
-                if ($asReflectionObjects) {
-                    $classes[] = $parent;
-                } else {
-                    $classes[] = $parent->getName();
-                }
-            } else {
-                $done = TRUE;
-            }
-        }
-
-        return $classes;
-    }
-
-    /**
-     * Returns the parameters of a function or method.
-     *
-     * @param  ReflectionFunction|ReflectionMethod $method
-     * @param  boolean                             $forCall
-     * @return string
-     * @since  Method available since Release 3.2.0
-     */
-    public static function getMethodParameters($method, $forCall = FALSE)
-    {
-        $parameters = array();
-
-        foreach ($method->getParameters() as $i => $parameter) {
-            $name = '$' . $parameter->getName();
-
-            /* Note: PHP extensions may use empty names for reference arguments
-             * or "..." for methods taking a variable number of arguments.
-             */
-            if ($name === '$' || $name === '$...') {
-                $name = '$arg' . $i;
-            }
-
-            $default   = '';
-            $reference = '';
-            $typeHint  = '';
-
-            if (!$forCall) {
-                if ($parameter->isArray()) {
-                    $typeHint = 'array ';
-                }
-
-                else if (version_compare(PHP_VERSION, '5.4', '>') &&
-                         $parameter->isCallable()) {
-                    $typeHint = 'callable ';
-                }
-
-                else {
-                    try {
-                        $class = $parameter->getClass();
-                    }
-
-                    catch (ReflectionException $e) {
-                        $class = FALSE;
-                    }
-
-                    if ($class) {
-                        $typeHint = $class->getName() . ' ';
-                    }
-                }
-
-                if ($parameter->isDefaultValueAvailable()) {
-                    $value   = $parameter->getDefaultValue();
-                    $default = ' = ' . var_export($value, TRUE);
-                }
-
-                else if ($parameter->isOptional()) {
-                    $default = ' = null';
-                }
-            }
-
-            if ($parameter->isPassedByReference()) {
-                $reference = '&';
-            }
-
-            $parameters[] = $typeHint . $reference . $name . $default;
-        }
-
-        return join(', ', $parameters);
-    }
-
-    /**
-     * Returns the package information of a user-defined class.
-     *
-     * @param  string $className
-     * @param  string $docComment
-     * @return array
-     */
-    public static function getPackageInformation($className, $docComment)
-    {
-        $result = array(
-          'namespace'   => '',
-          'fullPackage' => '',
-          'category'    => '',
-          'package'     => '',
-          'subpackage'  => ''
-        );
-
-        if (strpos($className, '\\') !== FALSE) {
-            $result['namespace'] = self::arrayToName(
-              explode('\\', $className)
-            );
-        }
-
-        if (preg_match('/@category[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['category'] = $matches[1];
-        }
-
-        if (preg_match('/@package[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['package']     = $matches[1];
-            $result['fullPackage'] = $matches[1];
-        }
-
-        if (preg_match('/@subpackage[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['subpackage']   = $matches[1];
-            $result['fullPackage'] .= '.' . $matches[1];
-        }
-
-        if (empty($result['fullPackage'])) {
-            $result['fullPackage'] = self::arrayToName(
-              explode('_', str_replace('\\', '_', $className)), '.'
-            );
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the value of a static attribute.
-     * This also works for attributes that are declared protected or private.
-     *
-     * @param  string  $className
-     * @param  string  $attributeName
-     * @return mixed
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getStaticAttribute($className, $attributeName)
-    {
-        if (!is_string($className)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
-        }
-
-        if (!class_exists($className)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class name');
-        }
-
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        $class = new ReflectionClass($className);
-
-        while ($class) {
-            $attributes = $class->getStaticProperties();
-
-            if (array_key_exists($attributeName, $attributes)) {
-                return $attributes[$attributeName];
-            }
-
-            $class = $class->getParentClass();
-        }
-
-        throw new PHPUnit_Framework_Exception(
-          sprintf(
-            'Attribute "%s" not found in class.',
-
-            $attributeName
-          )
-        );
-    }
-
-    /**
-     * Returns the value of an object's attribute.
-     * This also works for attributes that are declared protected or private.
-     *
-     * @param  object  $object
-     * @param  string  $attributeName
-     * @return mixed
-     * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getObjectAttribute($object, $attributeName)
-    {
-        if (!is_object($object)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'object');
-        }
-
-        if (!is_string($attributeName)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
-        }
-
-        try {
-            $attribute = new ReflectionProperty($object, $attributeName);
-        }
-
-        catch (ReflectionException $e) {
-            $reflector = new ReflectionObject($object);
-
-            while ($reflector = $reflector->getParentClass()) {
-                try {
-                    $attribute = $reflector->getProperty($attributeName);
-                    break;
-                }
-
-                catch(ReflectionException $e) {
-                }
-            }
-        }
-
-        if (isset($attribute)) {
-            if (!$attribute || $attribute->isPublic()) {
-                return $object->$attributeName;
-            }
-            $attribute->setAccessible(TRUE);
-            $value = $attribute->getValue($object);
-            $attribute->setAccessible(FALSE);
-
-            return $value;
-        }
-
-        throw new PHPUnit_Framework_Exception(
-          sprintf(
-            'Attribute "%s" not found in object.',
-            $attributeName
-          )
-        );
-    }
-
-    /**
-     * Returns the package information of a user-defined class.
-     *
-     * @param  array  $parts
-     * @param  string $join
-     * @return string
-     * @since  Method available since Release 3.2.12
-     */
-    protected static function arrayToName(array $parts, $join = '\\')
-    {
-        $result = '';
-
-        if (count($parts) > 1) {
-            array_pop($parts);
-
-            $result = join($join, $parts);
-        }
-
-        return $result;
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/README.md b/core/vendor/phpunit/phpunit/README.md
index 82cb24783a4ebf6a000afd36b4ade26356ccb389..6c6aaf1e073a2739564e20973ef5c8d48a580dba 100644
--- a/core/vendor/phpunit/phpunit/README.md
+++ b/core/vendor/phpunit/phpunit/README.md
@@ -1,66 +1,31 @@
 # PHPUnit
 
-PHPUnit is the de-facto standard for unit testing in PHP projects. It provides both a framework that makes the writing of tests easy as well as the functionality to easily run the tests and analyse their results.
+PHPUnit is a programmer-oriented testing framework for PHP. It is an instance of the xUnit architecture for unit testing frameworks.
 
-[![Build Status](https://travis-ci.org/sebastianbergmann/phpunit.png?branch=3.7)](https://travis-ci.org/sebastianbergmann/phpunit)
-
-## Requirements
-
-* PHPUnit 3.7 requires PHP 5.3.3 (or later) but PHP 5.4.6 (or later) is highly recommended.
-* [PHP_CodeCoverage](http://github.com/sebastianbergmann/php-code-coverage), the library that is used by PHPUnit to collect and process code coverage information, depends on [Xdebug](http://xdebug.org/) 2.0.5 (or later) but Xdebug 2.2.1 (or later) is highly recommended.
+[![Latest Stable Version](https://poser.pugx.org/phpunit/phpunit/v/stable.png)](https://packagist.org/packages/phpunit/phpunit)
+[![Build Status](https://travis-ci.org/sebastianbergmann/phpunit.png?branch=master)](https://travis-ci.org/sebastianbergmann/phpunit)
+[![Dependency Status](https://www.versioneye.com/php/phpunit:phpunit/dev-master/badge.png)](https://www.versioneye.com/php/phpunit:phpunit/dev-master)
 
 ## Installation
 
-There are three supported ways of installing PHPUnit.
-
-You can use the [PEAR Installer](http://pear.php.net/manual/en/guide.users.commandline.cli.php) or [Composer](http://getcomposer.org/) to download and install PHPUnit as well as its dependencies. You can also download a [PHP Archive (PHAR)](http://php.net/phar) of PHPUnit that has all required (as well as some optional) dependencies of PHPUnit bundled in a single file.
-
-### PEAR Installer
-
-The following two commands (which you may have to run as `root`) are all that is required to install PHPUnit using the PEAR Installer:
-
-    pear config-set auto_discover 1
-    pear install pear.phpunit.de/PHPUnit
-
-### Composer
+We distribute a [PHP Archive (PHAR)](http://php.net/phar) that has all required (as well as some optional) dependencies of PHPUnit bundled in a single file:
 
-To add PHPUnit as a local, per-project dependency to your project, simply add a dependency on `phpunit/phpunit` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a development-time dependency on PHPUnit 3.7:
-
-    {
-        "require-dev": {
-            "phpunit/phpunit": "3.7.*"
-        }
-    }
-
-### PHP Archive (PHAR)
-
-    wget http://pear.phpunit.de/get/phpunit.phar
+    wget https://phar.phpunit.de/phpunit.phar
     chmod +x phpunit.phar
+    mv phpunit.phar /usr/local/bin/phpunit
 
-## Documentation
+You can also immediately use the PHAR after you have downloaded it, of course:
 
-The documentation for PHPUnit is available in different formats:
+    wget https://phar.phpunit.de/phpunit.phar
+    php phpunit.phar
 
-* [English, multiple HTML files](http://www.phpunit.de/manual/3.7/en/index.html)
-* [English, single HTML file](http://www.phpunit.de/manual/3.7/en/phpunit-book.html)
-* [English, PDF](http://www.phpunit.de/manual/3.7/en/phpunit-book.pdf)
-* [English, ePub](http://www.phpunit.de/manual/3.7/en/phpunit-book.epub)
-* [Brazilian Portuguese, multiple HTML files](http://www.phpunit.de/manual/3.7/pt_br/index.html)
-* [Brazilian Portuguese, single HTML file](http://www.phpunit.de/manual/3.7/pt_br/phpunit-book.html)
-* [Brazilian Portuguese, PDF](http://www.phpunit.de/manual/3.7/pt_br/phpunit-book.pdf)
-* [Brazilian Portuguese, ePub](http://www.phpunit.de/manual/3.7/pt_br/phpunit-book.epub)
-* [French, multiple HTML files](http://www.phpunit.de/manual/3.7/fr/index.html)
-* [French, single HTML file](http://www.phpunit.de/manual/3.7/fr/phpunit-book.html)
-* [French, PDF](http://www.phpunit.de/manual/3.7/fr/phpunit-book.pdf)
-* [French, ePub](http://www.phpunit.de/manual/3.7/fr/phpunit-book.epub)
-* [Japanese, multiple HTML files](http://www.phpunit.de/manual/3.7/ja/index.html)
-* [Japanese, single HTML file](http://www.phpunit.de/manual/3.7/ja/phpunit-book.html)
-* [Japanese, PDF](http://www.phpunit.de/manual/3.7/ja/phpunit-book.pdf)
-* [Japanese, ePub](http://www.phpunit.de/manual/3.7/ja/phpunit-book.epub)
+Alternatively, you may use [Composer](http://getcomposer.org/) to download and install PHPUnit as well as its dependencies. Please refer to the [documentation](http://phpunit.de/documentation.html) for details on how to do this.
 
-## IRC
+## Contribute
 
-The [#phpunit channel on the Freenode IRC network](irc://irc.freenode.net/phpunit) is a place to chat about PHPUnit.
+Please refer to [CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md) for information on how to contribute to PHPUnit and its related projects.
+
+The development of PHPUnit is discussed on the [dev@phpunit.de](mailto:dev-subscribe@phpunit.de) mailing list as well as on the [#phpunit channel on the Freenode IRC network](irc://irc.freenode.net/phpunit).
 
 ## List of Contributors
 
@@ -74,4 +39,3 @@ A very special thanks to everyone who has contributed to the documentation and h
 
 * [PHPUnit Documentation](https://github.com/sebastianbergmann/phpunit-documentation/graphs/contributors)
 
-Please refer to [CONTRIBUTING.md](https://github.com/sebastianbergmann/phpunit/blob/master/CONTRIBUTING.md) for information on how to contribute to PHPUnit and its related projects.
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/Assert/FunctionsTest.php b/core/vendor/phpunit/phpunit/Tests/Framework/Assert/FunctionsTest.php
deleted file mode 100644
index 2903e49b3238be5a02f75e953c45090fb9f99241..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/Tests/Framework/Assert/FunctionsTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @author     Kuzuha SHINODA <kuzuha01@hotmail.com>
- * @copyright  2013-2013 Kuzuha SHINODA <kuzuha01@hotmail.com>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.7.20
- */
-
-require_once dirname(dirname(dirname(__DIR__))) . '/PHPUnit/Framework/Assert/Functions.php';
-
-/**
- *
- *
- * @package    PHPUnit
- * @author     Kuzuha SHINODA <kuzuha01@hotmail.com>
- * @copyright  2013-2013 Kuzuha SHINODA <kuzuha01@hotmail.com>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.7.20
- */
-class Framework_Assert_FunctionsTest extends PHPUnit_Framework_TestCase
-{
-
-    public function testLogicalAnd()
-    {
-        $expected = $this->logicalAnd($this->isTrue(), $this->isFalse());
-        $actual = logicalAnd($this->isTrue(), $this->isFalse());
-        $this->assertSame($expected->toString(), $actual->toString());
-    }
-
-    public function testLogicalOr()
-    {
-        $expected = $this->logicalOr($this->isTrue(), $this->isFalse());
-        $actual = logicalOr($this->isTrue(), $this->isFalse());
-        $this->assertSame($expected->toString(), $actual->toString());
-    }
-
-    public function testLogicalXor()
-    {
-        $expected = $this->logicalXor($this->isTrue(), $this->isFalse());
-        $actual = logicalXor($this->isTrue(), $this->isFalse());
-        $this->assertSame($expected->toString(), $actual->toString());
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/ComparatorTest.php b/core/vendor/phpunit/phpunit/Tests/Framework/ComparatorTest.php
deleted file mode 100644
index c5c1dbb9699995ffdc0da44332323f9325dac93d..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/Tests/Framework/ComparatorTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ClassWithToString.php';
-
-class TestClass {}
-class TestClassComparator extends PHPUnit_Framework_Comparator_Object {}
-
-/**
- *
- *
- * @package    PHPUnit
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class Framework_ComparatorTest extends PHPUnit_Framework_TestCase
-{
-    // Don't use other test methods than ->fail() here, because the testers tested
-    // here are the foundation for the other test methods
-
-    public function instanceProvider()
-    {
-        $tmpfile = tmpfile();
-
-        return array(
-            array(NULL, NULL, 'PHPUnit_Framework_Comparator_Scalar'),
-            array(NULL, TRUE, 'PHPUnit_Framework_Comparator_Scalar'),
-            array(TRUE, NULL, 'PHPUnit_Framework_Comparator_Scalar'),
-            array(TRUE, TRUE, 'PHPUnit_Framework_Comparator_Scalar'),
-            array(FALSE, FALSE, 'PHPUnit_Framework_Comparator_Scalar'),
-            array(TRUE, FALSE, 'PHPUnit_Framework_Comparator_Scalar'),
-            array(FALSE, TRUE, 'PHPUnit_Framework_Comparator_Scalar'),
-            array('', '', 'PHPUnit_Framework_Comparator_Scalar'),
-            array('0', '0', 'PHPUnit_Framework_Comparator_Numeric'),
-            array('0', 0, 'PHPUnit_Framework_Comparator_Numeric'),
-            array(0, '0', 'PHPUnit_Framework_Comparator_Numeric'),
-            array(0, 0, 'PHPUnit_Framework_Comparator_Numeric'),
-            array(1.0, 0, 'PHPUnit_Framework_Comparator_Double'),
-            array(0, 1.0, 'PHPUnit_Framework_Comparator_Double'),
-            array(1.0, 1.0, 'PHPUnit_Framework_Comparator_Double'),
-            array(array(1), array(1), 'PHPUnit_Framework_Comparator_Array'),
-            array($tmpfile, $tmpfile, 'PHPUnit_Framework_Comparator_Resource'),
-            array(new stdClass, new stdClass, 'PHPUnit_Framework_Comparator_Object'),
-            array(new SplObjectStorage, new SplObjectStorage, 'PHPUnit_Framework_Comparator_SplObjectStorage'),
-            array(new Exception, new Exception, 'PHPUnit_Framework_Comparator_Exception'),
-            array(new DOMDocument, new DOMDocument, 'PHPUnit_Framework_Comparator_DOMDocument'),
-            // mixed types
-            array($tmpfile, array(1), 'PHPUnit_Framework_Comparator_Type'),
-            array(array(1), $tmpfile, 'PHPUnit_Framework_Comparator_Type'),
-            array($tmpfile, '1', 'PHPUnit_Framework_Comparator_Type'),
-            array('1', $tmpfile, 'PHPUnit_Framework_Comparator_Type'),
-            array($tmpfile, new stdClass, 'PHPUnit_Framework_Comparator_Type'),
-            array(new stdClass, $tmpfile, 'PHPUnit_Framework_Comparator_Type'),
-            array(new stdClass, array(1), 'PHPUnit_Framework_Comparator_Type'),
-            array(array(1), new stdClass, 'PHPUnit_Framework_Comparator_Type'),
-            array(new stdClass, '1', 'PHPUnit_Framework_Comparator_Type'),
-            array('1', new stdClass, 'PHPUnit_Framework_Comparator_Type'),
-            array(new ClassWithToString, '1', 'PHPUnit_Framework_Comparator_Scalar'),
-            array('1', new ClassWithToString, 'PHPUnit_Framework_Comparator_Scalar'),
-            array(1.0, new stdClass, 'PHPUnit_Framework_Comparator_Type'),
-            array(new stdClass, 1.0, 'PHPUnit_Framework_Comparator_Type'),
-            array(1.0, array(1), 'PHPUnit_Framework_Comparator_Type'),
-            array(array(1), 1.0, 'PHPUnit_Framework_Comparator_Type'),
-        );
-    }
-
-    /**
-     * @dataProvider instanceProvider
-     */
-    public function testGetInstance($a, $b, $expected)
-    {
-        $factory = new PHPUnit_Framework_ComparatorFactory;
-
-        if (get_class($factory->getComparatorFor($a, $b)) != $expected) {
-            $this->fail();
-        }
-    }
-
-    public function testRegister()
-    {
-        $comparator = new TestClassComparator;
-
-        $factory = new PHPUnit_Framework_ComparatorFactory;
-        $factory->register($comparator);
-
-        $a = new TestClass;
-        $b = new TestClass;
-        $expected = 'TestClassComparator';
-
-        if (get_class($factory->getComparatorFor($a, $b)) != $expected) {
-            $factory->unregister($comparator);
-            $this->fail();
-        }
-
-        $factory->unregister($comparator);
-    }
-
-    public function testUnregister()
-    {
-        $comparator = new TestClassComparator;
-
-        $factory = new PHPUnit_Framework_ComparatorFactory;
-        $factory->register($comparator);
-        $factory->unregister($comparator);
-
-        $a = new TestClass;
-        $b = new TestClass;
-        $expected = 'PHPUnit_Framework_Comparator_Object';
-
-        if (get_class($factory->getComparatorFor($a, $b)) != $expected) {
-            var_dump(get_class($factory->getComparatorFor($a, $b)));
-            $this->fail();
-        }
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/Tests/Util/TestTest.php b/core/vendor/phpunit/phpunit/Tests/Util/TestTest.php
deleted file mode 100644
index f57e4e722679399c80fa79b47494b89ecab8ade6..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/Tests/Util/TestTest.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Sebastian Bergmann nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.3.6
- */
-
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ExceptionTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ExceptionNamespaceTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'RequirementsTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'RequirementsClassDocBlockTest.php';
-
-/**
- *
- *
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.3.6
- */
-class Util_TestTest extends PHPUnit_Framework_TestCase
-{
-    public function testGetExpectedException()
-    {
-        $this->assertSame(
-          array('class' => 'FooBarBaz', 'code' => NULL, 'message' => ''),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testOne')
-        );
-
-        $this->assertSame(
-          array('class' => 'Foo_Bar_Baz', 'code' => NULL, 'message' => ''),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testTwo')
-        );
-
-        $this->assertSame(
-          array('class' => 'Foo\Bar\Baz', 'code' => NULL, 'message' => ''),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testThree')
-        );
-
-        $this->assertSame(
-          array('class' => 'ほげ', 'code' => NULL, 'message' => ''),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFour')
-        );
-
-        $this->assertSame(
-          array('class' => 'Class', 'code' => 1234, 'message' => 'Message'),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFive')
-        );
-
-        $this->assertSame(
-          array('class' => 'Class', 'code' => 1234, 'message' => 'Message'),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSix')
-        );
-
-        $this->assertSame(
-          array('class' => 'Class', 'code' => 'ExceptionCode', 'message' => 'Message'),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSeven')
-        );
-
-        $this->assertSame(
-          array('class' => 'Class', 'code' => 0, 'message' => 'Message'),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testEight')
-        );
-        $this->assertSame(
-          array('class' => 'Class', 'code' => ExceptionTest::ERROR_CODE, 'message' => ExceptionTest::ERROR_MESSAGE),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testNine')
-        );
-        $this->assertSame(
-          array('class' => 'Class', 'code' => NULL, 'message' => ''),
-          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSingleLine')
-        );
-        $this->assertSame(
-            array('class' => 'Class', 'code' => My\Space\ExceptionNamespaceTest::ERROR_CODE, 'message' => My\Space\ExceptionNamespaceTest::ERROR_MESSAGE),
-            PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testConstants')
-        );
-        // Ensure the Class::CONST expression is only evaluated when the constant really exists
-        $this->assertSame(
-            array('class' => 'Class', 'code' => 'ExceptionTest::UNKNOWN_CODE_CONSTANT', 'message' => 'ExceptionTest::UNKNOWN_MESSAGE_CONSTANT'),
-            PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testUnknownConstants')
-        );
-        $this->assertSame(
-            array('class' => 'Class', 'code' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT', 'message' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT'),
-            PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testUnknownConstants')
-        );
-    }
-
-    public function provideRequirements()
-    {
-        return array(
-            array('testOne',   array()),
-            array('testTwo',   array('PHPUnit' => '1.0')),
-            array('testThree', array('PHP' => '2.0')),
-            array('testFour',  array('PHPUnit'=>'2.0', 'PHP' => '1.0')),
-            array('testFive',  array('PHP' => '5.4.0RC6')),
-            array('testSix',   array('PHP' => '5.4.0-alpha1')),
-            array('testSeven', array('PHP' => '5.4.0beta2')),
-            array('testEight', array('PHP' => '5.4-dev')),
-            array('testNine',  array('functions' => array('testFunc'))),
-            array('testTen',   array('extensions' => array('testExt'))),
-            array(
-                'testAllPossibleRequirements',
-                array(
-                    'PHP' => '99-dev',
-                    'PHPUnit' => '9-dev',
-                    'functions' => array(
-                        'testFuncOne',
-                        'testFuncTwo',
-                    ),
-                    'extensions' => array(
-                        'testExtOne',
-                        'testExtTwo',
-                    )
-                )
-            )
-        );
-    }
-
-    /**
-     * @dataProvider provideRequirements
-     */
-    public function testGetRequirements($test, $result)
-    {
-        $this->assertEquals(
-          $result,
-          PHPUnit_Util_Test::getRequirements('RequirementsTest', $test)
-        );
-    }
-
-    public function testGetRequirementsMergesClassAndMethodDocBlocks()
-    {
-        $expectedAnnotations = array(
-            'PHP' => '5.4',
-            'PHPUnit' => '3.7',
-            'functions' => array(
-                'testFuncClass',
-                'testFuncMethod',
-            ),
-            'extensions' => array(
-                'testExtClass',
-                'testExtMethod',
-            )
-        );
-
-        $this->assertEquals(
-          $expectedAnnotations,
-          PHPUnit_Util_Test::getRequirements('RequirementsClassDocBlockTest', 'testMethod')
-        );
-    }
-
-    public function testGetProvidedDataRegEx()
-    {
-        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider method', $matches);
-        $this->assertEquals(1, $result);
-        $this->assertEquals('method', $matches[1]);
-
-        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider class::method', $matches);
-        $this->assertEquals(1, $result);
-        $this->assertEquals('class::method', $matches[1]);
-
-        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider namespace\class::method', $matches);
-        $this->assertEquals(1, $result);
-        $this->assertEquals('namespace\class::method', $matches[1]);
-
-        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider namespace\namespace\class::method', $matches);
-        $this->assertEquals(1, $result);
-        $this->assertEquals('namespace\namespace\class::method', $matches[1]);
-
-        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider メソッド', $matches);
-        $this->assertEquals(1, $result);
-        $this->assertEquals('メソッド', $matches[1]);
-    }
-
-    public function testParseAnnotation()
-    {
-        $this->assertEquals(
-          array('Foo', 'ほげ'),
-          PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotation')
-        );
-    }
-
-    /**
-     * @depends Foo
-     * @depends ほげ
-     */
-    public function methodForTestParseAnnotation()
-    {
-    }
-
-    public function testParseAnnotationThatIsOnlyOneLine()
-    {
-        $this->assertEquals(
-          array('Bar'),
-          PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotationThatIsOnlyOneLine')
-        );
-    }
-
-    /** @depends Bar */
-    public function methodForTestParseAnnotationThatIsOnlyOneLine()
-    {
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInSetUpTest.php b/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInSetUpTest.php
deleted file mode 100644
index e0861cd232c283d253e001d388f6f211833142c8..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInSetUpTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-class ExceptionInSetUpTest extends PHPUnit_Framework_TestCase
-{
-    public $setUp = FALSE;
-    public $assertPreConditions = FALSE;
-    public $assertPostConditions = FALSE;
-    public $tearDown = FALSE;
-    public $testSomething = FALSE;
-
-    protected function setUp()
-    {
-        $this->setUp = TRUE;
-        throw new Exception;
-    }
-
-    protected function assertPreConditions()
-    {
-        $this->assertPreConditions = TRUE;
-    }
-
-    public function testSomething()
-    {
-        $this->testSomething = TRUE;
-    }
-
-    protected function assertPostConditions()
-    {
-        $this->assertPostConditions = TRUE;
-    }
-
-    protected function tearDown()
-    {
-        $this->tearDown = TRUE;
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInTest.php b/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInTest.php
deleted file mode 100644
index 2b1b66cadf7620ca0abfdcb40fe8d37744a40503..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-class ExceptionInTest extends PHPUnit_Framework_TestCase
-{
-    public $setUp = FALSE;
-    public $assertPreConditions = FALSE;
-    public $assertPostConditions = FALSE;
-    public $tearDown = FALSE;
-    public $testSomething = FALSE;
-
-    protected function setUp()
-    {
-        $this->setUp = TRUE;
-    }
-
-    protected function assertPreConditions()
-    {
-        $this->assertPreConditions = TRUE;
-    }
-
-    public function testSomething()
-    {
-        $this->testSomething = TRUE;
-        throw new Exception;
-    }
-
-    protected function assertPostConditions()
-    {
-        $this->assertPostConditions = TRUE;
-    }
-
-    protected function tearDown()
-    {
-        $this->tearDown = TRUE;
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/build.xml b/core/vendor/phpunit/phpunit/build.xml
index 5cb31de85ce4acc3b6ea14fcae63cda8532acb50..176d07a183b071eebb042b81de9d61630fb0f290 100644
--- a/core/vendor/phpunit/phpunit/build.xml
+++ b/core/vendor/phpunit/phpunit/build.xml
@@ -1,34 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <project name="PHPUnit" default="build">
  <property name="php" value="php"/>
 
  <target name="build"
-   depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpcb"/>
-
- <target name="build-parallel"
-   depends="prepare,lint,tools-parallel,phpunit,phpcb"/>
-
- <target name="tools-parallel"
-         description="Run tools in parallel">
-  <parallel threadCount="2">
-   <sequential>
-    <antcall target="pdepend"/>
-    <antcall target="phpmd-ci"/>
-   </sequential>
-   <antcall target="phpcpd"/>
-   <antcall target="phpcs-ci"/>
-   <antcall target="phploc"/>
-  </parallel>
- </target>
+   depends="prepare,lint,phploc,pdepend,phpmd-ci,phpcs-ci,phpcpd,phpunit,phpdox"/>
 
  <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/bin"/>
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
   <delete dir="${basedir}/build/api"/>
   <delete dir="${basedir}/build/code-browser"/>
   <delete dir="${basedir}/build/coverage"/>
   <delete dir="${basedir}/build/logs"/>
   <delete dir="${basedir}/build/pdepend"/>
   <delete dir="${basedir}/build/phar"/>
+  <delete dir="${basedir}/build/phpdox"/>
 
   <delete>
    <fileset dir="${basedir}/build">
@@ -37,8 +24,7 @@
   </delete>
  </target>
 
- <target name="prepare" depends="clean,phpab"
-         description="Prepare for build">
+ <target name="prepare" description="Prepare for build">
   <mkdir dir="${basedir}/build/api"/>
   <mkdir dir="${basedir}/build/code-browser"/>
   <mkdir dir="${basedir}/build/coverage"/>
@@ -47,15 +33,25 @@
   <mkdir dir="${basedir}/build/phpdox"/>
  </target>
 
- <target name="phpab" description="Generate autoloader scripts">
-  <exec executable="phpab">
-   <arg value="--output" />
-   <arg path="PHPUnit/Autoload.php" />
-   <arg value="--template" />
-   <arg path="PHPUnit/Autoload.php.in" />
-   <arg value="--indent" />
-   <arg value="            " />
-   <arg path="PHPUnit" />
+ <target name="download-composer" description="Downloads composer.phar (when it does not exist or is older than 30 days)">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+ </target>
+
+ <target name="composer" depends="download-composer" description="Install dependencies with Composer">
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
   </exec>
  </target>
 
@@ -63,12 +59,12 @@
   <apply executable="${php}" failonerror="true">
    <arg value="-l" />
 
-   <fileset dir="${basedir}/PHPUnit">
+   <fileset dir="${basedir}/src">
     <include name="**/*.php" />
     <modified />
    </fileset>
 
-   <fileset dir="${basedir}/Tests">
+   <fileset dir="${basedir}/tests">
     <include name="**/*.php" />
     <modified />
    </fileset>
@@ -79,7 +75,9 @@
   <exec executable="phploc">
    <arg value="--log-csv" />
    <arg value="${basedir}/build/logs/phploc.csv" />
-   <arg path="${basedir}/PHPUnit" />
+   <arg value="--log-xml" />
+   <arg value="${basedir}/build/logs/phploc.xml" />
+   <arg path="${basedir}/src" />
   </exec>
  </target>
 
@@ -89,14 +87,14 @@
    <arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
    <arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
    <arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
   </exec>
  </target>
 
  <target name="phpmd"
          description="Perform project mess detection using PHPMD">
   <exec executable="phpmd">
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
    <arg value="text" />
    <arg value="${basedir}/build/phpmd.xml" />
   </exec>
@@ -105,7 +103,7 @@
  <target name="phpmd-ci"
          description="Perform project mess detection using PHPMD">
   <exec executable="phpmd">
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
    <arg value="xml" />
    <arg value="${basedir}/build/phpmd.xml" />
    <arg value="--reportfile" />
@@ -116,11 +114,10 @@
  <target name="phpcs"
          description="Find coding standard violations using PHP_CodeSniffer">
   <exec executable="phpcs">
-   <arg value="--standard=${basedir}/build/PHPCS" />
+   <arg value="--standard=PSR2" />
    <arg value="--extensions=php" />
-   <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHPUnit" />
-   <arg path="${basedir}/Tests" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
   </exec>
  </target>
 
@@ -129,11 +126,10 @@
   <exec executable="phpcs" output="/dev/null">
    <arg value="--report=checkstyle" />
    <arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
-   <arg value="--standard=${basedir}/build/PHPCS" />
+   <arg value="--standard=PSR2" />
    <arg value="--extensions=php" />
-   <arg value="--ignore=Autoload.php" />
-   <arg path="${basedir}/PHPUnit" />
-   <arg path="${basedir}/Tests" />
+   <arg path="${basedir}/src" />
+   <arg path="${basedir}/tests" />
   </exec>
  </target>
 
@@ -141,63 +137,187 @@
   <exec executable="phpcpd">
    <arg value="--log-pmd" />
    <arg value="${basedir}/build/logs/pmd-cpd.xml" />
-   <arg path="${basedir}/PHPUnit" />
+   <arg path="${basedir}/src" />
   </exec>
  </target>
 
  <target name="phpunit" description="Run unit tests with PHPUnit">
   <exec executable="${php}" failonerror="true">
-   <arg path="${basedir}/phpunit.php" />
+   <arg path="${basedir}/src" />
   </exec>
  </target>
 
- <target name="phpcb"
-         description="Aggregate tool output with PHP_CodeBrowser">
-  <exec executable="phpcb">
-   <arg value="--log" />
-   <arg path="${basedir}/build/logs" />
-   <arg value="--source" />
-   <arg path="${basedir}/PHPUnit" />
-   <arg value="--output" />
-   <arg path="${basedir}/build/code-browser" />
-  </exec>
+ <target name="phpdox"
+         description="Generate software project documentation using phpDox">
+  <exec executable="phpdox" />
  </target>
 
  <target name="phar"
-         description="Create PHAR archive of PHPUnit and all its dependencies"
-         depends="clean">
-  <mkdir dir="${basedir}/build/phar"/>
-
+         description="Create PHAR archive of PHPUnit and all its dependencies (release)"
+         depends="phar-prepare">
   <exec executable="bash" outputproperty="version">
    <arg value="-c" />
-   <arg value="${basedir}/phpunit.php --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
+   <arg value="${basedir}/phpunit --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'" />
   </exec>
 
-  <untar dest="${basedir}/build/phar" compression="gzip">
-   <fileset dir="${basedir}/build/dependencies">
-    <include name="**/*.tgz"/>
+  <antcall target="phar-build">
+   <param name="version" value="${version}"/>
+  </antcall>
+ </target>
+
+ <target name="phar-alpha"
+         description="Create PHAR archive of PHPUnit and all its dependencies (alpha)"
+         depends="phar-prepare">
+  <antcall target="phar-build">
+   <param name="version" value="alpha"/>
+  </antcall>
+ </target>
+
+ <target name="phar-beta"
+         description="Create PHAR archive of PHPUnit and all its dependencies (beta)"
+         depends="phar-prepare">
+  <antcall target="phar-build">
+   <param name="version" value="beta"/>
+  </antcall>
+ </target>
+
+ <target name="phar-prepare" depends="clean,download-composer">
+  <mkdir dir="${basedir}/build/phar"/>
+  <copy file="${basedir}/composer.json" tofile="${basedir}/composer.json.bak"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="require"/>
+   <arg value="phpunit/dbunit:1.3.*"/>
+   <arg value="phpunit/phpunit-selenium:1.3.*"/>
+   <arg value="phpunit/php-invoker:1.1.*"/>
+  </exec>
+
+  <move file="${basedir}/composer.json.bak" tofile="${basedir}/composer.json"/>
+
+  <exec executable="${basedir}/build/phar-manifest.php" output="${basedir}/build/phar/manifest.txt"/>
+
+  <copy todir="${basedir}/build/phar/php-code-coverage">
+   <fileset dir="${basedir}/vendor/phpunit/php-code-coverage/src">
+    <include name="**/*" />
    </fileset>
-  </untar>
+  </copy>
+
+  <copy todir="${basedir}/build/phar" file="${basedir}/build/ca.pem" />
 
-  <copy todir="${basedir}/build/phar/PHPUnit">
-   <fileset dir="${basedir}/PHPUnit"/>
+  <copy todir="${basedir}/build/phar/php-file-iterator">
+   <fileset dir="${basedir}/vendor/phpunit/php-file-iterator/File">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
   </copy>
 
-  <delete>
-   <fileset dir="${basedir}/build/phar">
-    <include name="**/autoload.php" />
-    <include name="**/Autoload.php" />
-    <include name="**/Autoload.php.in" />
-    <include name="**/package.sig" />
-    <include name="**/package.xml" />
+  <copy todir="${basedir}/build/phar/php-text-template">
+   <fileset dir="${basedir}/vendor/phpunit/php-text-template/Text">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
    </fileset>
-  </delete>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/php-timer">
+   <fileset dir="${basedir}/vendor/phpunit/php-timer/PHP">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/php-token-stream">
+   <fileset dir="${basedir}/vendor/phpunit/php-token-stream/PHP">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/phpunit-mock-objects">
+   <fileset dir="${basedir}/vendor/phpunit/phpunit-mock-objects/src">
+    <include name="**/*" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/sebastian-comparator">
+   <fileset dir="${basedir}/vendor/sebastian/comparator/src">
+    <include name="**/*.php" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/sebastian-diff">
+   <fileset dir="${basedir}/vendor/sebastian/diff/src">
+    <include name="**/*.php" />
+    <exclude name="**/autoload.php" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/sebastian-environment">
+   <fileset dir="${basedir}/vendor/sebastian/environment/src">
+    <include name="**/*.php" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/sebastian-exporter">
+   <fileset dir="${basedir}/vendor/sebastian/exporter/src">
+    <include name="**/*.php" />
+    <exclude name="**/autoload.php" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/sebastian-version">
+   <fileset dir="${basedir}/vendor/sebastian/version/src">
+    <include name="**/*.php" />
+    <exclude name="**/autoload.php" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/symfony">
+   <fileset dir="${basedir}/vendor/symfony">
+    <include name="**/*.php" />
+    <exclude name="**/Tests/**" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/dbunit">
+   <fileset dir="${basedir}/vendor/phpunit/dbunit/PHPUnit">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/php-invoker">
+   <fileset dir="${basedir}/vendor/phpunit/php-invoker/PHP">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+
+  <copy todir="${basedir}/build/phar/phpunit-selenium">
+   <fileset dir="${basedir}/vendor/phpunit/phpunit-selenium/PHPUnit">
+    <include name="**/*.php" />
+    <exclude name="**/Autoload.*" />
+   </fileset>
+  </copy>
+ </target>
+
+ <target name="phar-build">
+  <copy todir="${basedir}/build/phar/phpunit">
+   <fileset dir="${basedir}/src">
+    <include name="**/*.php" />
+    <include name="**/*.tpl*" />
+   </fileset>
+  </copy>
+
+  <exec executable="${basedir}/build/phar-version.php" outputproperty="_version">
+   <arg value="${version}" />
+  </exec>
 
   <exec executable="phpab">
    <arg value="--all" />
    <arg value="--phar" />
    <arg value="--output" />
-   <arg path="${basedir}/build/phpunit-${version}.phar" />
+   <arg path="${basedir}/build/phpunit-${_version}.phar" />
    <arg value="--template" />
    <arg path="${basedir}/build/phar-autoload.php.in" />
    <arg value="--indent" />
@@ -205,16 +325,7 @@
    <arg path="${basedir}/build/phar" />
   </exec>
 
-  <chmod file="${basedir}/build/phpunit-${version}.phar" perm="ugo+rx"/>
-  <copy file="${basedir}/build/phpunit-${version}.phar" tofile="${basedir}/build/phpunit-${version}-compressed.phar"/>
-  <chmod file="${basedir}/build/phpunit-${version}-compressed.phar" perm="ugo+rx"/>
-
-  <exec executable="phar">
-   <arg value="compress" />
-   <arg value="-f" />
-   <arg path="${basedir}/build/phpunit-${version}-compressed.phar" />
-   <arg value="-c" />
-   <arg value="bzip2" />
-  </exec>
+  <chmod file="${basedir}/build/phpunit-${_version}.phar" perm="ugo+rx"/>
  </target>
 </project>
+
diff --git a/core/vendor/phpunit/phpunit/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php b/core/vendor/phpunit/phpunit/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
deleted file mode 100644
index 31a2c878f47cfd7045a9e8affe1fb295094aeca9..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/build/PHPCS/Sniffs/ControlStructures/ControlSignatureSniff.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-class PHPCS_Sniffs_ControlStructures_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
-{
-    public function __construct()
-    {
-        parent::__construct(true);
-    }
-
-    protected function getPatterns()
-    {
-        return array(
-          'do {EOL...} while (...);EOL',
-          'while (...) {EOL',
-          'for (...) {EOL',
-          'if (...) {EOL',
-          'foreach (...) {EOL',
-          // Decide wether to use '}EOLelse' or '} else'
-          #'}EOLelse if (...) {EOL',
-          #'}EOLelse {EOL',
-          'do {EOL',
-        );
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php b/core/vendor/phpunit/phpunit/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
deleted file mode 100644
index e91d6c6dd543832cfdb097d8430b656eb8d7ff0d..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/build/PHPCS/Sniffs/Whitespace/ConcatenationSpacingSniff.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-class PHPCS_Sniffs_Whitespace_ConcatenationSpacingSniff implements PHP_CodeSniffer_Sniff
-{
-    public function register()
-    {
-        return array(T_STRING_CONCAT);
-    }
-
-    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        if ($tokens[($stackPtr - 1)]['code'] !== T_WHITESPACE ||
-            $tokens[($stackPtr + 1)]['code'] !== T_WHITESPACE) {
-
-            $phpcsFile->addError(
-              'Concatenation operator must be surrounded by whitespace',
-              $stackPtr
-            );
-        }
-    }
-}
diff --git a/core/vendor/phpunit/phpunit/build/PHPCS/ruleset.xml b/core/vendor/phpunit/phpunit/build/PHPCS/ruleset.xml
deleted file mode 100644
index 402f2140b598cc2774a08155070c91900996c87a..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/build/PHPCS/ruleset.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Sebastian">
- <description>Sebastian Bergmann's coding standard</description>
-
- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
- <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
- <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
- <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
- <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
- <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
-
- <rule ref="Generic.Commenting.Todo"/>
-
- <rule ref="Generic.ControlStructures.InlineControlStructure"/>
-
- <rule ref="Generic.Files.LineEndings"/>
-
- <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
- <rule ref="Generic.Formatting.NoSpaceAfterCast"/>
-
- <rule ref="Generic.Functions.OpeningFunctionBraceBsdAllman"/>
- <rule ref="PEAR.Functions.ValidDefaultValue"/>
-
- <rule ref="Generic.NamingConventions.ConstructorName"/>
- <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
- <rule ref="PEAR.NamingConventions.ValidClassName"/>
-
- <rule ref="Generic.PHP.DisallowShortOpenTag"/>
- <rule ref="Generic.PHP.NoSilencedErrors"/>
- <rule ref="Generic.PHP.UpperCaseConstant"/>
-
- <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
- <rule ref="Generic.WhiteSpace.ScopeIndent"/>
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>
-</ruleset>
diff --git a/core/vendor/phpunit/phpunit/build/assertions.php b/core/vendor/phpunit/phpunit/build/assertions.php
deleted file mode 100755
index fa965f5b0932f36384e9aba8b6deb88ecc2743d3..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/build/assertions.php
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env php
-<?php
-require dirname(__DIR__) . '/PHPUnit/Autoload.php';
-
-$buffer  = '';
-$class   = new ReflectionClass('PHPUnit_Framework_Assert');
-$methods = array();
-
-foreach ($class->getMethods() as $method) {
-    $docblock = $method->getDocComment();
-    $name     = $method->getName();
-
-    if (strpos($name, 'assert') === 0 ||
-        strpos($docblock, '@return PHPUnit_Framework_Constraint') !== FALSE) {
-        $methods[$name] = array(
-          'class'    => 'PHPUnit_Framework_Assert',
-          'docblock' => $docblock,
-          'sigDecl'  => str_replace(
-            array('= false', '= true'),
-            array('= FALSE', '= TRUE'),
-            PHPUnit_Util_Class::getMethodParameters($method)
-          ),
-          'sigCall'  => PHPUnit_Util_Class::getMethodParameters($method, TRUE)
-        );
-    }
-}
-
-$class = new ReflectionClass('PHPUnit_Framework_TestCase');
-
-foreach ($class->getMethods() as $method) {
-    $docblock = $method->getDocComment();
-    $name     = $method->getName();
-
-    if (strpos($docblock, '@return PHPUnit_Framework_MockObject_Matcher') !== FALSE ||
-        strpos($docblock, '@return PHPUnit_Framework_MockObject_Stub') !== FALSE) {
-        $methods[$name] = array(
-          'class'    => 'PHPUnit_Framework_TestCase',
-          'docblock' => $docblock,
-          'sigDecl'  => str_replace(
-            array('= false', '= true'),
-            array('= FALSE', '= TRUE'),
-            PHPUnit_Util_Class::getMethodParameters($method)
-          ),
-          'sigCall'  => PHPUnit_Util_Class::getMethodParameters($method, TRUE)
-        );
-    }
-}
-
-ksort($methods);
-
-foreach ($methods as $name => $data) {
-    $buffer .= sprintf(
-      "\n\n%s\nfunction %s(%s)\n{\n    return call_user_func_array(\n      '%s::%s',\n      func_get_args()\n    );\n}",
-      str_replace('    ', '', $data['docblock']),
-      $name,
-      $data['sigDecl'],
-      $data['class'],
-      $name,
-      $data['sigCall']
-    );
-}
-
-$template = new Text_Template(dirname(__DIR__) . '/PHPUnit/Framework/Assert/Functions.php.in');
-$template->setVar(array('functions' => $buffer));
-$template->renderTo(dirname(__DIR__) . '/PHPUnit/Framework/Assert/Functions.php');
diff --git a/core/vendor/phpunit/phpunit/build/ca.pem b/core/vendor/phpunit/phpunit/build/ca.pem
new file mode 100644
index 0000000000000000000000000000000000000000..960f2657be21aae603a6917266b2c6a67113406e
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/build/ca.pem
@@ -0,0 +1,44 @@
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
diff --git a/core/vendor/phpunit/phpunit/build/phar-autoload.php.in b/core/vendor/phpunit/phpunit/build/phar-autoload.php.in
index e9b53d0cf0390d651b5a8f4858ff617d677e34bc..26660de64ac0ea3585b223a4348f33371055b19a 100644
--- a/core/vendor/phpunit/phpunit/build/phar-autoload.php.in
+++ b/core/vendor/phpunit/phpunit/build/phar-autoload.php.in
@@ -1,6 +1,14 @@
 #!/usr/bin/env php
 <?php
-define('__PHPUNIT_PHAR__', realpath($GLOBALS['_SERVER']['SCRIPT_NAME']));
+if ($GLOBALS['_SERVER']['SCRIPT_NAME'] != '-') {
+    $phar = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
+} else {
+    $files = get_included_files();
+    $phar = $files[0];
+}
+
+define('__PHPUNIT_PHAR__', str_replace(DIRECTORY_SEPARATOR, '/', $phar));
+define('__PHPUNIT_PHAR_ROOT__', 'phar://___PHAR___');
 
 spl_autoload_register(
   function ($class)
@@ -16,12 +24,20 @@ spl_autoload_register(
       $class = strtolower($class);
 
       if (isset($classes[$class])) {
-          require 'phar://___PHAR___' . $classes[$class];
+          require __PHPUNIT_PHAR_ROOT__ . $classes[$class];
       }
   }
 );
 
 Phar::mapPhar('___PHAR___');
-PHPUnit_TextUI_Command::main();
+
+if (isset($_SERVER['argv'][1]) && $_SERVER['argv'][1] == '--manifest') {
+    print file_get_contents(__PHPUNIT_PHAR_ROOT__ . '/manifest.txt');
+    exit;
+}
+
+if ($GLOBALS['_SERVER']['SCRIPT_NAME'] != '-') {
+    PHPUnit_TextUI_Command::main();
+}
 
 __HALT_COMPILER();
diff --git a/core/vendor/phpunit/phpunit/build/phar-manifest.php b/core/vendor/phpunit/phpunit/build/phar-manifest.php
new file mode 100755
index 0000000000000000000000000000000000000000..50608fb4f9bb655546e06ee9d6dfd59ac4fb8eb2
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/build/phar-manifest.php
@@ -0,0 +1,28 @@
+#!/usr/bin/env php
+<?php
+print 'phpunit/phpunit: ';
+
+$tag = @exec('git describe --tags 2>&1');
+
+if (strpos($tag, '-') === false && strpos($tag, 'No names found') === false) {
+    print $tag;
+} else {
+    $branch = @exec('git rev-parse --abbrev-ref HEAD');
+    $hash   = @exec('git log -1 --format="%H"');
+    print $branch . '@' . $hash;
+}
+
+print "\n";
+
+$lock = json_decode(file_get_contents(__DIR__ . '/../composer.lock'));
+
+foreach ($lock->packages as $package) {
+    print $package->name . ': ' . $package->version;
+
+    if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
+        print '@' . $package->source->reference;
+    }
+
+    print "\n";
+}
+
diff --git a/core/vendor/phpunit/phpunit/build/phar-version.php b/core/vendor/phpunit/phpunit/build/phar-version.php
new file mode 100755
index 0000000000000000000000000000000000000000..83b8746db1e7ac4dbb79dec6cd0d4a05bb6fa102
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/build/phar-version.php
@@ -0,0 +1,22 @@
+#!/usr/bin/env php
+<?php
+if (!isset($argv[1])) {
+    exit(1);
+}
+
+if ($argv[1] == 'alpha' || $argv[1] == 'beta') {
+    $version = sprintf('%s-%s', $argv[1], date('Y-m-d'));
+} else {
+    $version = $argv[1];
+}
+
+file_put_contents(
+    __DIR__ . '/phar/phpunit/Runner/Version.php',
+    str_replace(
+        'private static $pharVersion;',
+        'private static $pharVersion = "' . $version . '";',
+        file_get_contents(__DIR__ . '/phar/phpunit/Runner/Version.php')
+    )
+);
+
+print $version;
diff --git a/core/vendor/phpunit/phpunit/build/travis-ci.xml b/core/vendor/phpunit/phpunit/build/travis-ci.xml
index e1a4866482d516483865df6585019bb4b82ca363..bf237feceace562834028de164e646e3c04a7f2d 100644
--- a/core/vendor/phpunit/phpunit/build/travis-ci.xml
+++ b/core/vendor/phpunit/phpunit/build/travis-ci.xml
@@ -1,36 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://phpunit.de/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="../tests/bootstrap-travis.php"
          backupGlobals="false"
-         colors="true"
          verbose="true">
   <testsuites>
-    <testsuite name="PHPUnit">
-      <directory suffix="Test.php">../Tests/Framework</directory>
-      <directory suffix=".phpt">../Tests/Framework/MockObject</directory>
-      <directory suffix="Test.php">../Tests/Extensions</directory>
-      <directory suffix=".phpt">../Tests/Regression</directory>
-      <directory suffix="Test.php">../Tests/Runner</directory>
-      <directory suffix=".phpt">../Tests/TextUI</directory>
-      <directory suffix="Test.php">../Tests/Util</directory>
+    <testsuite name="small">
+      <directory suffix="Test.php">../tests/Framework</directory>
+      <directory suffix="Test.php">../tests/Extensions</directory>
+      <directory suffix="Test.php">../tests/Runner</directory>
+      <directory suffix="Test.php">../tests/Util</directory>
     </testsuite>
-  </testsuites>
-
-  <logging>
-    <log type="coverage-text" target="php://stdout"/>
-  </logging>
 
-  <filter>
-    <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">../PHPUnit</directory>
-      <exclude>
-       <file>../PHPUnit/Autoload.php</file>
-       <file>../PHPUnit/Framework/Assert/Functions.php</file>
-      </exclude>
-    </whitelist>
-  </filter>
+    <testsuite name="large">
+      <directory suffix=".phpt">../tests/TextUI</directory>
+      <directory suffix=".phpt">../tests/Regression</directory>
+    </testsuite>
+  </testsuites>
 
   <php>
     <const name="PHPUNIT_TESTSUITE" value="true"/>
   </php>
 </phpunit>
+
diff --git a/core/vendor/phpunit/phpunit/composer.json b/core/vendor/phpunit/phpunit/composer.json
index 0993e3b4b5cc77a3712d6450872bbe353ce1bbd5..bf04caf5b97a1b55f92d55e76c6f8ad60752fce5 100644
--- a/core/vendor/phpunit/phpunit/composer.json
+++ b/core/vendor/phpunit/phpunit/composer.json
@@ -22,43 +22,49 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "phpunit/php-file-iterator": ">=1.3.1",
-        "phpunit/php-text-template": ">=1.1.1",
-        "phpunit/php-code-coverage": ">=1.2.1,<1.3.0",
-        "phpunit/php-timer": ">=1.0.2,<1.1.0",
-        "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
+        "phpunit/php-file-iterator": "~1.3.1",
+        "phpunit/php-text-template": "~1.2",
+        "phpunit/php-code-coverage": "~2.0",
+        "phpunit/php-timer": "~1.0.2",
+        "phpunit/phpunit-mock-objects": "~2.1",
         "symfony/yaml": "~2.0",
+        "sebastian/comparator": "~1.0",
+        "sebastian/diff": "~1.1",
+        "sebastian/environment": "~1.0",
+        "sebastian/exporter": "~1.0",
+        "sebastian/version": "~1.0",
         "ext-dom": "*",
+        "ext-json": "*",
         "ext-pcre": "*",
         "ext-reflection": "*",
         "ext-spl": "*"
     },
-    "require-dev": {
-        "pear-pear/pear": "1.9.4"
-    },
-    "repositories": [
-        {
-            "type": "pear",
-            "url": "http://pear.php.net"
-        }
-    ],
     "suggest": {
-        "phpunit/php-invoker": ">=1.1.0,<1.2.0",
-        "ext-json": "*",
-        "ext-simplexml": "*",
-        "ext-tokenizer": "*"
+        "phpunit/php-invoker": "~1.1"
     },
     "bin": [
-        "composer/bin/phpunit"
+        "phpunit"
     ],
+    "config": {
+        "bin-dir": "bin"
+    },
     "autoload": {
         "classmap": [
-            "PHPUnit/"
+            "src/"
+        ]
+    },
+    "autoload-dev": {
+        "classmap": [
+            "tests/"
+        ],
+        "files": [
+            "src/Framework/Assert/Functions.php",
+            "tests/_files/CoveredFunction.php"
         ]
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.7.x-dev"
+            "dev-master": "4.1.x-dev"
         }
     },
     "include-path": [
diff --git a/core/vendor/phpunit/phpunit/package.xml b/core/vendor/phpunit/phpunit/package.xml
deleted file mode 100644
index ddc89d3a2f480613a6731a7c9e3ee5e6b0d0f37e..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/package.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.4.10" version="2.0"
-  xmlns="http://pear.php.net/dtd/package-2.0"
-  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-                      http://pear.php.net/dtd/tasks-1.0.xsd
-                      http://pear.php.net/dtd/package-2.0
-                      http://pear.php.net/dtd/package-2.0.xsd">
- <name>PHPUnit</name>
- <channel>pear.phpunit.de</channel>
- <summary>The PHP Unit Testing framework.</summary>
- <description>The PHP Unit Testing framework.</description>
- <lead>
-  <name>Sebastian Bergmann</name>
-  <user>sb</user>
-  <email>sebastian@phpunit.de</email>
-  <active>yes</active>
- </lead>
- <date>2013-05-23</date>
- <version>
-  <release>3.7.21</release>
-  <api>3.7.0</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license>The BSD 3-Clause License</license>
- <notes>http://github.com/sebastianbergmann/phpunit/blob/master/README.md</notes>
- <contents>
-  <dir name="/">
-   <dir name="PHPUnit">
-    <dir name="Extensions">
-     <dir name="PhptTestCase">
-      <file baseinstalldir="/" name="Logger.php" role="php" />
-     </dir>
-     <file baseinstalldir="/" name="GroupTestSuite.php" role="php" />
-     <file baseinstalldir="/" name="PhptTestCase.php" role="php" />
-     <file baseinstalldir="/" name="PhptTestSuite.php" role="php" />
-     <file baseinstalldir="/" name="RepeatedTest.php" role="php" />
-     <file baseinstalldir="/" name="TestDecorator.php" role="php" />
-     <file baseinstalldir="/" name="TicketListener.php" role="php" />
-    </dir>
-    <dir name="Framework">
-     <dir name="Assert">
-      <file baseinstalldir="/" name="Functions.php" role="php" />
-     </dir>
-     <dir name="Comparator">
-      <file baseinstalldir="/" name="Array.php" role="php" />
-      <file baseinstalldir="/" name="DOMDocument.php" role="php" />
-      <file baseinstalldir="/" name="Double.php" role="php" />
-      <file baseinstalldir="/" name="Exception.php" role="php" />
-      <file baseinstalldir="/" name="MockObject.php" role="php" />
-      <file baseinstalldir="/" name="Numeric.php" role="php" />
-      <file baseinstalldir="/" name="Object.php" role="php" />
-      <file baseinstalldir="/" name="Resource.php" role="php" />
-      <file baseinstalldir="/" name="Scalar.php" role="php" />
-      <file baseinstalldir="/" name="SplObjectStorage.php" role="php" />
-      <file baseinstalldir="/" name="Type.php" role="php" />
-     </dir>
-     <dir name="Constraint">
-      <dir name="JsonMatches">
-       <file baseinstalldir="/" name="ErrorMessageProvider.php" role="php" />
-      </dir>
-      <file baseinstalldir="/" name="And.php" role="php" />
-      <file baseinstalldir="/" name="ArrayHasKey.php" role="php" />
-      <file baseinstalldir="/" name="Attribute.php" role="php" />
-      <file baseinstalldir="/" name="Callback.php" role="php" />
-      <file baseinstalldir="/" name="ClassHasAttribute.php" role="php" />
-      <file baseinstalldir="/" name="ClassHasStaticAttribute.php" role="php" />
-      <file baseinstalldir="/" name="Composite.php" role="php" />
-      <file baseinstalldir="/" name="Count.php" role="php" />
-      <file baseinstalldir="/" name="ExceptionCode.php" role="php" />
-      <file baseinstalldir="/" name="ExceptionMessage.php" role="php" />
-      <file baseinstalldir="/" name="Exception.php" role="php" />
-      <file baseinstalldir="/" name="FileExists.php" role="php" />
-      <file baseinstalldir="/" name="GreaterThan.php" role="php" />
-      <file baseinstalldir="/" name="IsAnything.php" role="php" />
-      <file baseinstalldir="/" name="IsEmpty.php" role="php" />
-      <file baseinstalldir="/" name="IsEqual.php" role="php" />
-      <file baseinstalldir="/" name="IsFalse.php" role="php" />
-      <file baseinstalldir="/" name="IsIdentical.php" role="php" />
-      <file baseinstalldir="/" name="IsInstanceOf.php" role="php" />
-      <file baseinstalldir="/" name="IsJson.php" role="php" />
-      <file baseinstalldir="/" name="IsNull.php" role="php" />
-      <file baseinstalldir="/" name="IsTrue.php" role="php" />
-      <file baseinstalldir="/" name="IsType.php" role="php" />
-      <file baseinstalldir="/" name="JsonMatches.php" role="php" />
-      <file baseinstalldir="/" name="LessThan.php" role="php" />
-      <file baseinstalldir="/" name="Not.php" role="php" />
-      <file baseinstalldir="/" name="ObjectHasAttribute.php" role="php" />
-      <file baseinstalldir="/" name="Or.php" role="php" />
-      <file baseinstalldir="/" name="PCREMatch.php" role="php" />
-      <file baseinstalldir="/" name="SameSize.php" role="php" />
-      <file baseinstalldir="/" name="StringContains.php" role="php" />
-      <file baseinstalldir="/" name="StringEndsWith.php" role="php" />
-      <file baseinstalldir="/" name="StringMatches.php" role="php" />
-      <file baseinstalldir="/" name="StringStartsWith.php" role="php" />
-      <file baseinstalldir="/" name="TraversableContainsOnly.php" role="php" />
-      <file baseinstalldir="/" name="TraversableContains.php" role="php" />
-      <file baseinstalldir="/" name="Xor.php" role="php" />
-     </dir>
-     <dir name="Error">
-      <file baseinstalldir="/" name="Deprecated.php" role="php" />
-      <file baseinstalldir="/" name="Notice.php" role="php" />
-      <file baseinstalldir="/" name="Warning.php" role="php" />
-     </dir>
-     <dir name="Process">
-      <file baseinstalldir="/" name="TestCaseMethod.tpl.dist" role="php" />
-     </dir>
-     <dir name="TestSuite">
-      <file baseinstalldir="/" name="DataProvider.php" role="php" />
-     </dir>
-     <file baseinstalldir="/" name="AssertionFailedError.php" role="php" />
-     <file baseinstalldir="/" name="Assert.php" role="php" />
-     <file baseinstalldir="/" name="ComparatorFactory.php" role="php" />
-     <file baseinstalldir="/" name="Comparator.php" role="php" />
-     <file baseinstalldir="/" name="ComparisonFailure.php" role="php" />
-     <file baseinstalldir="/" name="Constraint.php" role="php" />
-     <file baseinstalldir="/" name="Error.php" role="php" />
-     <file baseinstalldir="/" name="Exception.php" role="php" />
-     <file baseinstalldir="/" name="ExpectationFailedException.php" role="php" />
-     <file baseinstalldir="/" name="IncompleteTestError.php" role="php" />
-     <file baseinstalldir="/" name="IncompleteTest.php" role="php" />
-     <file baseinstalldir="/" name="OutputError.php" role="php" />
-     <file baseinstalldir="/" name="SelfDescribing.php" role="php" />
-     <file baseinstalldir="/" name="SkippedTestError.php" role="php" />
-     <file baseinstalldir="/" name="SkippedTest.php" role="php" />
-     <file baseinstalldir="/" name="SkippedTestSuiteError.php" role="php" />
-     <file baseinstalldir="/" name="SyntheticError.php" role="php" />
-     <file baseinstalldir="/" name="TestCase.php" role="php" />
-     <file baseinstalldir="/" name="TestFailure.php" role="php" />
-     <file baseinstalldir="/" name="TestListener.php" role="php" />
-     <file baseinstalldir="/" name="Test.php" role="php" />
-     <file baseinstalldir="/" name="TestResult.php" role="php" />
-     <file baseinstalldir="/" name="TestSuite.php" role="php" />
-     <file baseinstalldir="/" name="Warning.php" role="php" />
-    </dir>
-    <dir name="Runner">
-     <file baseinstalldir="/" name="BaseTestRunner.php" role="php" />
-     <file baseinstalldir="/" name="StandardTestSuiteLoader.php" role="php" />
-     <file baseinstalldir="/" name="TestSuiteLoader.php" role="php" />
-     <file baseinstalldir="/" name="Version.php" role="php" />
-    </dir>
-    <dir name="TextUI">
-     <file baseinstalldir="/" name="Command.php" role="php" />
-     <file baseinstalldir="/" name="ResultPrinter.php" role="php" />
-     <file baseinstalldir="/" name="TestRunner.php" role="php" />
-    </dir>
-    <dir name="Util">
-     <dir name="DeprecatedFeature">
-      <file baseinstalldir="/" name="Logger.php" role="php" />
-     </dir>
-     <dir name="Log">
-      <file baseinstalldir="/" name="JSON.php" role="php" />
-      <file baseinstalldir="/" name="JUnit.php" role="php" />
-      <file baseinstalldir="/" name="TAP.php" role="php" />
-     </dir>
-     <dir name="PHP">
-      <file baseinstalldir="/" name="Default.php" role="php" />
-      <file baseinstalldir="/" name="Windows.php" role="php" />
-     </dir>
-     <dir name="TestDox">
-      <dir name="ResultPrinter">
-       <file baseinstalldir="/" name="HTML.php" role="php" />
-       <file baseinstalldir="/" name="Text.php" role="php" />
-      </dir>
-      <file baseinstalldir="/" name="NamePrettifier.php" role="php" />
-      <file baseinstalldir="/" name="ResultPrinter.php" role="php" />
-     </dir>
-     <file baseinstalldir="/" name="Class.php" role="php" />
-     <file baseinstalldir="/" name="Configuration.php" role="php" />
-     <file baseinstalldir="/" name="DeprecatedFeature.php" role="php" />
-     <file baseinstalldir="/" name="Diff.php" role="php" />
-     <file baseinstalldir="/" name="ErrorHandler.php" role="php" />
-     <file baseinstalldir="/" name="Fileloader.php" role="php" />
-     <file baseinstalldir="/" name="Filesystem.php" role="php" />
-     <file baseinstalldir="/" name="Filter.php" role="php" />
-     <file baseinstalldir="/" name="Getopt.php" role="php" />
-     <file baseinstalldir="/" name="GlobalState.php" role="php" />
-     <file baseinstalldir="/" name="InvalidArgumentHelper.php" role="php" />
-     <file baseinstalldir="/" name="PHP.php" role="php">
-      <tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
-     </file>
-     <file baseinstalldir="/" name="Printer.php" role="php" />
-     <file baseinstalldir="/" name="String.php" role="php" />
-     <file baseinstalldir="/" name="Test.php" role="php" />
-     <file baseinstalldir="/" name="TestSuiteIterator.php" role="php" />
-     <file baseinstalldir="/" name="Type.php" role="php" />
-     <file baseinstalldir="/" name="XML.php" role="php" />
-    </dir>
-    <file baseinstalldir="/" name="Autoload.php" role="php" />
-   </dir>
-   <file baseinstalldir="/" name="ChangeLog.md" role="doc" />
-   <file baseinstalldir="/" name="CONTRIBUTING.md" role="doc" />
-   <file baseinstalldir="/" name="LICENSE" role="doc" />
-   <file baseinstalldir="/" name="README.md" role="doc" />
-   <file baseinstalldir="/" name="phpunit.php" role="script">
-    <tasks:replace from="/usr/bin/env php" to="php_bin" type="pear-config" />
-    <tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
-    <tasks:replace from="@php_dir@" to="php_dir" type="pear-config" />
-   </file>
-   <file baseinstalldir="/" name="phpunit.bat" role="script">
-    <tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
-    <tasks:replace from="@bin_dir@" to="bin_dir" type="pear-config" />
-   </file>
-  </dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>5.3.3</min>
-   </php>
-   <pearinstaller>
-    <min>1.9.4</min>
-   </pearinstaller>
-   <package>
-    <name>File_Iterator</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.3.1</min>
-   </package>
-   <package>
-    <name>Text_Template</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.1.1</min>
-   </package>
-   <package>
-    <name>PHP_CodeCoverage</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.2.1</min>
-    <max>1.2.99</max>
-   </package>
-   <package>
-    <name>PHP_Timer</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.0.2</min>
-    <max>1.0.99</max>
-   </package>
-   <package>
-    <name>PHPUnit_MockObject</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.2.0</min>
-    <max>1.2.99</max>
-   </package>
-   <package>
-    <name>Yaml</name>
-    <channel>pear.symfony.com</channel>
-    <min>2.0.0</min>
-    <max>2.99.99</max>
-   </package>
-   <extension>
-    <name>dom</name>
-   </extension>
-   <extension>
-    <name>pcre</name>
-   </extension>
-  </required>
-  <optional>
-   <package>
-    <name>PHP_Invoker</name>
-    <channel>pear.phpunit.de</channel>
-    <min>1.1.0</min>
-    <max>1.1.99</max>
-   </package>
-   <extension>
-    <name>json</name>
-   </extension>
-   <extension>
-    <name>simplexml</name>
-   </extension>
-   <extension>
-    <name>tokenizer</name>
-   </extension>
-  </optional>
- </dependencies>
- <phprelease>
-  <installconditions>
-   <os>
-    <name>windows</name>
-   </os>
-  </installconditions>
-  <filelist>
-   <install as="phpunit" name="phpunit.php" />
-   <install as="phpunit.bat" name="phpunit.bat" />
-  </filelist>
- </phprelease>
- <phprelease>
-  <filelist>
-   <install as="phpunit" name="phpunit.php" />
-   <ignore name="phpunit.bat" />
-  </filelist>
- </phprelease>
-</package>
diff --git a/core/vendor/phpunit/phpunit/phpdox.xml.dist b/core/vendor/phpunit/phpunit/phpdox.xml.dist
index b6312210bae67d36d6cfceadd0501d1ad922b7f3..e77645e04b69fdb4aef438ffa77ac5d8c89d0096 100644
--- a/core/vendor/phpunit/phpunit/phpdox.xml.dist
+++ b/core/vendor/phpunit/phpunit/phpdox.xml.dist
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
-<phpdox xmlns="http://phpdox.de/config">
- <project name="PHPUnit" source="PHPUnit" workdir="build/phpdox">
+<phpdox xmlns="http://phpdox.net/config">
+ <project name="PHPUnit" source="src" workdir="build/phpdox">
   <collector publiconly="false">
    <include mask="*.php" />
-   <exclude mask="*Autoload.php" />
   </collector>
 
   <generator output="build">
+   <enrich base="${basedir}/build/logs">
+    <source type="build" />
+    <source type="git" />
+    <source type="phploc" />
+    <source type="checkstyle" />
+    <source type="pmd" />
+   </enrich>
+
    <build engine="html" enabled="true" output="api">
     <file extension="html" />
    </build>
   </generator>
  </project>
 </phpdox>
+
diff --git a/core/vendor/phpunit/phpunit/composer/bin/phpunit b/core/vendor/phpunit/phpunit/phpunit
similarity index 78%
rename from core/vendor/phpunit/phpunit/composer/bin/phpunit
rename to core/vendor/phpunit/phpunit/phpunit
index 0c2f0b26aa1a8327cb642d941495c299c6a73412..44f3c6d931bb630fada89c61719d522758dfd18a 100755
--- a/core/vendor/phpunit/phpunit/composer/bin/phpunit
+++ b/core/vendor/phpunit/phpunit/phpunit
@@ -2,7 +2,7 @@
 <?php
 /* PHPUnit
  *
- * Copyright (c) 2001-2012, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,29 +35,21 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-define('PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main');
-
-$files = array(
-  __DIR__ . '/../../vendor/autoload.php',
-  __DIR__ . '/../../../../autoload.php'
-);
-
-foreach ($files as $file) {
+foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
     if (file_exists($file)) {
-        require $file;
-
         define('PHPUNIT_COMPOSER_INSTALL', $file);
-
         break;
     }
 }
 
 if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
     die(
-      'You need to set up the project dependencies using the following commands:' . PHP_EOL .
-      'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
-      'php composer.phar install' . PHP_EOL
+        'You need to set up the project dependencies using the following commands:' . PHP_EOL .
+        'wget http://getcomposer.org/composer.phar' . PHP_EOL .
+        'php composer.phar install' . PHP_EOL
     );
 }
 
+require PHPUNIT_COMPOSER_INSTALL;
+
 PHPUnit_TextUI_Command::main();
diff --git a/core/vendor/phpunit/phpunit/phpunit.bat b/core/vendor/phpunit/phpunit/phpunit.bat
deleted file mode 100644
index 9bc942b069963249faa480f7a455ebc93794da56..0000000000000000000000000000000000000000
--- a/core/vendor/phpunit/phpunit/phpunit.bat
+++ /dev/null
@@ -1,43 +0,0 @@
-@echo off
-REM PHPUnit
-REM
-REM Copyright (c) 2002-2010, Sebastian Bergmann <sebastian@phpunit.de>.
-REM All rights reserved.
-REM
-REM Redistribution and use in source and binary forms, with or without
-REM modification, are permitted provided that the following conditions
-REM are met:
-REM
-REM   * Redistributions of source code must retain the above copyright
-REM     notice, this list of conditions and the following disclaimer.
-REM
-REM   * Redistributions in binary form must reproduce the above copyright
-REM     notice, this list of conditions and the following disclaimer in
-REM     the documentation and/or other materials provided with the
-REM     distribution.
-REM
-REM   * Neither the name of Sebastian Bergmann nor the names of his
-REM     contributors may be used to endorse or promote products derived
-REM     from this software without specific prior written permission.
-REM
-REM THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-REM "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-REM LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-REM FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-REM COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-REM INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-REM BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-REM LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-REM CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRIC
-REM LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-REM ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-REM POSSIBILITY OF SUCH DAMAGE.
-REM
-
-if "%PHPBIN%" == "" set PHPBIN=@php_bin@
-if not exist "%PHPBIN%" if "%PHP_PEAR_PHP_BIN%" neq "" goto USE_PEAR_PATH
-GOTO RUN
-:USE_PEAR_PATH
-set PHPBIN=%PHP_PEAR_PHP_BIN%
-:RUN
-"%PHPBIN%" "@bin_dir@\phpunit" %*
diff --git a/core/vendor/phpunit/phpunit/phpunit.xml.dist b/core/vendor/phpunit/phpunit/phpunit.xml.dist
index ee1d8f5cf85ac975af292fac843bccdb814a8ce1..50966d7cb69a45895215ea81385f58346ac45db2 100644
--- a/core/vendor/phpunit/phpunit/phpunit.xml.dist
+++ b/core/vendor/phpunit/phpunit/phpunit.xml.dist
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/3.7/phpunit.xsd"
-         bootstrap="PHPUnit/Autoload.php"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
          backupGlobals="false"
          verbose="true">
   <testsuites>
-    <testsuite name="PHPUnit">
-      <directory suffix="Test.php">Tests/Framework</directory>
-      <directory suffix=".phpt">Tests/Framework/MockObject</directory>
-      <directory suffix="Test.php">Tests/Extensions</directory>
-      <directory suffix=".phpt">Tests/Regression</directory>
-      <directory suffix="Test.php">Tests/Runner</directory>
-      <directory suffix=".phpt">Tests/TextUI</directory>
-      <directory suffix="Test.php">Tests/Util</directory>
+    <testsuite name="small">
+      <directory suffix="Test.php">tests/Framework</directory>
+      <directory suffix="Test.php">tests/Extensions</directory>
+      <directory suffix="Test.php">tests/Runner</directory>
+      <directory suffix="Test.php">tests/Util</directory>
+    </testsuite>
+
+    <testsuite name="large">
+      <directory suffix=".phpt">tests/TextUI</directory>
+      <directory suffix=".phpt">tests/Regression</directory>
     </testsuite>
   </testsuites>
 
   <logging>
-    <log type="coverage-html" target="build/coverage" title="PHPUnit"
-         charset="UTF-8" yui="true" highlight="true"
-         lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-    <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+    <log type="coverage-html" target="build/coverage"/>
   </logging>
 
   <filter>
     <whitelist processUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">PHPUnit</directory>
+      <directory suffix=".php">src</directory>
       <exclude>
-       <file>PHPUnit/Autoload.php</file>
-       <file>PHPUnit/Framework/Assert/Functions.php</file>
+       <file>src/Framework/Assert/Functions.php</file>
       </exclude>
     </whitelist>
   </filter>
@@ -38,3 +35,4 @@
     <const name="PHPUNIT_TESTSUITE" value="true"/>
   </php>
 </phpunit>
+
diff --git a/core/vendor/phpunit/phpunit/phpunit.xsd b/core/vendor/phpunit/phpunit/phpunit.xsd
index 0348bc0308aaf1496018ed1a2891e9e0639888e1..4dedbe9378381bb68d3174e91a130321eee5ea30 100644
--- a/core/vendor/phpunit/phpunit/phpunit.xsd
+++ b/core/vendor/phpunit/phpunit/phpunit.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
   <xs:annotation>
-    <xs:documentation source="http://www.phpunit.de/manual/3.7/en/appendixes.configuration.html">
-      This Schema file defines the rules by which the XML configuration file of PHPUnit 3.7 may be structured.
+    <xs:documentation source="http://www.phpunit.de/manual/4.1/en/appendixes.configuration.html">
+      This Schema file defines the rules by which the XML configuration file of PHPUnit 4.1 may be structured.
     </xs:documentation>
     <xs:appinfo source="http://www.phpunit.de/manual/current/en/appendixes.configuration.html"/>
   </xs:annotation>
@@ -125,10 +125,6 @@
       </xs:simpleType>
     </xs:attribute>
     <xs:attribute name="target" type="xs:anyURI"/>
-    <xs:attribute name="title" type="xs:string"/>
-    <xs:attribute name="charset" type="xs:string" default="UTF-8"/>
-    <xs:attribute name="yui" type="xs:boolean" default="true"/>
-    <xs:attribute name="highlight" type="xs:boolean" default="false"/>
     <xs:attribute name="lowUpperBound" type="xs:nonNegativeInteger" default="35"/>
     <xs:attribute name="highLowerBound" type="xs:nonNegativeInteger" default="70"/>
     <xs:attribute name="logIncompleteSkipped" type="xs:boolean" default="false"/>
@@ -201,7 +197,12 @@
     <xs:attribute name="stopOnError" type="xs:boolean" default="false"/>
     <xs:attribute name="stopOnFailure" type="xs:boolean" default="false"/>
     <xs:attribute name="stopOnIncomplete" type="xs:boolean" default="false"/>
+    <xs:attribute name="stopOnRisky" type="xs:boolean" default="false"/>
     <xs:attribute name="stopOnSkipped" type="xs:boolean" default="false"/>
+    <xs:attribute name="beStrictAboutTestsThatDoNotTestAnything" type="xs:boolean" default="false"/>
+    <xs:attribute name="beStrictAboutOutputDuringTests" type="xs:boolean" default="false"/>
+    <xs:attribute name="beStrictAboutTestSize" type="xs:boolean" default="false"/>
+    <xs:attribute name="checkForUnintentionallyCoveredCode" type="xs:boolean" default="false"/>
     <xs:attribute name="strict" type="xs:boolean" default="false"/>
     <xs:attribute name="testSuiteLoaderClass" type="xs:string" default="PHPUnit_Runner_StandardTestSuiteLoader"/>
     <xs:attribute name="testSuiteLoaderFile" type="xs:anyURI"/>
diff --git a/core/vendor/phpunit/phpunit/src/Exception.php b/core/vendor/phpunit/phpunit/src/Exception.php
new file mode 100644
index 0000000000000000000000000000000000000000..9ea7dc29303d5588835cce8eb0dd3d57e94ce010
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Exception.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Marker interface for PHPUnit exceptions.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 4.0.0
+ */
+interface PHPUnit_Exception
+{
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/GroupTestSuite.php b/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/PHPUnit/Extensions/GroupTestSuite.php
rename to core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
index c66112bec05565f63d3adec0da7fd6a1769f94ea..9735a82924d338f068e121313e68d087bc408595 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/GroupTestSuite.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/GroupTestSuite.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Extensions
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
@@ -58,7 +58,7 @@
  * @package    PHPUnit
  * @subpackage Extensions
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
@@ -83,7 +83,7 @@ public function __construct(PHPUnit_Framework_TestSuite $suite, array $groups)
         foreach ($tests as $test) {
             if ($test instanceof PHPUnit_Framework_TestCase) {
                 $testGroups = PHPUnit_Util_Test::getGroups(
-                  get_class($test), $test->getName(FALSE)
+                  get_class($test), $test->getName(false)
                 );
 
                 foreach ($groups as $group) {
diff --git a/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
new file mode 100644
index 0000000000000000000000000000000000000000..49fbd96e19beda6101572c1fec7e6117b24cb460
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestCase.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions_PhptTestCase
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.1.4
+ */
+
+/**
+ * Runner for PHPT test cases.
+ *
+ * @package    PHPUnit
+ * @subpackage Extensions_PhptTestCase
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.1.4
+ */
+class PHPUnit_Extensions_PhptTestCase implements PHPUnit_Framework_Test, PHPUnit_Framework_SelfDescribing
+{
+    /**
+     * @var string
+     */
+    private $filename;
+
+    /**
+     * @var array
+     */
+    private $settings = array(
+        'allow_url_fopen=1',
+        'auto_append_file=',
+        'auto_prepend_file=',
+        'disable_functions=',
+        'display_errors=1',
+        'docref_root=',
+        'docref_ext=.html',
+        'error_append_string=',
+        'error_prepend_string=',
+        'error_reporting=-1',
+        'html_errors=0',
+        'log_errors=0',
+        'magic_quotes_runtime=0',
+        'output_handler=',
+        'open_basedir=',
+        'output_buffering=Off',
+        'report_memleaks=0',
+        'report_zend_debug=0',
+        'safe_mode=0',
+        'track_errors=1',
+        'xdebug.default_enable=0'
+    );
+
+    /**
+     * Constructs a test case with the given filename.
+     *
+     * @param  string                      $filename
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function __construct($filename)
+    {
+        if (!is_string($filename)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!is_file($filename)) {
+            throw new PHPUnit_Framework_Exception(
+              sprintf(
+                'File "%s" does not exist.',
+                $filename
+              )
+            );
+        }
+
+        $this->filename = $filename;
+    }
+
+    /**
+     * Counts the number of test cases executed by run(TestResult result).
+     *
+     * @return integer
+     */
+    public function count()
+    {
+        return 1;
+    }
+
+    /**
+     * Runs a test and collects its result in a TestResult instance.
+     *
+     * @param  PHPUnit_Framework_TestResult $result
+     * @return PHPUnit_Framework_TestResult
+     */
+    public function run(PHPUnit_Framework_TestResult $result = null)
+    {
+        $sections = $this->parse();
+        $code     = $this->render($sections['FILE']);
+
+        if ($result === null) {
+            $result = new PHPUnit_Framework_TestResult;
+        }
+
+        $php  = PHPUnit_Util_PHP::factory();
+        $skip = false;
+        $time = 0;
+
+        $result->startTest($this);
+
+        if (isset($sections['SKIPIF'])) {
+            $jobResult = $php->runJob($sections['SKIPIF'], $this->settings);
+
+            if (!strncasecmp('skip', ltrim($jobResult['stdout']), 4)) {
+                if (preg_match('/^\s*skip\s*(.+)\s*/i', $jobResult['stdout'], $message)) {
+                    $message = substr($message[1], 2);
+                } else {
+                    $message = '';
+                }
+
+                $result->addFailure($this, new PHPUnit_Framework_SkippedTestError($message), 0);
+
+                $skip = true;
+            }
+        }
+
+        if (!$skip) {
+            PHP_Timer::start();
+            $jobResult = $php->runJob($code, $this->settings);
+            $time = PHP_Timer::stop();
+
+            if (isset($sections['EXPECT'])) {
+                $assertion = 'assertEquals';
+                $expected  = preg_replace('/\r\n/', "\n", trim($sections['EXPECT']));
+            } else {
+                $assertion = 'assertStringMatchesFormat';
+                $expected  = trim($sections['EXPECTF']);
+            }
+
+            try {
+                PHPUnit_Framework_Assert::$assertion($expected, trim($jobResult['stdout']));
+            } catch (PHPUnit_Framework_AssertionFailedError $e) {
+                $result->addFailure($this, $e, $time);
+            } catch (Exception $e) {
+                $result->addError($this, $e, $time);
+            }
+        }
+
+        $result->endTest($this, $time);
+
+        return $result;
+    }
+
+    /**
+     * Returns the name of the test case.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Returns a string representation of the test case.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->filename;
+    }
+
+    /**
+     * @return array
+     * @throws PHPUnit_Framework_Exception
+     */
+    private function parse()
+    {
+        $sections = array();
+        $section  = '';
+
+        foreach (file($this->filename) as $line) {
+            if (preg_match('/^--([_A-Z]+)--/', $line, $result)) {
+                $section            = $result[1];
+                $sections[$section] = '';
+                continue;
+            } elseif (empty($section)) {
+                throw new PHPUnit_Framework_Exception('Invalid PHPT file');
+            }
+
+            $sections[$section] .= $line;
+        }
+
+        if (!isset($sections['FILE']) ||
+            (!isset($sections['EXPECT']) && !isset($sections['EXPECTF']))) {
+            throw new PHPUnit_Framework_Exception('Invalid PHPT file');
+        }
+
+        return $sections;
+    }
+
+    /**
+     * @param  string $code
+     * @return string
+     */
+    private function render($code)
+    {
+        return str_replace(
+          array(
+            '__DIR__',
+            '__FILE__'
+          ),
+          array(
+            "'" . dirname($this->filename) . "'",
+            "'" . $this->filename . "'"
+          ),
+          $code
+        );
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestSuite.php b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestSuite.php
rename to core/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
index e07227e1e8bf3b72efe435e4feb08c92dd615cae..f0b4b3ff3204fb8a2038315467cc222b481e61f0 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestSuite.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/PhptTestSuite.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Extensions_PhptTestCase
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.1.4
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Extensions_PhptTestCase
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.1.4
@@ -59,9 +59,9 @@ class PHPUnit_Extensions_PhptTestSuite extends PHPUnit_Framework_TestSuite
     /**
      * Constructs a new TestSuite for .phpt test cases.
      *
-     * @param  string $directory
-     * @param  array  $options Array with ini settings for the php instance run,
-     *                         key being the name if the setting, value the ini value.
+     * @param  string                      $directory
+     * @param  array                       $options   Array with ini settings for the php instance run,
+     *                                                key being the name if the setting, value the ini value.
      * @throws PHPUnit_Framework_Exception
      */
     public function __construct($directory, array $options = array())
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/RepeatedTest.php b/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/PHPUnit/Extensions/RepeatedTest.php
rename to core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
index ab661a688e611f008ee43fa1b89ae48f55561a3a..65efc6707b240e33d914c94e9529f399551873c0 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/RepeatedTest.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/RepeatedTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -47,7 +47,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -57,7 +57,7 @@ class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator
     /**
      * @var mixed
      */
-    protected $filter = FALSE;
+    protected $filter = false;
 
     /**
      * @var array
@@ -72,7 +72,7 @@ class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator
     /**
      * @var boolean
      */
-    protected $processIsolation = FALSE;
+    protected $processIsolation = false;
 
     /**
      * @var integer
@@ -82,15 +82,15 @@ class PHPUnit_Extensions_RepeatedTest extends PHPUnit_Extensions_TestDecorator
     /**
      * Constructor.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  integer                $timesRepeat
-     * @param  mixed                  $filter
-     * @param  array                  $groups
-     * @param  array                  $excludeGroups
-     * @param  boolean                $processIsolation
+     * @param  PHPUnit_Framework_Test      $test
+     * @param  integer                     $timesRepeat
+     * @param  mixed                       $filter
+     * @param  array                       $groups
+     * @param  array                       $excludeGroups
+     * @param  boolean                     $processIsolation
      * @throws PHPUnit_Framework_Exception
      */
-    public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)
+    public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $processIsolation = false)
     {
         parent::__construct($test);
 
@@ -103,9 +103,6 @@ public function __construct(PHPUnit_Framework_Test $test, $timesRepeat = 1, $fil
             );
         }
 
-        $this->filter           = $filter;
-        $this->groups           = $groups;
-        $this->excludeGroups    = $excludeGroups;
         $this->processIsolation = $processIsolation;
     }
 
@@ -128,9 +125,9 @@ public function count()
      * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run(PHPUnit_Framework_TestResult $result = null)
     {
-        if ($result === NULL) {
+        if ($result === null) {
             $result = $this->createResult();
         }
 
@@ -138,16 +135,9 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
         for ($i = 0; $i < $this->timesRepeat && !$result->shouldStop(); $i++) {
             //@codingStandardsIgnoreEnd
             if ($this->test instanceof PHPUnit_Framework_TestSuite) {
-                $this->test->run(
-                  $result,
-                  $this->filter,
-                  $this->groups,
-                  $this->excludeGroups,
-                  $this->processIsolation
-                );
-            } else {
-                $this->test->run($result);
+                $this->test->setRunTestInSeparateProcess($this->processIsolation);
             }
+            $this->test->run($result);
         }
 
         return $result;
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/TestDecorator.php b/core/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
similarity index 90%
rename from core/vendor/phpunit/phpunit/PHPUnit/Extensions/TestDecorator.php
rename to core/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
index 37fb9d16ce03d6ec5894f8e99031bdd7f464c308..e3ec809bd03600db31a6bf84a599f2afe7df5a42 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/TestDecorator.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/TestDecorator.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Extensions
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -53,7 +53,7 @@
  * @package    PHPUnit
  * @subpackage Extensions
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -65,12 +65,12 @@ class PHPUnit_Extensions_TestDecorator extends PHPUnit_Framework_Assert implemen
      *
      * @var    object
      */
-    protected $test = NULL;
+    protected $test = null;
 
     /**
      * Constructor.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function __construct(PHPUnit_Framework_Test $test)
     {
@@ -91,7 +91,7 @@ public function toString()
      * Runs the test and collects the
      * result in a TestResult.
      *
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param PHPUnit_Framework_TestResult $result
      */
     public function basicRun(PHPUnit_Framework_TestResult $result)
     {
@@ -136,9 +136,9 @@ public function getTest()
      * @param  PHPUnit_Framework_TestResult $result
      * @return PHPUnit_Framework_TestResult
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run(PHPUnit_Framework_TestResult $result = null)
     {
-        if ($result === NULL) {
+        if ($result === null) {
             $result = $this->createResult();
         }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/TicketListener.php b/core/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
similarity index 77%
rename from core/vendor/phpunit/phpunit/PHPUnit/Extensions/TicketListener.php
rename to core/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
index d7d468a43f7f2d1a434808ee62dd2e4eafeacaca..48782c7086313d91abecc966b8e3fe616aaa2f58 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/TicketListener.php
+++ b/core/vendor/phpunit/phpunit/src/Extensions/TicketListener.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
  * @author     Sean Coates <sean@caedmon.net>
  * @author     Raphael Stolt <raphael.stolt@gmail.com>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.4.0
@@ -52,7 +52,7 @@
  * @subpackage Extensions_TicketListener
  * @author     Sean Coates <sean@caedmon.net>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.4.0
@@ -67,14 +67,14 @@ abstract class PHPUnit_Extensions_TicketListener implements PHPUnit_Framework_Te
     /**
      * @var boolean
      */
-    protected $ran = FALSE;
+    protected $ran = false;
 
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
@@ -83,9 +83,9 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
@@ -94,20 +94,32 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
     }
 
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      * @since  Method available since Release 3.0.0
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
@@ -117,7 +129,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time
     /**
      * A test suite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -127,7 +139,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test suite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -137,7 +149,7 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test)
     {
@@ -146,22 +158,22 @@ public function startTest(PHPUnit_Framework_Test $test)
                 return;
             }
 
-            $name    = $test->getName(FALSE);
+            $name    = $test->getName(false);
             $tickets = PHPUnit_Util_Test::getTickets(get_class($test), $name);
 
             foreach ($tickets as $ticket) {
                 $this->ticketCounts[$ticket][$name] = 1;
             }
 
-            $this->ran = TRUE;
+            $this->ran = true;
         }
     }
 
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
@@ -171,22 +183,18 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
                 $newStatus  = 'closed';
                 $message    = 'Automatically closed by PHPUnit (test passed).';
                 $resolution = 'fixed';
-                $cumulative = TRUE;
-            }
-
-            else if ($test->getStatus() == PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE) {
+                $cumulative = true;
+            } elseif ($test->getStatus() == PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE) {
                 $ifStatus   = array('closed');
                 $newStatus  = 'reopened';
                 $message    = 'Automatically reopened by PHPUnit (test failed).';
                 $resolution = '';
-                $cumulative = FALSE;
-            }
-
-            else {
+                $cumulative = false;
+            } else {
                 return;
             }
 
-            $name    = $test->getName(FALSE);
+            $name    = $test->getName(false);
             $tickets = PHPUnit_Util_Test::getTickets(get_class($test), $name);
 
             foreach ($tickets as $ticket) {
@@ -201,13 +209,13 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
                     // Determine number of to-pass tests:
                     if (count($this->ticketCounts[$ticket]) > 0) {
                         // There exist remaining test cases with this reference.
-                        $adjustTicket = FALSE;
+                        $adjustTicket = false;
                     } else {
                         // No remaining tickets, go ahead and adjust.
-                        $adjustTicket = TRUE;
+                        $adjustTicket = true;
                     }
                 } else {
-                    $adjustTicket = TRUE;
+                    $adjustTicket = true;
                 }
 
                 $ticketInfo = $this->getTicketInfo($ticket);
@@ -219,6 +227,6 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
         }
     }
 
-    abstract protected function getTicketInfo($ticketId = NULL);
+    abstract protected function getTicketInfo($ticketId = null);
     abstract protected function updateTicket($ticketId, $newStatus, $message, $resolution);
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert.php b/core/vendor/phpunit/phpunit/src/Framework/Assert.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert.php
rename to core/vendor/phpunit/phpunit/src/Framework/Assert.php
index e38839d8358e793be420d2bd37834b2f5a3ccdd2..8b1b1f5ff244e360758dd778173e452eea80fc69 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Assert.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -64,9 +64,9 @@ abstract class PHPUnit_Framework_Assert
     /**
      * Asserts that an array has a specified key.
      *
-     * @param  mixed  $key
-     * @param  array|ArrayAccess  $array
-     * @param  string $message
+     * @param mixed             $key
+     * @param array|ArrayAccess $array
+     * @param string            $message
      * @since  Method available since Release 3.0.0
      */
     public static function assertArrayHasKey($key, $array, $message = '')
@@ -76,6 +76,7 @@ public static function assertArrayHasKey($key, $array, $message = '')
               1, 'integer or string'
             );
         }
+
         if (!(is_array($array) || $array instanceof ArrayAccess)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
               2, 'array or ArrayAccess'
@@ -90,9 +91,9 @@ public static function assertArrayHasKey($key, $array, $message = '')
     /**
      * Asserts that an array does not have a specified key.
      *
-     * @param  mixed  $key
-     * @param  array|ArrayAccess  $array
-     * @param  string $message
+     * @param mixed             $key
+     * @param array|ArrayAccess $array
+     * @param string            $message
      * @since  Method available since Release 3.0.0
      */
     public static function assertArrayNotHasKey($key, $array, $message = '')
@@ -102,6 +103,7 @@ public static function assertArrayNotHasKey($key, $array, $message = '')
               1, 'integer or string'
             );
         }
+
         if (!(is_array($array) || $array instanceof ArrayAccess)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
               2, 'array or ArrayAccess'
@@ -118,31 +120,28 @@ public static function assertArrayNotHasKey($key, $array, $message = '')
     /**
      * Asserts that a haystack contains a needle.
      *
-     * @param  mixed   $needle
-     * @param  mixed   $haystack
-     * @param  string  $message
-     * @param  boolean $ignoreCase
-     * @param  boolean $checkForObjectIdentity
+     * @param mixed   $needle
+     * @param mixed   $haystack
+     * @param string  $message
+     * @param boolean $ignoreCase
+     * @param boolean $checkForObjectIdentity
+     * @param boolean $checkForNonObjectIdentity
      * @since  Method available since Release 2.1.0
      */
-    public static function assertContains($needle, $haystack, $message = '', $ignoreCase = FALSE, $checkForObjectIdentity = TRUE)
+    public static function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
     {
         if (is_array($haystack) ||
             is_object($haystack) && $haystack instanceof Traversable) {
             $constraint = new PHPUnit_Framework_Constraint_TraversableContains(
-              $needle, $checkForObjectIdentity
+              $needle, $checkForObjectIdentity, $checkForNonObjectIdentity
             );
-        }
-
-        else if (is_string($haystack)) {
+        } elseif (is_string($haystack)) {
             $constraint = new PHPUnit_Framework_Constraint_StringContains(
               $needle, $ignoreCase
             );
-        }
-
-        else {
+        } else {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
-              2, 'array, iterator or string'
+              2, 'array, traversable or string'
             );
         }
 
@@ -153,57 +152,56 @@ public static function assertContains($needle, $haystack, $message = '', $ignore
      * Asserts that a haystack that is stored in a static attribute of a class
      * or an attribute of an object contains a needle.
      *
-     * @param  mixed   $needle
-     * @param  string  $haystackAttributeName
-     * @param  mixed   $haystackClassOrObject
-     * @param  string  $message
-     * @param  boolean $ignoreCase
-     * @param  boolean $checkForObjectIdentity
+     * @param mixed   $needle
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param string  $message
+     * @param boolean $ignoreCase
+     * @param boolean $checkForObjectIdentity
+     * @param boolean $checkForNonObjectIdentity
      * @since  Method available since Release 3.0.0
      */
-    public static function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = FALSE, $checkForObjectIdentity = TRUE)
+    public static function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
     {
         self::assertContains(
           $needle,
           self::readAttribute($haystackClassOrObject, $haystackAttributeName),
           $message,
           $ignoreCase,
-          $checkForObjectIdentity
+          $checkForObjectIdentity,
+          $checkForNonObjectIdentity
         );
     }
 
     /**
      * Asserts that a haystack does not contain a needle.
      *
-     * @param  mixed   $needle
-     * @param  mixed   $haystack
-     * @param  string  $message
-     * @param  boolean $ignoreCase
-     * @param  boolean $checkForObjectIdentity
+     * @param mixed   $needle
+     * @param mixed   $haystack
+     * @param string  $message
+     * @param boolean $ignoreCase
+     * @param boolean $checkForObjectIdentity
+     * @param boolean $checkForNonObjectIdentity
      * @since  Method available since Release 2.1.0
      */
-    public static function assertNotContains($needle, $haystack, $message = '', $ignoreCase = FALSE, $checkForObjectIdentity = TRUE)
+    public static function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
     {
         if (is_array($haystack) ||
             is_object($haystack) && $haystack instanceof Traversable) {
             $constraint = new PHPUnit_Framework_Constraint_Not(
               new PHPUnit_Framework_Constraint_TraversableContains(
-                $needle, $checkForObjectIdentity
+                $needle, $checkForObjectIdentity, $checkForNonObjectIdentity
               )
             );
-        }
-
-        else if (is_string($haystack)) {
+        } elseif (is_string($haystack)) {
             $constraint = new PHPUnit_Framework_Constraint_Not(
               new PHPUnit_Framework_Constraint_StringContains(
                 $needle, $ignoreCase
               )
             );
-        }
-
-        else {
+        } else {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
-              2, 'array, iterator or string'
+              2, 'array, traversable or string'
             );
         }
 
@@ -214,44 +212,46 @@ public static function assertNotContains($needle, $haystack, $message = '', $ign
      * Asserts that a haystack that is stored in a static attribute of a class
      * or an attribute of an object does not contain a needle.
      *
-     * @param  mixed   $needle
-     * @param  string  $haystackAttributeName
-     * @param  mixed   $haystackClassOrObject
-     * @param  string  $message
-     * @param  boolean $ignoreCase
-     * @param  boolean $checkForObjectIdentity
+     * @param mixed   $needle
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param string  $message
+     * @param boolean $ignoreCase
+     * @param boolean $checkForObjectIdentity
+     * @param boolean $checkForNonObjectIdentity
      * @since  Method available since Release 3.0.0
      */
-    public static function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = FALSE, $checkForObjectIdentity = TRUE)
+    public static function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
     {
         self::assertNotContains(
           $needle,
           self::readAttribute($haystackClassOrObject, $haystackAttributeName),
           $message,
           $ignoreCase,
-          $checkForObjectIdentity
+          $checkForObjectIdentity,
+          $checkForNonObjectIdentity
         );
     }
 
     /**
      * Asserts that a haystack contains only values of a given type.
      *
-     * @param  string  $type
-     * @param  mixed   $haystack
-     * @param  boolean $isNativeType
-     * @param  string  $message
+     * @param string  $type
+     * @param mixed   $haystack
+     * @param boolean $isNativeType
+     * @param string  $message
      * @since  Method available since Release 3.1.4
      */
-    public static function assertContainsOnly($type, $haystack, $isNativeType = NULL, $message = '')
+    public static function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '')
     {
         if (!(is_array($haystack) ||
             is_object($haystack) && $haystack instanceof Traversable)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
-              2, 'array or iterator'
+              2, 'array or traversable'
             );
         }
 
-        if ($isNativeType == NULL) {
+        if ($isNativeType == null) {
             $isNativeType = PHPUnit_Util_Type::isType($type);
         }
 
@@ -267,23 +267,23 @@ public static function assertContainsOnly($type, $haystack, $isNativeType = NULL
     /**
      * Asserts that a haystack contains only instances of a given classname
      *
-     * @param string $classname
+     * @param string            $classname
      * @param array|Traversable $haystack
-     * @param string $message
+     * @param string            $message
      */
     public static function assertContainsOnlyInstancesOf($classname, $haystack, $message = '')
     {
         if (!(is_array($haystack) ||
             is_object($haystack) && $haystack instanceof Traversable)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
-              2, 'array or iterator'
+              2, 'array or traversable'
             );
         }
 
         self::assertThat(
             $haystack,
             new PHPUnit_Framework_Constraint_TraversableContainsOnly(
-                $classname, FALSE
+                $classname, false
             ),
             $message
         );
@@ -293,14 +293,14 @@ public static function assertContainsOnlyInstancesOf($classname, $haystack, $mes
      * Asserts that a haystack that is stored in a static attribute of a class
      * or an attribute of an object contains only values of a given type.
      *
-     * @param  string  $type
-     * @param  string  $haystackAttributeName
-     * @param  mixed   $haystackClassOrObject
-     * @param  boolean $isNativeType
-     * @param  string  $message
+     * @param string  $type
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param boolean $isNativeType
+     * @param string  $message
      * @since  Method available since Release 3.1.4
      */
-    public static function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = NULL, $message = '')
+    public static function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
     {
         self::assertContainsOnly(
           $type,
@@ -313,22 +313,22 @@ public static function assertAttributeContainsOnly($type, $haystackAttributeName
     /**
      * Asserts that a haystack does not contain only values of a given type.
      *
-     * @param  string  $type
-     * @param  mixed   $haystack
-     * @param  boolean $isNativeType
-     * @param  string  $message
+     * @param string  $type
+     * @param mixed   $haystack
+     * @param boolean $isNativeType
+     * @param string  $message
      * @since  Method available since Release 3.1.4
      */
-    public static function assertNotContainsOnly($type, $haystack, $isNativeType = NULL, $message = '')
+    public static function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '')
     {
         if (!(is_array($haystack) ||
             is_object($haystack) && $haystack instanceof Traversable)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
-              2, 'array or iterator'
+              2, 'array or traversable'
             );
         }
 
-        if ($isNativeType == NULL) {
+        if ($isNativeType == null) {
             $isNativeType = PHPUnit_Util_Type::isType($type);
         }
 
@@ -348,14 +348,14 @@ public static function assertNotContainsOnly($type, $haystack, $isNativeType = N
      * or an attribute of an object does not contain only values of a given
      * type.
      *
-     * @param  string  $type
-     * @param  string  $haystackAttributeName
-     * @param  mixed   $haystackClassOrObject
-     * @param  boolean $isNativeType
-     * @param  string  $message
+     * @param string  $type
+     * @param string  $haystackAttributeName
+     * @param mixed   $haystackClassOrObject
+     * @param boolean $isNativeType
+     * @param string  $message
      * @since  Method available since Release 3.1.4
      */
-    public static function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = NULL, $message = '')
+    public static function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
     {
         self::assertNotContainsOnly(
           $type,
@@ -366,7 +366,7 @@ public static function assertAttributeNotContainsOnly($type, $haystackAttributeN
     }
 
     /**
-     * Asserts the number of elements of an array, Countable or Iterator.
+     * Asserts the number of elements of an array, Countable or Traversable.
      *
      * @param integer $expectedCount
      * @param mixed   $haystack
@@ -379,9 +379,9 @@ public static function assertCount($expectedCount, $haystack, $message = '')
         }
 
         if (!$haystack instanceof Countable &&
-            !$haystack instanceof Iterator &&
+            !$haystack instanceof Traversable &&
             !is_array($haystack)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable');
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
         }
 
         self::assertThat(
@@ -392,7 +392,7 @@ public static function assertCount($expectedCount, $haystack, $message = '')
     }
 
     /**
-     * Asserts the number of elements of an array, Countable or Iterator
+     * Asserts the number of elements of an array, Countable or Traversable
      * that is stored in an attribute.
      *
      * @param integer $expectedCount
@@ -411,7 +411,7 @@ public static function assertAttributeCount($expectedCount, $haystackAttributeNa
     }
 
     /**
-     * Asserts the number of elements of an array, Countable or Iterator.
+     * Asserts the number of elements of an array, Countable or Traversable.
      *
      * @param integer $expectedCount
      * @param mixed   $haystack
@@ -424,9 +424,9 @@ public static function assertNotCount($expectedCount, $haystack, $message = '')
         }
 
         if (!$haystack instanceof Countable &&
-            !$haystack instanceof Iterator &&
+            !$haystack instanceof Traversable &&
             !is_array($haystack)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable');
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
         }
 
         $constraint = new PHPUnit_Framework_Constraint_Not(
@@ -437,7 +437,7 @@ public static function assertNotCount($expectedCount, $haystack, $message = '')
     }
 
     /**
-     * Asserts the number of elements of an array, Countable or Iterator
+     * Asserts the number of elements of an array, Countable or Traversable
      * that is stored in an attribute.
      *
      * @param integer $expectedCount
@@ -458,15 +458,15 @@ public static function assertAttributeNotCount($expectedCount, $haystackAttribut
     /**
      * Asserts that two variables are equal.
      *
-     * @param  mixed   $expected
-     * @param  mixed   $actual
-     * @param  string  $message
-     * @param  float   $delta
-     * @param  integer $maxDepth
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param mixed   $expected
+     * @param mixed   $actual
+     * @param string  $message
+     * @param float   $delta
+     * @param integer $maxDepth
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
      */
-    public static function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
     {
         $constraint = new PHPUnit_Framework_Constraint_IsEqual(
           $expected, $delta, $maxDepth, $canonicalize, $ignoreCase
@@ -478,16 +478,16 @@ public static function assertEquals($expected, $actual, $message = '', $delta =
     /**
      * Asserts that a variable is equal to an attribute of an object.
      *
-     * @param  mixed   $expected
-     * @param  string  $actualAttributeName
-     * @param  string  $actualClassOrObject
-     * @param  string  $message
-     * @param  float   $delta
-     * @param  integer $maxDepth
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param mixed   $expected
+     * @param string  $actualAttributeName
+     * @param string  $actualClassOrObject
+     * @param string  $message
+     * @param float   $delta
+     * @param integer $maxDepth
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
      */
-    public static function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
     {
         self::assertEquals(
           $expected,
@@ -503,16 +503,16 @@ public static function assertAttributeEquals($expected, $actualAttributeName, $a
     /**
      * Asserts that two variables are not equal.
      *
-     * @param  mixed   $expected
-     * @param  mixed   $actual
-     * @param  string  $message
-     * @param  float   $delta
-     * @param  integer $maxDepth
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param mixed   $expected
+     * @param mixed   $actual
+     * @param string  $message
+     * @param float   $delta
+     * @param integer $maxDepth
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
      * @since  Method available since Release 2.3.0
      */
-    public static function assertNotEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
     {
         $constraint = new PHPUnit_Framework_Constraint_Not(
           new PHPUnit_Framework_Constraint_IsEqual(
@@ -526,16 +526,16 @@ public static function assertNotEquals($expected, $actual, $message = '', $delta
     /**
      * Asserts that a variable is not equal to an attribute of an object.
      *
-     * @param  mixed   $expected
-     * @param  string  $actualAttributeName
-     * @param  string  $actualClassOrObject
-     * @param  string  $message
-     * @param  float   $delta
-     * @param  integer $maxDepth
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param mixed   $expected
+     * @param string  $actualAttributeName
+     * @param string  $actualClassOrObject
+     * @param string  $message
+     * @param float   $delta
+     * @param integer $maxDepth
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
      */
-    public static function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
     {
         self::assertNotEquals(
           $expected,
@@ -551,8 +551,8 @@ public static function assertAttributeNotEquals($expected, $actualAttributeName,
     /**
      * Asserts that a variable is empty.
      *
-     * @param  mixed   $actual
-     * @param  string  $message
+     * @param  mixed                                  $actual
+     * @param  string                                 $message
      * @throws PHPUnit_Framework_AssertionFailedError
      */
     public static function assertEmpty($actual, $message = '')
@@ -580,8 +580,8 @@ public static function assertAttributeEmpty($haystackAttributeName, $haystackCla
     /**
      * Asserts that a variable is not empty.
      *
-     * @param  mixed   $actual
-     * @param  string  $message
+     * @param  mixed                                  $actual
+     * @param  string                                 $message
      * @throws PHPUnit_Framework_AssertionFailedError
      */
     public static function assertNotEmpty($actual, $message = '')
@@ -609,9 +609,9 @@ public static function assertAttributeNotEmpty($haystackAttributeName, $haystack
     /**
      * Asserts that a value is greater than another value.
      *
-     * @param  mixed   $expected
-     * @param  mixed   $actual
-     * @param  string  $message
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertGreaterThan($expected, $actual, $message = '')
@@ -622,10 +622,10 @@ public static function assertGreaterThan($expected, $actual, $message = '')
     /**
      * Asserts that an attribute is greater than another value.
      *
-     * @param  mixed   $expected
-     * @param  string  $actualAttributeName
-     * @param  string  $actualClassOrObject
-     * @param  string  $message
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param string $actualClassOrObject
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertAttributeGreaterThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
@@ -640,9 +640,9 @@ public static function assertAttributeGreaterThan($expected, $actualAttributeNam
     /**
      * Asserts that a value is greater than or equal to another value.
      *
-     * @param  mixed   $expected
-     * @param  mixed   $actual
-     * @param  string  $message
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertGreaterThanOrEqual($expected, $actual, $message = '')
@@ -655,10 +655,10 @@ public static function assertGreaterThanOrEqual($expected, $actual, $message = '
     /**
      * Asserts that an attribute is greater than or equal to another value.
      *
-     * @param  mixed   $expected
-     * @param  string  $actualAttributeName
-     * @param  string  $actualClassOrObject
-     * @param  string  $message
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param string $actualClassOrObject
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertAttributeGreaterThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
@@ -673,9 +673,9 @@ public static function assertAttributeGreaterThanOrEqual($expected, $actualAttri
     /**
      * Asserts that a value is smaller than another value.
      *
-     * @param  mixed   $expected
-     * @param  mixed   $actual
-     * @param  string  $message
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertLessThan($expected, $actual, $message = '')
@@ -686,10 +686,10 @@ public static function assertLessThan($expected, $actual, $message = '')
     /**
      * Asserts that an attribute is smaller than another value.
      *
-     * @param  mixed   $expected
-     * @param  string  $actualAttributeName
-     * @param  string  $actualClassOrObject
-     * @param  string  $message
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param string $actualClassOrObject
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertAttributeLessThan($expected, $actualAttributeName, $actualClassOrObject, $message = '')
@@ -704,9 +704,9 @@ public static function assertAttributeLessThan($expected, $actualAttributeName,
     /**
      * Asserts that a value is smaller than or equal to another value.
      *
-     * @param  mixed   $expected
-     * @param  mixed   $actual
-     * @param  string  $message
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertLessThanOrEqual($expected, $actual, $message = '')
@@ -717,10 +717,10 @@ public static function assertLessThanOrEqual($expected, $actual, $message = '')
     /**
      * Asserts that an attribute is smaller than or equal to another value.
      *
-     * @param  mixed   $expected
-     * @param  string  $actualAttributeName
-     * @param  string  $actualClassOrObject
-     * @param  string  $message
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param string $actualClassOrObject
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actualClassOrObject, $message = '')
@@ -736,14 +736,14 @@ public static function assertAttributeLessThanOrEqual($expected, $actualAttribut
      * Asserts that the contents of one file is equal to the contents of another
      * file.
      *
-     * @param  string  $expected
-     * @param  string  $actual
-     * @param  string  $message
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param string  $expected
+     * @param string  $actual
+     * @param string  $message
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
      * @since  Method available since Release 3.2.14
      */
-    public static function assertFileEquals($expected, $actual, $message = '', $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
     {
         self::assertFileExists($expected, $message);
         self::assertFileExists($actual, $message);
@@ -763,14 +763,14 @@ public static function assertFileEquals($expected, $actual, $message = '', $cano
      * Asserts that the contents of one file is not equal to the contents of
      * another file.
      *
-     * @param  string  $expected
-     * @param  string  $actual
-     * @param  string  $message
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param string  $expected
+     * @param string  $actual
+     * @param string  $message
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
      * @since  Method available since Release 3.2.14
      */
-    public static function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
     {
         self::assertFileExists($expected, $message);
         self::assertFileExists($actual, $message);
@@ -790,14 +790,14 @@ public static function assertFileNotEquals($expected, $actual, $message = '', $c
      * Asserts that the contents of a string is equal
      * to the contents of a file.
      *
-     * @param  string  $expectedFile
-     * @param  string  $actualString
-     * @param  string  $message
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param string  $expectedFile
+     * @param string  $actualString
+     * @param string  $message
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
      * @since  Method available since Release 3.3.0
      */
-    public static function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
     {
         self::assertFileExists($expectedFile, $message);
 
@@ -816,14 +816,14 @@ public static function assertStringEqualsFile($expectedFile, $actualString, $mes
      * Asserts that the contents of a string is not equal
      * to the contents of a file.
      *
-     * @param  string  $expectedFile
-     * @param  string  $actualString
-     * @param  string  $message
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param string  $expectedFile
+     * @param string  $actualString
+     * @param string  $message
+     * @param boolean $canonicalize
+     * @param boolean $ignoreCase
      * @since  Method available since Release 3.3.0
      */
-    public static function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
     {
         self::assertFileExists($expectedFile, $message);
 
@@ -841,8 +841,8 @@ public static function assertStringNotEqualsFile($expectedFile, $actualString, $
     /**
      * Asserts that a file exists.
      *
-     * @param  string $filename
-     * @param  string $message
+     * @param string $filename
+     * @param string $message
      * @since  Method available since Release 3.0.0
      */
     public static function assertFileExists($filename, $message = '')
@@ -859,8 +859,8 @@ public static function assertFileExists($filename, $message = '')
     /**
      * Asserts that a file does not exist.
      *
-     * @param  string $filename
-     * @param  string $message
+     * @param string $filename
+     * @param string $message
      * @since  Method available since Release 3.0.0
      */
     public static function assertFileNotExists($filename, $message = '')
@@ -879,8 +879,8 @@ public static function assertFileNotExists($filename, $message = '')
     /**
      * Asserts that a condition is true.
      *
-     * @param  boolean $condition
-     * @param  string  $message
+     * @param  boolean                                $condition
+     * @param  string                                 $message
      * @throws PHPUnit_Framework_AssertionFailedError
      */
     public static function assertTrue($condition, $message = '')
@@ -888,11 +888,23 @@ public static function assertTrue($condition, $message = '')
         self::assertThat($condition, self::isTrue(), $message);
     }
 
+    /**
+     * Asserts that a condition is not true.
+     *
+     * @param  boolean                                $condition
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function assertNotTrue($condition, $message = '')
+    {
+        self::assertThat($condition, self::logicalNot(self::isTrue()), $message);
+    }
+
     /**
      * Asserts that a condition is false.
      *
-     * @param  boolean  $condition
-     * @param  string   $message
+     * @param  boolean                                $condition
+     * @param  string                                 $message
      * @throws PHPUnit_Framework_AssertionFailedError
      */
     public static function assertFalse($condition, $message = '')
@@ -901,10 +913,22 @@ public static function assertFalse($condition, $message = '')
     }
 
     /**
-     * Asserts that a variable is not NULL.
+     * Asserts that a condition is not false.
+     *
+     * @param  boolean                                $condition
+     * @param  string                                 $message
+     * @throws PHPUnit_Framework_AssertionFailedError
+     */
+    public static function assertNotFalse($condition, $message = '')
+    {
+        self::assertThat($condition, self::logicalNot(self::isFalse()), $message);
+    }
+
+    /**
+     * Asserts that a variable is not null.
      *
-     * @param  mixed  $actual
-     * @param  string $message
+     * @param mixed  $actual
+     * @param string $message
      */
     public static function assertNotNull($actual, $message = '')
     {
@@ -912,10 +936,10 @@ public static function assertNotNull($actual, $message = '')
     }
 
     /**
-     * Asserts that a variable is NULL.
+     * Asserts that a variable is null.
      *
-     * @param  mixed  $actual
-     * @param  string $message
+     * @param mixed  $actual
+     * @param string $message
      */
     public static function assertNull($actual, $message = '')
     {
@@ -925,9 +949,9 @@ public static function assertNull($actual, $message = '')
     /**
      * Asserts that a class has a specified attribute.
      *
-     * @param  string $attributeName
-     * @param  string $className
-     * @param  string $message
+     * @param string $attributeName
+     * @param string $className
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertClassHasAttribute($attributeName, $className, $message = '')
@@ -936,7 +960,11 @@ public static function assertClassHasAttribute($attributeName, $className, $mess
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
-        if (!is_string($className) || !class_exists($className, FALSE)) {
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_string($className) || !class_exists($className, false)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name');
         }
 
@@ -950,9 +978,9 @@ public static function assertClassHasAttribute($attributeName, $className, $mess
     /**
      * Asserts that a class does not have a specified attribute.
      *
-     * @param  string $attributeName
-     * @param  string $className
-     * @param  string $message
+     * @param string $attributeName
+     * @param string $className
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertClassNotHasAttribute($attributeName, $className, $message = '')
@@ -961,7 +989,11 @@ public static function assertClassNotHasAttribute($attributeName, $className, $m
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
-        if (!is_string($className) || !class_exists($className, FALSE)) {
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_string($className) || !class_exists($className, false)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name');
         }
 
@@ -975,9 +1007,9 @@ public static function assertClassNotHasAttribute($attributeName, $className, $m
     /**
      * Asserts that a class has a specified static attribute.
      *
-     * @param  string $attributeName
-     * @param  string $className
-     * @param  string $message
+     * @param string $attributeName
+     * @param string $className
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertClassHasStaticAttribute($attributeName, $className, $message = '')
@@ -986,7 +1018,11 @@ public static function assertClassHasStaticAttribute($attributeName, $className,
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
-        if (!is_string($className) || !class_exists($className, FALSE)) {
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_string($className) || !class_exists($className, false)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name');
         }
 
@@ -1000,9 +1036,9 @@ public static function assertClassHasStaticAttribute($attributeName, $className,
     /**
      * Asserts that a class does not have a specified static attribute.
      *
-     * @param  string $attributeName
-     * @param  string $className
-     * @param  string $message
+     * @param string $attributeName
+     * @param string $className
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertClassNotHasStaticAttribute($attributeName, $className, $message = '')
@@ -1011,7 +1047,11 @@ public static function assertClassNotHasStaticAttribute($attributeName, $classNa
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
-        if (!is_string($className) || !class_exists($className, FALSE)) {
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
+        if (!is_string($className) || !class_exists($className, false)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'class name');
         }
 
@@ -1027,9 +1067,9 @@ public static function assertClassNotHasStaticAttribute($attributeName, $classNa
     /**
      * Asserts that an object has a specified attribute.
      *
-     * @param  string $attributeName
-     * @param  object $object
-     * @param  string $message
+     * @param string $attributeName
+     * @param object $object
+     * @param string $message
      * @since  Method available since Release 3.0.0
      */
     public static function assertObjectHasAttribute($attributeName, $object, $message = '')
@@ -1038,6 +1078,10 @@ public static function assertObjectHasAttribute($attributeName, $object, $messag
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
         if (!is_object($object)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'object');
         }
@@ -1052,9 +1096,9 @@ public static function assertObjectHasAttribute($attributeName, $object, $messag
     /**
      * Asserts that an object does not have a specified attribute.
      *
-     * @param  string $attributeName
-     * @param  object $object
-     * @param  string $message
+     * @param string $attributeName
+     * @param object $object
+     * @param string $message
      * @since  Method available since Release 3.0.0
      */
     public static function assertObjectNotHasAttribute($attributeName, $object, $message = '')
@@ -1063,6 +1107,10 @@ public static function assertObjectNotHasAttribute($attributeName, $object, $mes
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'valid attribute name');
+        }
+
         if (!is_object($object)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'object');
         }
@@ -1079,9 +1127,9 @@ public static function assertObjectNotHasAttribute($attributeName, $object, $mes
      * Used on objects, it asserts that two variables reference
      * the same object.
      *
-     * @param  mixed  $expected
-     * @param  mixed  $actual
-     * @param  string $message
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
      */
     public static function assertSame($expected, $actual, $message = '')
     {
@@ -1100,10 +1148,10 @@ public static function assertSame($expected, $actual, $message = '')
      * Asserts that a variable and an attribute of an object have the same type
      * and value.
      *
-     * @param  mixed  $expected
-     * @param  string $actualAttributeName
-     * @param  object $actualClassOrObject
-     * @param  string $message
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param object $actualClassOrObject
+     * @param string $message
      */
     public static function assertAttributeSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
     {
@@ -1119,9 +1167,9 @@ public static function assertAttributeSame($expected, $actualAttributeName, $act
      * Used on objects, it asserts that two variables do not reference
      * the same object.
      *
-     * @param  mixed  $expected
-     * @param  mixed  $actual
-     * @param  string $message
+     * @param mixed  $expected
+     * @param mixed  $actual
+     * @param string $message
      */
     public static function assertNotSame($expected, $actual, $message = '')
     {
@@ -1140,10 +1188,10 @@ public static function assertNotSame($expected, $actual, $message = '')
      * Asserts that a variable and an attribute of an object do not have the
      * same type and value.
      *
-     * @param  mixed  $expected
-     * @param  string $actualAttributeName
-     * @param  object $actualClassOrObject
-     * @param  string $message
+     * @param mixed  $expected
+     * @param string $actualAttributeName
+     * @param object $actualClassOrObject
+     * @param string $message
      */
     public static function assertAttributeNotSame($expected, $actualAttributeName, $actualClassOrObject, $message = '')
     {
@@ -1164,22 +1212,14 @@ public static function assertAttributeNotSame($expected, $actualAttributeName, $
      */
     public static function assertInstanceOf($expected, $actual, $message = '')
     {
-        if (is_string($expected)) {
-            if (class_exists($expected) || interface_exists($expected)) {
-                $constraint = new PHPUnit_Framework_Constraint_IsInstanceOf(
-                  $expected
-                );
-            }
-
-            else {
-                throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                  1, 'class or interface name'
-                );
-            }
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        if (!(is_string($expected) && (class_exists($expected) || interface_exists($expected)))) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class or interface name');
         }
 
+        $constraint = new PHPUnit_Framework_Constraint_IsInstanceOf(
+            $expected
+        );
+
         self::assertThat($actual, $constraint, $message);
     }
 
@@ -1211,22 +1251,14 @@ public static function assertAttributeInstanceOf($expected, $attributeName, $cla
      */
     public static function assertNotInstanceOf($expected, $actual, $message = '')
     {
-        if (is_string($expected)) {
-            if (class_exists($expected) || interface_exists($expected)) {
-                $constraint = new PHPUnit_Framework_Constraint_Not(
-                  new PHPUnit_Framework_Constraint_IsInstanceOf($expected)
-                );
-            }
-
-            else {
-                throw PHPUnit_Util_InvalidArgumentHelper::factory(
-                  1, 'class or interface name'
-                );
-            }
-        } else {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        if (!(is_string($expected) && (class_exists($expected) || interface_exists($expected)))) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class or interface name');
         }
 
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+            new PHPUnit_Framework_Constraint_IsInstanceOf($expected)
+        );
+
         self::assertThat($actual, $constraint, $message);
     }
 
@@ -1258,14 +1290,14 @@ public static function assertAttributeNotInstanceOf($expected, $attributeName, $
      */
     public static function assertInternalType($expected, $actual, $message = '')
     {
-        if (is_string($expected)) {
-            $constraint = new PHPUnit_Framework_Constraint_IsType(
-              $expected
-            );
-        } else {
+        if (!is_string($expected)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
+        $constraint = new PHPUnit_Framework_Constraint_IsType(
+            $expected
+        );
+
         self::assertThat($actual, $constraint, $message);
     }
 
@@ -1297,14 +1329,14 @@ public static function assertAttributeInternalType($expected, $attributeName, $c
      */
     public static function assertNotInternalType($expected, $actual, $message = '')
     {
-        if (is_string($expected)) {
-            $constraint = new PHPUnit_Framework_Constraint_Not(
-              new PHPUnit_Framework_Constraint_IsType($expected)
-            );
-        } else {
+        if (!is_string($expected)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
+        $constraint = new PHPUnit_Framework_Constraint_Not(
+            new PHPUnit_Framework_Constraint_IsType($expected)
+        );
+
         self::assertThat($actual, $constraint, $message);
     }
 
@@ -1329,9 +1361,9 @@ public static function assertAttributeNotInternalType($expected, $attributeName,
     /**
      * Asserts that a string matches a given regular expression.
      *
-     * @param  string $pattern
-     * @param  string $string
-     * @param  string $message
+     * @param string $pattern
+     * @param string $string
+     * @param string $message
      */
     public static function assertRegExp($pattern, $string, $message = '')
     {
@@ -1351,9 +1383,9 @@ public static function assertRegExp($pattern, $string, $message = '')
     /**
      * Asserts that a string does not match a given regular expression.
      *
-     * @param  string $pattern
-     * @param  string $string
-     * @param  string $message
+     * @param string $pattern
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 2.1.0
      */
     public static function assertNotRegExp($pattern, $string, $message = '')
@@ -1374,25 +1406,25 @@ public static function assertNotRegExp($pattern, $string, $message = '')
     }
 
     /**
-     * Assert that the size of two arrays (or `Countable` or `Iterator` objects)
+     * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
      * is the same.
      *
-     * @param array|Countable|Iterator $expected
-     * @param array|Countable|Iterator $actual
-     * @param string $message
+     * @param array|Countable|Traversable $expected
+     * @param array|Countable|Traversable $actual
+     * @param string                      $message
      */
     public static function assertSameSize($expected, $actual, $message = '')
     {
         if (!$expected instanceof Countable &&
-            !$expected instanceof Iterator &&
+            !$expected instanceof Traversable &&
             !is_array($expected)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'countable');
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'countable or traversable');
         }
 
         if (!$actual instanceof Countable &&
-            !$actual instanceof Iterator &&
+            !$actual instanceof Traversable &&
             !is_array($actual)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable');
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
         }
 
         self::assertThat(
@@ -1403,25 +1435,25 @@ public static function assertSameSize($expected, $actual, $message = '')
     }
 
     /**
-     * Assert that the size of two arrays (or `Countable` or `Iterator` objects)
+     * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
      * is not the same.
      *
-     * @param array|Countable|Iterator $expected
-     * @param array|Countable|Iterator $actual
-     * @param string $message
+     * @param array|Countable|Traversable $expected
+     * @param array|Countable|Traversable $actual
+     * @param string                      $message
      */
     public static function assertNotSameSize($expected, $actual, $message = '')
     {
         if (!$expected instanceof Countable &&
-            !$expected instanceof Iterator &&
+            !$expected instanceof Traversable &&
             !is_array($expected)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'countable');
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'countable or traversable');
         }
 
         if (!$actual instanceof Countable &&
-            !$actual instanceof Iterator &&
+            !$actual instanceof Traversable &&
             !is_array($actual)) {
-            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable');
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'countable or traversable');
         }
 
         $constraint = new PHPUnit_Framework_Constraint_Not(
@@ -1434,9 +1466,9 @@ public static function assertNotSameSize($expected, $actual, $message = '')
     /**
      * Asserts that a string matches a given format string.
      *
-     * @param  string $format
-     * @param  string $string
-     * @param  string $message
+     * @param string $format
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 3.5.0
      */
     public static function assertStringMatchesFormat($format, $string, $message = '')
@@ -1457,9 +1489,9 @@ public static function assertStringMatchesFormat($format, $string, $message = ''
     /**
      * Asserts that a string does not match a given format string.
      *
-     * @param  string $format
-     * @param  string $string
-     * @param  string $message
+     * @param string $format
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 3.5.0
      */
     public static function assertStringNotMatchesFormat($format, $string, $message = '')
@@ -1482,9 +1514,9 @@ public static function assertStringNotMatchesFormat($format, $string, $message =
     /**
      * Asserts that a string matches a given format file.
      *
-     * @param  string $formatFile
-     * @param  string $string
-     * @param  string $message
+     * @param string $formatFile
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 3.5.0
      */
     public static function assertStringMatchesFormatFile($formatFile, $string, $message = '')
@@ -1505,9 +1537,9 @@ public static function assertStringMatchesFormatFile($formatFile, $string, $mess
     /**
      * Asserts that a string does not match a given format string.
      *
-     * @param  string $formatFile
-     * @param  string $string
-     * @param  string $message
+     * @param string $formatFile
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 3.5.0
      */
     public static function assertStringNotMatchesFormatFile($formatFile, $string, $message = '')
@@ -1530,9 +1562,9 @@ public static function assertStringNotMatchesFormatFile($formatFile, $string, $m
     /**
      * Asserts that a string starts with a given prefix.
      *
-     * @param  string $prefix
-     * @param  string $string
-     * @param  string $message
+     * @param string $prefix
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 3.4.0
      */
     public static function assertStringStartsWith($prefix, $string, $message = '')
@@ -1555,9 +1587,9 @@ public static function assertStringStartsWith($prefix, $string, $message = '')
     /**
      * Asserts that a string starts not with a given prefix.
      *
-     * @param  string $prefix
-     * @param  string $string
-     * @param  string $message
+     * @param string $prefix
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 3.4.0
      */
     public static function assertStringStartsNotWith($prefix, $string, $message = '')
@@ -1578,11 +1610,11 @@ public static function assertStringStartsNotWith($prefix, $string, $message = ''
     }
 
     /**
-     * Asserts that a string ends with a given prefix.
+     * Asserts that a string ends with a given suffix.
      *
-     * @param  string $suffix
-     * @param  string $string
-     * @param  string $message
+     * @param string $suffix
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 3.4.0
      */
     public static function assertStringEndsWith($suffix, $string, $message = '')
@@ -1601,11 +1633,11 @@ public static function assertStringEndsWith($suffix, $string, $message = '')
     }
 
     /**
-     * Asserts that a string ends not with a given prefix.
+     * Asserts that a string ends not with a given suffix.
      *
-     * @param  string $suffix
-     * @param  string $string
-     * @param  string $message
+     * @param string $suffix
+     * @param string $string
+     * @param string $message
      * @since  Method available since Release 3.4.0
      */
     public static function assertStringEndsNotWith($suffix, $string, $message = '')
@@ -1628,9 +1660,9 @@ public static function assertStringEndsNotWith($suffix, $string, $message = '')
     /**
      * Asserts that two XML files are equal.
      *
-     * @param  string $expectedFile
-     * @param  string $actualFile
-     * @param  string $message
+     * @param string $expectedFile
+     * @param string $actualFile
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $message = '')
@@ -1639,11 +1671,11 @@ public static function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $m
         self::assertFileExists($actualFile);
 
         $expected = new DOMDocument;
-        $expected->preserveWhiteSpace = FALSE;
+        $expected->preserveWhiteSpace = false;
         $expected->load($expectedFile);
 
         $actual = new DOMDocument;
-        $actual->preserveWhiteSpace = FALSE;
+        $actual->preserveWhiteSpace = false;
         $actual->load($actualFile);
 
         self::assertEquals($expected, $actual, $message);
@@ -1652,9 +1684,9 @@ public static function assertXmlFileEqualsXmlFile($expectedFile, $actualFile, $m
     /**
      * Asserts that two XML files are not equal.
      *
-     * @param  string $expectedFile
-     * @param  string $actualFile
-     * @param  string $message
+     * @param string $expectedFile
+     * @param string $actualFile
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile, $message = '')
@@ -1663,11 +1695,11 @@ public static function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile,
         self::assertFileExists($actualFile);
 
         $expected = new DOMDocument;
-        $expected->preserveWhiteSpace = FALSE;
+        $expected->preserveWhiteSpace = false;
         $expected->load($expectedFile);
 
         $actual = new DOMDocument;
-        $actual->preserveWhiteSpace = FALSE;
+        $actual->preserveWhiteSpace = false;
         $actual->load($actualFile);
 
         self::assertNotEquals($expected, $actual, $message);
@@ -1676,9 +1708,9 @@ public static function assertXmlFileNotEqualsXmlFile($expectedFile, $actualFile,
     /**
      * Asserts that two XML documents are equal.
      *
-     * @param  string $expectedFile
-     * @param  string $actualXml
-     * @param  string $message
+     * @param string $expectedFile
+     * @param string $actualXml
+     * @param string $message
      * @since  Method available since Release 3.3.0
      */
     public static function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $message = '')
@@ -1686,11 +1718,11 @@ public static function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $
         self::assertFileExists($expectedFile);
 
         $expected = new DOMDocument;
-        $expected->preserveWhiteSpace = FALSE;
+        $expected->preserveWhiteSpace = false;
         $expected->load($expectedFile);
 
         $actual = new DOMDocument;
-        $actual->preserveWhiteSpace = FALSE;
+        $actual->preserveWhiteSpace = false;
         $actual->loadXML($actualXml);
 
         self::assertEquals($expected, $actual, $message);
@@ -1699,9 +1731,9 @@ public static function assertXmlStringEqualsXmlFile($expectedFile, $actualXml, $
     /**
      * Asserts that two XML documents are not equal.
      *
-     * @param  string $expectedFile
-     * @param  string $actualXml
-     * @param  string $message
+     * @param string $expectedFile
+     * @param string $actualXml
+     * @param string $message
      * @since  Method available since Release 3.3.0
      */
     public static function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml, $message = '')
@@ -1709,11 +1741,11 @@ public static function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml
         self::assertFileExists($expectedFile);
 
         $expected = new DOMDocument;
-        $expected->preserveWhiteSpace = FALSE;
+        $expected->preserveWhiteSpace = false;
         $expected->load($expectedFile);
 
         $actual = new DOMDocument;
-        $actual->preserveWhiteSpace = FALSE;
+        $actual->preserveWhiteSpace = false;
         $actual->loadXML($actualXml);
 
         self::assertNotEquals($expected, $actual, $message);
@@ -1722,19 +1754,19 @@ public static function assertXmlStringNotEqualsXmlFile($expectedFile, $actualXml
     /**
      * Asserts that two XML documents are equal.
      *
-     * @param  string $expectedXml
-     * @param  string $actualXml
-     * @param  string $message
+     * @param string $expectedXml
+     * @param string $actualXml
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertXmlStringEqualsXmlString($expectedXml, $actualXml, $message = '')
     {
         $expected = new DOMDocument;
-        $expected->preserveWhiteSpace = FALSE;
+        $expected->preserveWhiteSpace = false;
         $expected->loadXML($expectedXml);
 
         $actual = new DOMDocument;
-        $actual->preserveWhiteSpace = FALSE;
+        $actual->preserveWhiteSpace = false;
         $actual->loadXML($actualXml);
 
         self::assertEquals($expected, $actual, $message);
@@ -1743,19 +1775,19 @@ public static function assertXmlStringEqualsXmlString($expectedXml, $actualXml,
     /**
      * Asserts that two XML documents are not equal.
      *
-     * @param  string $expectedXml
-     * @param  string $actualXml
-     * @param  string $message
+     * @param string $expectedXml
+     * @param string $actualXml
+     * @param string $message
      * @since  Method available since Release 3.1.0
      */
     public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXml, $message = '')
     {
         $expected = new DOMDocument;
-        $expected->preserveWhiteSpace = FALSE;
+        $expected->preserveWhiteSpace = false;
         $expected->loadXML($expectedXml);
 
         $actual = new DOMDocument;
-        $actual->preserveWhiteSpace = FALSE;
+        $actual->preserveWhiteSpace = false;
         $actual->loadXML($actualXml);
 
         self::assertNotEquals($expected, $actual, $message);
@@ -1766,12 +1798,12 @@ public static function assertXmlStringNotEqualsXmlString($expectedXml, $actualXm
      *
      * @param DOMElement $expectedElement
      * @param DOMElement $actualElement
-     * @param boolean $checkAttributes
-     * @param string  $message
+     * @param boolean    $checkAttributes
+     * @param string     $message
      * @author Mattis Stordalen Flister <mattis@xait.no>
      * @since  Method available since Release 3.3.0
      */
-    public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = FALSE, $message = '')
+    public static function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
     {
         self::assertEquals(
           $expectedElement->tagName,
@@ -1844,25 +1876,25 @@ public static function assertEqualXMLStructure(DOMElement $expectedElement, DOME
      *
      * The second argument, $count, can be either boolean or numeric.
      * When boolean, it asserts for presence of elements matching the selector
-     * (TRUE) or absence of elements (FALSE).
+     * (true) or absence of elements (false).
      * When numeric, it asserts the count of elements.
      *
      * assertSelectCount("#binder", true, $xml);  // any?
      * assertSelectCount(".binder", 3, $xml);     // exactly 3?
      *
-     * @param  array   $selector
-     * @param  integer $count
-     * @param  mixed   $actual
-     * @param  string  $message
-     * @param  boolean $isHtml
+     * @param array   $selector
+     * @param integer $count
+     * @param mixed   $actual
+     * @param string  $message
+     * @param boolean $isHtml
      * @since  Method available since Release 3.3.0
      * @author Mike Naberezny <mike@maintainable.com>
      * @author Derek DeVries <derek@maintainable.com>
      */
-    public static function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = TRUE)
+    public static function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true)
     {
         self::assertSelectEquals(
-          $selector, TRUE, $count, $actual, $message, $isHtml
+          $selector, true, $count, $actual, $message, $isHtml
         );
     }
 
@@ -1870,17 +1902,17 @@ public static function assertSelectCount($selector, $count, $actual, $message =
      * assertSelectRegExp("#binder .name", "/Mike|Derek/", true, $xml); // any?
      * assertSelectRegExp("#binder .name", "/Mike|Derek/", 3, $xml);    // 3?
      *
-     * @param  array   $selector
-     * @param  string  $pattern
-     * @param  integer $count
-     * @param  mixed   $actual
-     * @param  string  $message
-     * @param  boolean $isHtml
+     * @param array   $selector
+     * @param string  $pattern
+     * @param integer $count
+     * @param mixed   $actual
+     * @param string  $message
+     * @param boolean $isHtml
      * @since  Method available since Release 3.3.0
      * @author Mike Naberezny <mike@maintainable.com>
      * @author Derek DeVries <derek@maintainable.com>
      */
-    public static function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = TRUE)
+    public static function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true)
     {
         self::assertSelectEquals(
           $selector, "regexp:$pattern", $count, $actual, $message, $isHtml
@@ -1891,17 +1923,17 @@ public static function assertSelectRegExp($selector, $pattern, $count, $actual,
      * assertSelectEquals("#binder .name", "Chuck", true,  $xml);  // any?
      * assertSelectEquals("#binder .name", "Chuck", false, $xml);  // none?
      *
-     * @param  array   $selector
-     * @param  string  $content
-     * @param  integer $count
-     * @param  mixed   $actual
-     * @param  string  $message
-     * @param  boolean $isHtml
+     * @param array   $selector
+     * @param string  $content
+     * @param integer $count
+     * @param mixed   $actual
+     * @param string  $message
+     * @param boolean $isHtml
      * @since  Method available since Release 3.3.0
      * @author Mike Naberezny <mike@maintainable.com>
      * @author Derek DeVries <derek@maintainable.com>
      */
-    public static function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = TRUE)
+    public static function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true)
     {
         $tags = PHPUnit_Util_XML::cssSelect(
           $selector, $content, $actual, $isHtml
@@ -1957,13 +1989,13 @@ public static function assertSelectEquals($selector, $content, $count, $actual,
      * match criteria for the assertion:
      *
      *  - `id`           : the node with the given id attribute must match the
-     *                     corresponsing value.
+     *                     corresponding value.
      *  - `tag`          : the node type must match the corresponding value.
-     *  - `attributes`   : a hash. The node's attributres must match the
-     *                     corresponsing values in the hash.
+     *  - `attributes`   : a hash. The node's attributes must match the
+     *                     corresponding values in the hash.
      *  - `content`      : The text content must match the given value.
      *  - `parent`       : a hash. The node's parent must match the
-     *                     corresponsing hash.
+     *                     corresponding hash.
      *  - `child`        : a hash. At least one of the node's immediate children
      *                     must meet the criteria described by the hash.
      *  - `ancestor`     : a hash. At least one of the node's ancestors must
@@ -2065,7 +2097,7 @@ public static function assertSelectEquals($selector, $content, $count, $actual,
      * $this->assertTag($matcher, $html);
      *
      * // Use assertTag() to apply a $matcher to a piece of $xml.
-     * $this->assertTag($matcher, $xml, '', FALSE);
+     * $this->assertTag($matcher, $xml, '', false);
      * </code>
      *
      * The second argument ($actual) is a string containing either HTML or
@@ -2076,18 +2108,18 @@ public static function assertSelectEquals($selector, $content, $count, $actual,
      *
      * The fourth argument ($html) is an optional flag specifying whether
      * to load the $actual string into a DOMDocument using the HTML or
-     * XML load strategy.  It is TRUE by default, which assumes the HTML
+     * XML load strategy.  It is true by default, which assumes the HTML
      * load strategy.  In many cases, this will be acceptable for XML as well.
      *
-     * @param  array   $matcher
-     * @param  string  $actual
-     * @param  string  $message
-     * @param  boolean $isHtml
+     * @param array   $matcher
+     * @param string  $actual
+     * @param string  $message
+     * @param boolean $isHtml
      * @since  Method available since Release 3.3.0
      * @author Mike Naberezny <mike@maintainable.com>
      * @author Derek DeVries <derek@maintainable.com>
      */
-    public static function assertTag($matcher, $actual, $message = '', $isHtml = TRUE)
+    public static function assertTag($matcher, $actual, $message = '', $isHtml = true)
     {
         $dom     = PHPUnit_Util_XML::load($actual, $isHtml);
         $tags    = PHPUnit_Util_XML::findNodes($dom, $matcher, $isHtml);
@@ -2102,15 +2134,15 @@ public static function assertTag($matcher, $actual, $message = '', $isHtml = TRU
      * Rather than asserting that $matcher results in a match, it asserts that
      * $matcher does not match.
      *
-     * @param  array   $matcher
-     * @param  string  $actual
-     * @param  string  $message
-     * @param  boolean $isHtml
+     * @param array   $matcher
+     * @param string  $actual
+     * @param string  $message
+     * @param boolean $isHtml
      * @since  Method available since Release 3.3.0
      * @author Mike Naberezny <mike@maintainable.com>
      * @author Derek DeVries <derek@maintainable.com>
      */
-    public static function assertNotTag($matcher, $actual, $message = '', $isHtml = TRUE)
+    public static function assertNotTag($matcher, $actual, $message = '', $isHtml = true)
     {
         $dom     = PHPUnit_Util_XML::load($actual, $isHtml);
         $tags    = PHPUnit_Util_XML::findNodes($dom, $matcher, $isHtml);
@@ -2122,9 +2154,9 @@ public static function assertNotTag($matcher, $actual, $message = '', $isHtml =
     /**
      * Evaluates a PHPUnit_Framework_Constraint matcher object.
      *
-     * @param  mixed                        $value
-     * @param  PHPUnit_Framework_Constraint $constraint
-     * @param  string                       $message
+     * @param mixed                        $value
+     * @param PHPUnit_Framework_Constraint $constraint
+     * @param string                       $message
      * @since  Method available since Release 3.0.0
      */
     public static function assertThat($value, PHPUnit_Framework_Constraint $constraint, $message = '')
@@ -2137,17 +2169,17 @@ public static function assertThat($value, PHPUnit_Framework_Constraint $constrai
     /**
      * Asserts that a string is a valid JSON string.
      *
-     * @param  string $filename
-     * @param  string $message
+     * @param string $actualJson
+     * @param string $message
      * @since  Method available since Release 3.7.20
      */
-    public static function assertJson($expectedJson, $message = '')
+    public static function assertJson($actualJson, $message = '')
     {
-        if (!is_string($expectedJson)) {
+        if (!is_string($actualJson)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
         }
 
-        self::assertThat($expectedJson, self::isJson(), $message);
+        self::assertThat($actualJson, self::isJson(), $message);
     }
 
     /**
@@ -2165,7 +2197,7 @@ public static function assertJsonStringEqualsJsonString($expectedJson, $actualJs
         $expected = json_decode($expectedJson);
         $actual   = json_decode($actualJson);
 
-        return self::assertEquals($expected, $actual, $message);
+        self::assertEquals($expected, $actual, $message);
     }
 
     /**
@@ -2235,9 +2267,9 @@ public static function assertJsonStringNotEqualsJsonFile($expectedFile, $actualJ
     /**
      * Asserts that two JSON files are not equal.
      *
-     * @param  string $expectedFile
-     * @param  string $actualFile
-     * @param  string $message
+     * @param string $expectedFile
+     * @param string $actualFile
+     * @param string $message
      */
     public static function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFile, $message = '')
     {
@@ -2264,9 +2296,9 @@ public static function assertJsonFileNotEqualsJsonFile($expectedFile, $actualFil
     /**
      * Asserts that two JSON files are equal.
      *
-     * @param  string $expectedFile
-     * @param  string $actualFile
-     * @param  string $message
+     * @param string $expectedFile
+     * @param string $actualFile
+     * @param string $message
      */
     public static function assertJsonFileEqualsJsonFile($expectedFile, $actualFile, $message = '')
     {
@@ -2325,7 +2357,7 @@ public static function logicalOr()
     /**
      * Returns a PHPUnit_Framework_Constraint_Not matcher object.
      *
-     * @param  PHPUnit_Framework_Constraint $constraint
+     * @param  PHPUnit_Framework_Constraint     $constraint
      * @return PHPUnit_Framework_Constraint_Not
      * @since  Method available since Release 3.0.0
      */
@@ -2375,7 +2407,7 @@ public static function isTrue()
     /**
      * Returns a PHPUnit_Framework_Constraint_Callback matcher object.
      *
-     * @param callable $callback
+     * @param  callable                              $callback
      * @return PHPUnit_Framework_Constraint_Callback
      */
     public static function callback($callback)
@@ -2419,8 +2451,8 @@ public static function isNull()
     /**
      * Returns a PHPUnit_Framework_Constraint_Attribute matcher object.
      *
-     * @param  PHPUnit_Framework_Constraint $constraint
-     * @param  string                       $attributeName
+     * @param  PHPUnit_Framework_Constraint           $constraint
+     * @param  string                                 $attributeName
      * @return PHPUnit_Framework_Constraint_Attribute
      * @since  Method available since Release 3.1.0
      */
@@ -2435,21 +2467,22 @@ public static function attribute(PHPUnit_Framework_Constraint $constraint, $attr
      * Returns a PHPUnit_Framework_Constraint_TraversableContains matcher
      * object.
      *
-     * @param  mixed   $value
-     * @param  boolean $checkForObjectIdentity
+     * @param  mixed                                            $value
+     * @param  boolean                                          $checkForObjectIdentity
+     * @param  boolean                                          $checkForNonObjectIdentity
      * @return PHPUnit_Framework_Constraint_TraversableContains
      * @since  Method available since Release 3.0.0
      */
-    public static function contains($value, $checkForObjectIdentity = TRUE)
+    public static function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
     {
-        return new PHPUnit_Framework_Constraint_TraversableContains($value, $checkForObjectIdentity);
+        return new PHPUnit_Framework_Constraint_TraversableContains($value, $checkForObjectIdentity, $checkForNonObjectIdentity);
     }
 
     /**
      * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
      * object.
      *
-     * @param  string $type
+     * @param  string                                               $type
      * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
      * @since  Method available since Release 3.1.4
      */
@@ -2462,18 +2495,18 @@ public static function containsOnly($type)
      * Returns a PHPUnit_Framework_Constraint_TraversableContainsOnly matcher
      * object.
      *
-     * @param string $classname
+     * @param  string                                               $classname
      * @return PHPUnit_Framework_Constraint_TraversableContainsOnly
      */
     public static function containsOnlyInstancesOf($classname)
     {
-        return new PHPUnit_Framework_Constraint_TraversableContainsOnly($classname, FALSE);
+        return new PHPUnit_Framework_Constraint_TraversableContainsOnly($classname, false);
     }
 
     /**
      * Returns a PHPUnit_Framework_Constraint_ArrayHasKey matcher object.
      *
-     * @param  mixed $key
+     * @param  mixed                                    $key
      * @return PHPUnit_Framework_Constraint_ArrayHasKey
      * @since  Method available since Release 3.0.0
      */
@@ -2485,15 +2518,15 @@ public static function arrayHasKey($key)
     /**
      * Returns a PHPUnit_Framework_Constraint_IsEqual matcher object.
      *
-     * @param  mixed   $value
-     * @param  float   $delta
-     * @param  integer $maxDepth
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param  mixed                                $value
+     * @param  float                                $delta
+     * @param  integer                              $maxDepth
+     * @param  boolean                              $canonicalize
+     * @param  boolean                              $ignoreCase
      * @return PHPUnit_Framework_Constraint_IsEqual
      * @since  Method available since Release 3.0.0
      */
-    public static function equalTo($value, $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
     {
         return new PHPUnit_Framework_Constraint_IsEqual(
           $value, $delta, $maxDepth, $canonicalize, $ignoreCase
@@ -2505,16 +2538,16 @@ public static function equalTo($value, $delta = 0, $maxDepth = 10, $canonicalize
      * that is wrapped in a PHPUnit_Framework_Constraint_Attribute matcher
      * object.
      *
-     * @param  string  $attributeName
-     * @param  mixed   $value
-     * @param  float   $delta
-     * @param  integer $maxDepth
-     * @param  boolean $canonicalize
-     * @param  boolean $ignoreCase
+     * @param  string                                 $attributeName
+     * @param  mixed                                  $value
+     * @param  float                                  $delta
+     * @param  integer                                $maxDepth
+     * @param  boolean                                $canonicalize
+     * @param  boolean                                $ignoreCase
      * @return PHPUnit_Framework_Constraint_Attribute
      * @since  Method available since Release 3.1.0
      */
-    public static function attributeEqualTo($attributeName, $value, $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public static function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
     {
         return self::attribute(
           self::equalTo(
@@ -2549,7 +2582,7 @@ public static function fileExists()
     /**
      * Returns a PHPUnit_Framework_Constraint_GreaterThan matcher object.
      *
-     * @param  mixed $value
+     * @param  mixed                                    $value
      * @return PHPUnit_Framework_Constraint_GreaterThan
      * @since  Method available since Release 3.0.0
      */
@@ -2563,7 +2596,7 @@ public static function greaterThan($value)
      * a PHPUnit_Framework_Constraint_IsEqual and a
      * PHPUnit_Framework_Constraint_GreaterThan matcher object.
      *
-     * @param  mixed $value
+     * @param  mixed                           $value
      * @return PHPUnit_Framework_Constraint_Or
      * @since  Method available since Release 3.1.0
      */
@@ -2578,7 +2611,7 @@ public static function greaterThanOrEqual($value)
     /**
      * Returns a PHPUnit_Framework_Constraint_ClassHasAttribute matcher object.
      *
-     * @param  string $attributeName
+     * @param  string                                         $attributeName
      * @return PHPUnit_Framework_Constraint_ClassHasAttribute
      * @since  Method available since Release 3.1.0
      */
@@ -2593,7 +2626,7 @@ public static function classHasAttribute($attributeName)
      * Returns a PHPUnit_Framework_Constraint_ClassHasStaticAttribute matcher
      * object.
      *
-     * @param  string $attributeName
+     * @param  string                                               $attributeName
      * @return PHPUnit_Framework_Constraint_ClassHasStaticAttribute
      * @since  Method available since Release 3.1.0
      */
@@ -2607,7 +2640,7 @@ public static function classHasStaticAttribute($attributeName)
     /**
      * Returns a PHPUnit_Framework_Constraint_ObjectHasAttribute matcher object.
      *
-     * @param  string $attributeName
+     * @param  string                                          $attributeName
      * @return PHPUnit_Framework_Constraint_ObjectHasAttribute
      * @since  Method available since Release 3.0.0
      */
@@ -2621,7 +2654,7 @@ public static function objectHasAttribute($attributeName)
     /**
      * Returns a PHPUnit_Framework_Constraint_IsIdentical matcher object.
      *
-     * @param  mixed $value
+     * @param  mixed                                    $value
      * @return PHPUnit_Framework_Constraint_IsIdentical
      * @since  Method available since Release 3.0.0
      */
@@ -2633,7 +2666,7 @@ public static function identicalTo($value)
     /**
      * Returns a PHPUnit_Framework_Constraint_IsInstanceOf matcher object.
      *
-     * @param  string $className
+     * @param  string                                    $className
      * @return PHPUnit_Framework_Constraint_IsInstanceOf
      * @since  Method available since Release 3.0.0
      */
@@ -2645,7 +2678,7 @@ public static function isInstanceOf($className)
     /**
      * Returns a PHPUnit_Framework_Constraint_IsType matcher object.
      *
-     * @param  string $type
+     * @param  string                              $type
      * @return PHPUnit_Framework_Constraint_IsType
      * @since  Method available since Release 3.0.0
      */
@@ -2657,7 +2690,7 @@ public static function isType($type)
     /**
      * Returns a PHPUnit_Framework_Constraint_LessThan matcher object.
      *
-     * @param  mixed $value
+     * @param  mixed                                 $value
      * @return PHPUnit_Framework_Constraint_LessThan
      * @since  Method available since Release 3.0.0
      */
@@ -2671,7 +2704,7 @@ public static function lessThan($value)
      * a PHPUnit_Framework_Constraint_IsEqual and a
      * PHPUnit_Framework_Constraint_LessThan matcher object.
      *
-     * @param  mixed $value
+     * @param  mixed                           $value
      * @return PHPUnit_Framework_Constraint_Or
      * @since  Method available since Release 3.1.0
      */
@@ -2686,7 +2719,7 @@ public static function lessThanOrEqual($value)
     /**
      * Returns a PHPUnit_Framework_Constraint_PCREMatch matcher object.
      *
-     * @param  string $pattern
+     * @param  string                                 $pattern
      * @return PHPUnit_Framework_Constraint_PCREMatch
      * @since  Method available since Release 3.0.0
      */
@@ -2698,7 +2731,7 @@ public static function matchesRegularExpression($pattern)
     /**
      * Returns a PHPUnit_Framework_Constraint_StringMatches matcher object.
      *
-     * @param  string $string
+     * @param  string                                     $string
      * @return PHPUnit_Framework_Constraint_StringMatches
      * @since  Method available since Release 3.5.0
      */
@@ -2710,7 +2743,7 @@ public static function matches($string)
     /**
      * Returns a PHPUnit_Framework_Constraint_StringStartsWith matcher object.
      *
-     * @param  mixed $prefix
+     * @param  mixed                                         $prefix
      * @return PHPUnit_Framework_Constraint_StringStartsWith
      * @since  Method available since Release 3.4.0
      */
@@ -2722,12 +2755,12 @@ public static function stringStartsWith($prefix)
     /**
      * Returns a PHPUnit_Framework_Constraint_StringContains matcher object.
      *
-     * @param  string  $string
-     * @param  boolean $case
+     * @param  string                                      $string
+     * @param  boolean                                     $case
      * @return PHPUnit_Framework_Constraint_StringContains
      * @since  Method available since Release 3.0.0
      */
-    public static function stringContains($string, $case = TRUE)
+    public static function stringContains($string, $case = true)
     {
         return new PHPUnit_Framework_Constraint_StringContains($string, $case);
     }
@@ -2735,7 +2768,7 @@ public static function stringContains($string, $case = TRUE)
     /**
      * Returns a PHPUnit_Framework_Constraint_StringEndsWith matcher object.
      *
-     * @param  mixed $suffix
+     * @param  mixed                                       $suffix
      * @return PHPUnit_Framework_Constraint_StringEndsWith
      * @since  Method available since Release 3.4.0
      */
@@ -2744,10 +2777,20 @@ public static function stringEndsWith($suffix)
         return new PHPUnit_Framework_Constraint_StringEndsWith($suffix);
     }
 
+    /**
+     * Returns a PHPUnit_Framework_Constraint_Count matcher object.
+     *
+     * @param  int                                $count
+     * @return PHPUnit_Framework_Constraint_Count
+     */
+    public static function countOf($count)
+    {
+        return new PHPUnit_Framework_Constraint_Count($count);
+    }
     /**
      * Fails a test with the given message.
      *
-     * @param  string $message
+     * @param  string                                 $message
      * @throws PHPUnit_Framework_AssertionFailedError
      */
     public static function fail($message = '')
@@ -2759,8 +2802,8 @@ public static function fail($message = '')
      * Returns the value of an attribute of a class or an object.
      * This also works for attributes that are declared protected or private.
      *
-     * @param  mixed   $classOrObject
-     * @param  string  $attributeName
+     * @param  mixed                       $classOrObject
+     * @param  string                      $attributeName
      * @return mixed
      * @throws PHPUnit_Framework_Exception
      */
@@ -2770,6 +2813,10 @@ public static function readAttribute($classOrObject, $attributeName)
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
         }
 
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
+        }
+
         if (is_string($classOrObject)) {
             if (!class_exists($classOrObject)) {
                 throw PHPUnit_Util_InvalidArgumentHelper::factory(
@@ -2777,30 +2824,132 @@ public static function readAttribute($classOrObject, $attributeName)
                 );
             }
 
-            return PHPUnit_Util_Class::getStaticAttribute(
+            return self::getStaticAttribute(
               $classOrObject,
               $attributeName
             );
-        }
-
-        else if (is_object($classOrObject)) {
-            return PHPUnit_Util_Class::getObjectAttribute(
+        } elseif (is_object($classOrObject)) {
+            return self::getObjectAttribute(
               $classOrObject,
               $attributeName
             );
-        }
-
-        else {
+        } else {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(
               1, 'class name or object'
             );
         }
     }
 
+    /**
+     * Returns the value of a static attribute.
+     * This also works for attributes that are declared protected or private.
+     *
+     * @param  string                      $className
+     * @param  string                      $attributeName
+     * @return mixed
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getStaticAttribute($className, $attributeName)
+    {
+        if (!is_string($className)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        if (!class_exists($className)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'class name');
+        }
+
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
+        }
+
+        $class = new ReflectionClass($className);
+
+        while ($class) {
+            $attributes = $class->getStaticProperties();
+
+            if (array_key_exists($attributeName, $attributes)) {
+                return $attributes[$attributeName];
+            }
+
+            $class = $class->getParentClass();
+        }
+
+        throw new PHPUnit_Framework_Exception(
+          sprintf(
+            'Attribute "%s" not found in class.',
+            $attributeName
+          )
+        );
+    }
+
+    /**
+     * Returns the value of an object's attribute.
+     * This also works for attributes that are declared protected or private.
+     *
+     * @param  object                      $object
+     * @param  string                      $attributeName
+     * @return mixed
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getObjectAttribute($object, $attributeName)
+    {
+        if (!is_object($object)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'object');
+        }
+
+        if (!is_string($attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'string');
+        }
+
+        if (!preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $attributeName)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'valid attribute name');
+        }
+
+        try {
+            $attribute = new ReflectionProperty($object, $attributeName);
+        } catch (ReflectionException $e) {
+            $reflector = new ReflectionObject($object);
+
+            while ($reflector = $reflector->getParentClass()) {
+                try {
+                    $attribute = $reflector->getProperty($attributeName);
+                    break;
+                } catch (ReflectionException $e) {
+                }
+            }
+        }
+
+        if (isset($attribute)) {
+            if (!$attribute || $attribute->isPublic()) {
+                return $object->$attributeName;
+            }
+
+            $attribute->setAccessible(true);
+            $value = $attribute->getValue($object);
+            $attribute->setAccessible(false);
+
+            return $value;
+        }
+
+        throw new PHPUnit_Framework_Exception(
+          sprintf(
+            'Attribute "%s" not found in object.',
+            $attributeName
+          )
+        );
+    }
+
     /**
      * Mark the test as incomplete.
      *
-     * @param  string  $message
+     * @param  string                                $message
      * @throws PHPUnit_Framework_IncompleteTestError
      * @since  Method available since Release 3.0.0
      */
@@ -2812,7 +2961,7 @@ public static function markTestIncomplete($message = '')
     /**
      * Mark the test as skipped.
      *
-     * @param  string  $message
+     * @param  string                             $message
      * @throws PHPUnit_Framework_SkippedTestError
      * @since  Method available since Release 3.0.0
      */
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert/Functions.php b/core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
similarity index 94%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert/Functions.php
rename to core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
index 27d13b59464d94fada7ed8941d013391ddb8eaaa..041ce201b5850a7b9a1af74bcd31845e2e5c2bb3 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert/Functions.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Assert/Functions.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.5.0
@@ -129,9 +129,10 @@ function assertArrayNotHasKey($key, $array, $message = '')
  * @param  string  $message
  * @param  boolean $ignoreCase
  * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
  * @since  Method available since Release 3.0.0
  */
-function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = FALSE, $checkForObjectIdentity = TRUE)
+function assertAttributeContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertAttributeContains',
@@ -150,7 +151,7 @@ function assertAttributeContains($needle, $haystackAttributeName, $haystackClass
  * @param  string  $message
  * @since  Method available since Release 3.1.4
  */
-function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = NULL, $message = '')
+function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertAttributeContainsOnly',
@@ -159,7 +160,7 @@ function assertAttributeContainsOnly($type, $haystackAttributeName, $haystackCla
 }
 
 /**
- * Asserts the number of elements of an array, Countable or Iterator
+ * Asserts the number of elements of an array, Countable or Traversable
  * that is stored in an attribute.
  *
  * @param integer $expectedCount
@@ -205,7 +206,7 @@ function assertAttributeEmpty($haystackAttributeName, $haystackClassOrObject, $m
  * @param  boolean $canonicalize
  * @param  boolean $ignoreCase
  */
-function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+function assertAttributeEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertAttributeEquals',
@@ -325,9 +326,10 @@ function assertAttributeLessThanOrEqual($expected, $actualAttributeName, $actual
  * @param  string  $message
  * @param  boolean $ignoreCase
  * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
  * @since  Method available since Release 3.0.0
  */
-function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = FALSE, $checkForObjectIdentity = TRUE)
+function assertAttributeNotContains($needle, $haystackAttributeName, $haystackClassOrObject, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertAttributeNotContains',
@@ -347,7 +349,7 @@ function assertAttributeNotContains($needle, $haystackAttributeName, $haystackCl
  * @param  string  $message
  * @since  Method available since Release 3.1.4
  */
-function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = NULL, $message = '')
+function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystackClassOrObject, $isNativeType = null, $message = '')
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertAttributeNotContainsOnly',
@@ -356,7 +358,7 @@ function assertAttributeNotContainsOnly($type, $haystackAttributeName, $haystack
 }
 
 /**
- * Asserts the number of elements of an array, Countable or Iterator
+ * Asserts the number of elements of an array, Countable or Traversable
  * that is stored in an attribute.
  *
  * @param integer $expectedCount
@@ -402,7 +404,7 @@ function assertAttributeNotEmpty($haystackAttributeName, $haystackClassOrObject,
  * @param  boolean $canonicalize
  * @param  boolean $ignoreCase
  */
-function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+function assertAttributeNotEquals($expected, $actualAttributeName, $actualClassOrObject, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertAttributeNotEquals',
@@ -550,9 +552,10 @@ function assertClassNotHasStaticAttribute($attributeName, $className, $message =
  * @param  string  $message
  * @param  boolean $ignoreCase
  * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
  * @since  Method available since Release 2.1.0
  */
-function assertContains($needle, $haystack, $message = '', $ignoreCase = FALSE, $checkForObjectIdentity = TRUE)
+function assertContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertContains',
@@ -569,7 +572,7 @@ function assertContains($needle, $haystack, $message = '', $ignoreCase = FALSE,
  * @param  string  $message
  * @since  Method available since Release 3.1.4
  */
-function assertContainsOnly($type, $haystack, $isNativeType = NULL, $message = '')
+function assertContainsOnly($type, $haystack, $isNativeType = null, $message = '')
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertContainsOnly',
@@ -593,7 +596,7 @@ function assertContainsOnlyInstancesOf($classname, $haystack, $message = '')
 }
 
 /**
- * Asserts the number of elements of an array, Countable or Iterator.
+ * Asserts the number of elements of an array, Countable or Traversable.
  *
  * @param integer $expectedCount
  * @param mixed   $haystack
@@ -632,7 +635,7 @@ function assertEmpty($actual, $message = '')
  * @author Mattis Stordalen Flister <mattis@xait.no>
  * @since  Method available since Release 3.3.0
  */
-function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = FALSE, $message = '')
+function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actualElement, $checkAttributes = false, $message = '')
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertEqualXMLStructure',
@@ -651,7 +654,7 @@ function assertEqualXMLStructure(DOMElement $expectedElement, DOMElement $actual
  * @param  boolean $canonicalize
  * @param  boolean $ignoreCase
  */
-function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+function assertEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertEquals',
@@ -659,6 +662,21 @@ function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth =
     );
 }
 
+/**
+ * Asserts that a condition is not true.
+ *
+ * @param  boolean  $condition
+ * @param  string   $message
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+function assertNotTrue($condition, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotTrue',
+      func_get_args()
+    );
+}
+
 /**
  * Asserts that a condition is false.
  *
@@ -685,7 +703,7 @@ function assertFalse($condition, $message = '')
  * @param  boolean $ignoreCase
  * @since  Method available since Release 3.2.14
  */
-function assertFileEquals($expected, $actual, $message = '', $canonicalize = FALSE, $ignoreCase = FALSE)
+function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertFileEquals',
@@ -719,7 +737,7 @@ function assertFileExists($filename, $message = '')
  * @param  boolean $ignoreCase
  * @since  Method available since Release 3.2.14
  */
-function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = FALSE, $ignoreCase = FALSE)
+function assertFileNotEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertFileNotEquals',
@@ -951,9 +969,10 @@ function assertLessThanOrEqual($expected, $actual, $message = '')
  * @param  string  $message
  * @param  boolean $ignoreCase
  * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
  * @since  Method available since Release 2.1.0
  */
-function assertNotContains($needle, $haystack, $message = '', $ignoreCase = FALSE, $checkForObjectIdentity = TRUE)
+function assertNotContains($needle, $haystack, $message = '', $ignoreCase = false, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertNotContains',
@@ -970,7 +989,7 @@ function assertNotContains($needle, $haystack, $message = '', $ignoreCase = FALS
  * @param  string  $message
  * @since  Method available since Release 3.1.4
  */
-function assertNotContainsOnly($type, $haystack, $isNativeType = NULL, $message = '')
+function assertNotContainsOnly($type, $haystack, $isNativeType = null, $message = '')
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertNotContainsOnly',
@@ -979,7 +998,7 @@ function assertNotContainsOnly($type, $haystack, $isNativeType = NULL, $message
 }
 
 /**
- * Asserts the number of elements of an array, Countable or Iterator.
+ * Asserts the number of elements of an array, Countable or Traversable.
  *
  * @param integer $expectedCount
  * @param mixed   $haystack
@@ -1020,7 +1039,7 @@ function assertNotEmpty($actual, $message = '')
  * @param  boolean $ignoreCase
  * @since  Method available since Release 2.3.0
  */
-function assertNotEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+function assertNotEquals($expected, $actual, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertNotEquals',
@@ -1061,7 +1080,22 @@ function assertNotInternalType($expected, $actual, $message = '')
 }
 
 /**
- * Asserts that a variable is not NULL.
+ * Asserts that a condition is not false.
+ *
+ * @param  boolean  $condition
+ * @param  string   $message
+ * @throws PHPUnit_Framework_AssertionFailedError
+ */
+function assertNotFalse($condition, $message = '')
+{
+    return call_user_func_array(
+      'PHPUnit_Framework_Assert::assertNotFalse',
+      func_get_args()
+    );
+}
+
+/**
+ * Asserts that a variable is not null.
  *
  * @param  mixed  $actual
  * @param  string $message
@@ -1108,11 +1142,11 @@ function assertNotSame($expected, $actual, $message = '')
 }
 
 /**
- * Assert that the size of two arrays (or `Countable` or `Iterator` objects)
+ * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
  * is not the same.
  *
- * @param array|Countable|Iterator $expected
- * @param array|Countable|Iterator $actual
+ * @param array|Countable|Traversable $expected
+ * @param array|Countable|Traversable $actual
  * @param string $message
  */
 function assertNotSameSize($expected, $actual, $message = '')
@@ -1137,7 +1171,7 @@ function assertNotSameSize($expected, $actual, $message = '')
  * @author Mike Naberezny <mike@maintainable.com>
  * @author Derek DeVries <derek@maintainable.com>
  */
-function assertNotTag($matcher, $actual, $message = '', $isHtml = TRUE)
+function assertNotTag($matcher, $actual, $message = '', $isHtml = true)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertNotTag',
@@ -1146,7 +1180,7 @@ function assertNotTag($matcher, $actual, $message = '', $isHtml = TRUE)
 }
 
 /**
- * Asserts that a variable is NULL.
+ * Asserts that a variable is null.
  *
  * @param  mixed  $actual
  * @param  string $message
@@ -1224,11 +1258,11 @@ function assertSame($expected, $actual, $message = '')
 }
 
 /**
- * Assert that the size of two arrays (or `Countable` or `Iterator` objects)
+ * Assert that the size of two arrays (or `Countable` or `Traversable` objects)
  * is the same.
  *
- * @param array|Countable|Iterator $expected
- * @param array|Countable|Iterator $actual
+ * @param array|Countable|Traversable $expected
+ * @param array|Countable|Traversable $actual
  * @param string $message
  */
 function assertSameSize($expected, $actual, $message = '')
@@ -1248,7 +1282,7 @@ function assertSameSize($expected, $actual, $message = '')
  *
  * The second argument, $count, can be either boolean or numeric.
  * When boolean, it asserts for presence of elements matching the selector
- * (TRUE) or absence of elements (FALSE).
+ * (true) or absence of elements (false).
  * When numeric, it asserts the count of elements.
  *
  * assertSelectCount("#binder", true, $xml);  // any?
@@ -1263,7 +1297,7 @@ function assertSameSize($expected, $actual, $message = '')
  * @author Mike Naberezny <mike@maintainable.com>
  * @author Derek DeVries <derek@maintainable.com>
  */
-function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = TRUE)
+function assertSelectCount($selector, $count, $actual, $message = '', $isHtml = true)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertSelectCount',
@@ -1285,7 +1319,7 @@ function assertSelectCount($selector, $count, $actual, $message = '', $isHtml =
  * @author Mike Naberezny <mike@maintainable.com>
  * @author Derek DeVries <derek@maintainable.com>
  */
-function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = TRUE)
+function assertSelectEquals($selector, $content, $count, $actual, $message = '', $isHtml = true)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertSelectEquals',
@@ -1307,7 +1341,7 @@ function assertSelectEquals($selector, $content, $count, $actual, $message = '',
  * @author Mike Naberezny <mike@maintainable.com>
  * @author Derek DeVries <derek@maintainable.com>
  */
-function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = TRUE)
+function assertSelectRegExp($selector, $pattern, $count, $actual, $message = '', $isHtml = true)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertSelectRegExp',
@@ -1358,7 +1392,7 @@ function assertStringEndsWith($suffix, $string, $message = '')
  * @param  boolean $ignoreCase
  * @since  Method available since Release 3.3.0
  */
-function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = FALSE, $ignoreCase = FALSE)
+function assertStringEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertStringEqualsFile',
@@ -1409,7 +1443,7 @@ function assertStringMatchesFormatFile($formatFile, $string, $message = '')
  * @param  boolean $ignoreCase
  * @since  Method available since Release 3.3.0
  */
-function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = FALSE, $ignoreCase = FALSE)
+function assertStringNotEqualsFile($expectedFile, $actualString, $message = '', $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertStringNotEqualsFile',
@@ -1488,13 +1522,13 @@ function assertStringStartsWith($prefix, $string, $message = '')
  * match criteria for the assertion:
  *
  *  - `id`   : the node with the given id attribute must match the
- * corresponsing value.
+ * corresponding value.
  *  - `tag`  : the node type must match the corresponding value.
- *  - `attributes`   : a hash. The node's attributres must match the
- * corresponsing values in the hash.
+ *  - `attributes`   : a hash. The node's attributes must match the
+ * corresponding values in the hash.
  *  - `content`  : The text content must match the given value.
  *  - `parent`   : a hash. The node's parent must match the
- * corresponsing hash.
+ * corresponding hash.
  *  - `child`: a hash. At least one of the node's immediate children
  * must meet the criteria described by the hash.
  *  - `ancestor` : a hash. At least one of the node's ancestors must
@@ -1596,7 +1630,7 @@ function assertStringStartsWith($prefix, $string, $message = '')
  * $this->assertTag($matcher, $html);
  *
  * // Use assertTag() to apply a $matcher to a piece of $xml.
- * $this->assertTag($matcher, $xml, '', FALSE);
+ * $this->assertTag($matcher, $xml, '', false);
  * </code>
  *
  * The second argument ($actual) is a string containing either HTML or
@@ -1607,7 +1641,7 @@ function assertStringStartsWith($prefix, $string, $message = '')
  *
  * The fourth argument ($html) is an optional flag specifying whether
  * to load the $actual string into a DOMDocument using the HTML or
- * XML load strategy.  It is TRUE by default, which assumes the HTML
+ * XML load strategy.  It is true by default, which assumes the HTML
  * load strategy.  In many cases, this will be acceptable for XML as well.
  *
  * @param  array   $matcher
@@ -1618,7 +1652,7 @@ function assertStringStartsWith($prefix, $string, $message = '')
  * @author Mike Naberezny <mike@maintainable.com>
  * @author Derek DeVries <derek@maintainable.com>
  */
-function assertTag($matcher, $actual, $message = '', $isHtml = TRUE)
+function assertTag($matcher, $actual, $message = '', $isHtml = true)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::assertTag',
@@ -1814,7 +1848,7 @@ function attribute(PHPUnit_Framework_Constraint $constraint, $attributeName)
  * @return PHPUnit_Framework_Constraint_Attribute
  * @since  Method available since Release 3.1.0
  */
-function attributeEqualTo($attributeName, $value, $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+function attributeEqualTo($attributeName, $value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::attributeEqualTo',
@@ -1873,10 +1907,11 @@ function classHasStaticAttribute($attributeName)
  *
  * @param  mixed   $value
  * @param  boolean $checkForObjectIdentity
+ * @param  boolean $checkForNonObjectIdentity
  * @return PHPUnit_Framework_Constraint_TraversableContains
  * @since  Method available since Release 3.0.0
  */
-function contains($value, $checkForObjectIdentity = TRUE)
+function contains($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::contains',
@@ -1926,7 +1961,7 @@ function containsOnlyInstancesOf($classname)
  * @return PHPUnit_Framework_Constraint_IsEqual
  * @since  Method available since Release 3.0.0
  */
-function equalTo($value, $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+function equalTo($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::equalTo',
@@ -2261,8 +2296,6 @@ function objectHasAttribute($attributeName)
 }
 
 /**
- *
- *
  * @param  mixed $value, ...
  * @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
  * @since  Method available since Release 3.0.0
@@ -2374,7 +2407,7 @@ function returnValueMap(array $valueMap)
  * @return PHPUnit_Framework_Constraint_StringContains
  * @since  Method available since Release 3.0.0
  */
-function stringContains($string, $case = TRUE)
+function stringContains($string, $case = true)
 {
     return call_user_func_array(
       'PHPUnit_Framework_Assert::stringContains',
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/AssertionFailedError.php b/core/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/AssertionFailedError.php
rename to core/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
index 77728e029e78403e53c7fa79f2d94ef3c4145821..27ca6c925805b27b4959865ea616535749aeb252 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/AssertionFailedError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/AssertionFailedError.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php b/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
new file mode 100644
index 0000000000000000000000000000000000000000..c787d6d1c6c7d11e6deff4044429c0fdc6bf6676
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/BaseTestListener.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Giorgio Sironi <info@giorgiosironi.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * An empty Listener that can be extended to implement TestListener
+ * with just a few lines of code.
+ * @see PHPUnit_Framework_TestListener for documentation on the API methods.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Giorgio Sironi<info@giorgiosironi.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+abstract class PHPUnit_Framework_BaseTestListener implements PHPUnit_Framework_TestListener
+{
+    public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+    public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {}
+
+    public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+    public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+    public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {}
+
+    public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {}
+
+    public function startTest(PHPUnit_Framework_Test $test) {}
+
+    public function endTest(PHPUnit_Framework_Test $test, $time) {}
+}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php b/core/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
new file mode 100644
index 0000000000000000000000000000000000000000..eee14645bece91c4404462ccb0e272caacd8c5ec
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/CodeCoverageException.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_CodeCoverageException extends PHPUnit_Framework_Exception
+{
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint.php
index ab239b1090755d6bf08b40e9264a4b3bd6b32e6b..8e9a888e0553e7adcc9fd5227d6c38c54e877390 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,12 +38,14 @@
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
  */
 
+use SebastianBergmann\Exporter\Exporter;
+
 /**
  * Abstract base class for constraints. which are placed upon any value.
  *
@@ -51,36 +53,42 @@
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Interface available since Release 3.0.0
  */
 abstract class PHPUnit_Framework_Constraint implements Countable, PHPUnit_Framework_SelfDescribing
 {
+    protected $exporter;
+
+    public function __construct()
+    {
+        $this->exporter = new Exporter;
+    }
 
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
-        $success = FALSE;
+        $success = false;
 
         if ($this->matches($other)) {
-            $success = TRUE;
+            $success = true;
         }
 
         if ($returnResult) {
@@ -93,17 +101,17 @@ public function evaluate($other, $description = '', $returnResult = FALSE)
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
      * This method can be overridden to implement the evaluation algorithm.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
-        return FALSE;
+        return false;
     }
 
     /**
@@ -122,10 +130,10 @@ public function count()
      *
      * @param  mixed $other Evaluated value or object.
      * @param  string $description Additional information about the test
-     * @param  PHPUnit_Framework_ComparisonFailure $comparisonFailure
+     * @param  SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    protected function fail($other, $description, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL)
+    protected function fail($other, $description, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null)
     {
         $failureDescription = sprintf(
           'Failed asserting that %s.',
@@ -133,6 +141,7 @@ protected function fail($other, $description, PHPUnit_Framework_ComparisonFailur
         );
 
         $additionalFailureDescription = $this->additionalFailureDescription($other);
+
         if ($additionalFailureDescription) {
             $failureDescription .= "\n" . $additionalFailureDescription;
         }
@@ -153,12 +162,12 @@ protected function fail($other, $description, PHPUnit_Framework_ComparisonFailur
      * The function can be overridden to provide additional failure
      * information like a diff
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function additionalFailureDescription($other)
     {
-        return "";
+        return '';
     }
 
     /**
@@ -170,11 +179,11 @@ protected function additionalFailureDescription($other)
      * To provide additional failure information additionalFailureDescription
      * can be used.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
     {
-        return PHPUnit_Util_Type::export($other) . ' ' . $this->toString();
+        return $this->exporter->export($other) . ' ' . $this->toString();
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/And.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
similarity index 80%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/And.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
index 4948fe235698ff125e29658fd8adf98cd8025fc8..28ecc958e096c40429602be99e2bc9c3a5dd2968 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/And.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/And.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -66,7 +66,7 @@ class PHPUnit_Framework_Constraint_And extends PHPUnit_Framework_Constraint
     /**
      * @var PHPUnit_Framework_Constraint
      */
-    protected $lastConstraint = NULL;
+    protected $lastConstraint = null;
 
     /**
      * @param  PHPUnit_Framework_Constraint[] $constraints
@@ -76,7 +76,7 @@ public function setConstraints(array $constraints)
     {
         $this->constraints = array();
 
-        foreach ($constraints as $key => $constraint) {
+        foreach ($constraints as $constraint) {
             if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
                 throw new PHPUnit_Framework_Exception(
                   'All parameters to ' . __CLASS__ .
@@ -91,27 +91,27 @@ public function setConstraints(array $constraints)
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
-        $success = TRUE;
-        $constraint = NULL;
+        $success = true;
+        $constraint = null;
 
         foreach ($this->constraints as $constraint) {
-            if (!$constraint->evaluate($other, $description, TRUE)) {
-                $success = FALSE;
+            if (!$constraint->evaluate($other, $description, true)) {
+                $success = false;
                 break;
             }
         }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ArrayHasKey.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
similarity index 81%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ArrayHasKey.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
index e6f3faf15eeb24a5c047519280942c8c215e013e..56b5b3b3c484424a0addbed91db8de2462835944 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ArrayHasKey.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -48,7 +48,7 @@
  * Constraint that asserts that the array it is evaluated for has a given key.
  *
  * Uses array_key_exists() to check if the key is found in the input array, if
- * not found the evaluaton fails.
+ * not found the evaluation fails.
  *
  * The array key is passed in the constructor.
  *
@@ -56,7 +56,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -73,19 +73,28 @@ class PHPUnit_Framework_Constraint_ArrayHasKey extends PHPUnit_Framework_Constra
      */
     public function __construct($key)
     {
+        parent::__construct();
         $this->key = $key;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
-        return array_key_exists($this->key, $other);
+        if (is_array($other)) {
+            return array_key_exists($this->key, $other);
+        }
+
+        if ($other instanceof ArrayAccess) {
+            return $other->offsetExists($this->key);
+        }
+
+        return false;
     }
 
     /**
@@ -95,7 +104,7 @@ protected function matches($other)
      */
     public function toString()
     {
-        return 'has the key ' . PHPUnit_Util_Type::export($this->key);
+        return 'has the key ' . $this->exporter->export($this->key);
     }
 
     /**
@@ -104,7 +113,7 @@ public function toString()
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Attribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
similarity index 82%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Attribute.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
index fefcd2798f5e3b93a1933567d5952fcbafdd3e81..822ed1885f4ef7d163b55e671a94cea8a1a83768 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Attribute.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Attribute.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.1.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.1.0
@@ -78,20 +78,20 @@ public function __construct(PHPUnit_Framework_Constraint $constraint, $attribute
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
         return parent::evaluate(
           PHPUnit_Framework_Assert::readAttribute(
@@ -119,7 +119,7 @@ public function toString()
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Callback.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
similarity index 83%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Callback.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
index 57226ba0fb56e8f939c161b99d34c1b17d5a5c6e..e0f49760f573d47adf60e02cb061c89fdfc45249 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Callback.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Callback.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
@@ -49,7 +49,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Timon Rapp <timon@zaeda.net>
- * @copyright  2002-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  */
@@ -58,27 +58,27 @@ class PHPUnit_Framework_Constraint_Callback extends PHPUnit_Framework_Constraint
     private $callback;
 
     /**
-     * @param callable $callback
-     * @throws InvalidArgumentException
+     * @param  callable                    $callback
+     * @throws PHPUnit_Framework_Exception
      */
     public function __construct($callback)
     {
         if (!is_callable($callback)) {
-            throw new InvalidArgumentException(
-              sprintf(
-                'Specified callback <%s> is not callable.',
-                $this->callbackToString($callback)
-              )
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(
+                1, 'callable'
             );
         }
+
+        parent::__construct();
+
         $this->callback = $callback;
     }
 
     /**
-     * Evaluates the constraint for parameter $value. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $value. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $value Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -110,7 +110,7 @@ private function callbackToString($callback)
         if (is_object($callback[0])) {
             $callback[0] = get_class($callback[0]);
         }
+
         return $callback[0] . '::' . $callback[1];
     }
-
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasAttribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasAttribute.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
index 5fa5411c57320a016d0a6cc274091732f4e85123..5f387f56790838759c0d4c9c74235798eca95321 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasAttribute.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.1.0
@@ -54,7 +54,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.1.0
@@ -71,14 +71,15 @@ class PHPUnit_Framework_Constraint_ClassHasAttribute extends PHPUnit_Framework_C
      */
     public function __construct($attributeName)
     {
+        parent::__construct();
         $this->attributeName = $attributeName;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -108,7 +109,7 @@ public function toString()
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
index 2c57675760de18e279b999f20d48dcf9626e51cb..5aa0f8943e35ba6f8e63a76c306262a6f5e6154e 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.1.0
@@ -54,7 +54,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.1.0
@@ -62,10 +62,10 @@
 class PHPUnit_Framework_Constraint_ClassHasStaticAttribute extends PHPUnit_Framework_Constraint_ClassHasAttribute
 {
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -77,7 +77,7 @@ protected function matches($other)
 
             return $attribute->isStatic();
         } else {
-            return FALSE;
+            return false;
         }
     }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Composite.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
similarity index 79%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Composite.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
index d2fdac56e144b393e42871afadd99d75a62e5c0d..d0aaa37ad1d4ccd8594414945c14f62fdc6ff76f 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Composite.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Composite.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.0
@@ -68,26 +68,27 @@ abstract class PHPUnit_Framework_Constraint_Composite extends PHPUnit_Framework_
      */
     public function __construct(PHPUnit_Framework_Constraint $innerConstraint)
     {
+        parent::__construct();
         $this->innerConstraint = $innerConstraint;
     }
 
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
         try {
             return $this->innerConstraint->evaluate(
@@ -95,9 +96,7 @@ public function evaluate($other, $description = '', $returnResult = FALSE)
               $description,
               $returnResult
             );
-        }
-
-        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+        } catch (PHPUnit_Framework_ExpectationFailedException $e) {
             $this->fail($other, $description);
         }
     }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Count.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Count.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
index 5fde27cfe1a9b26cbc8eb92e0daa5fbb88e4b319..943c3cb7daa87e7e8fad6c1abfdc2d36a26f8c74 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Count.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Count.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.0
@@ -68,14 +68,15 @@ class PHPUnit_Framework_Constraint_Count extends PHPUnit_Framework_Constraint
      */
     public function __construct($expected)
     {
+        parent::__construct();
         $this->expectedCount = $expected;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other
+     * @param  mixed   $other
      * @return boolean
      */
     protected function matches($other)
@@ -84,7 +85,7 @@ protected function matches($other)
     }
 
     /**
-     * @param mixed $other
+     * @param  mixed   $other
      * @return boolean
      */
     protected function getCountOf($other)
@@ -93,19 +94,36 @@ protected function getCountOf($other)
             return count($other);
         }
 
-        else if ($other instanceof Iterator) {
-            return iterator_count($other);
+        else if ($other instanceof Traversable) {
+            if ($other instanceof IteratorAggregate) {
+                $iterator = $other->getIterator();
+            } else {
+                $iterator = $other;
+            }
+
+            $key = $iterator->key();
+            $count = iterator_count($iterator);
+
+            // manually rewind $iterator to previous key, since iterator_count
+            // moves pointer
+            if ($key !== null) {
+                $iterator->rewind();
+                while ($key !== $iterator->key()) {
+                    $iterator->next();
+                }
+            }
+
+            return $count;
         }
     }
 
-
     /**
      * Returns the description of the failure
      *
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Exception.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
similarity index 85%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Exception.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
index 2957f0ee60d8ea39776cdd9c09b63d782e69422d..dc6efdefccfff29f509ec1da4734917950954359 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Exception.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Exception.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.6
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.6
@@ -66,14 +66,15 @@ class PHPUnit_Framework_Constraint_Exception extends PHPUnit_Framework_Constrain
      */
     public function __construct($className)
     {
+        parent::__construct();
         $this->className = $className;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -87,16 +88,18 @@ protected function matches($other)
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
     {
-        if ($other !== NULL) {
+        if ($other !== null) {
             $message = '';
-            if ($other instanceof Exception && $other->getMessage()) {
-                $message = '. Message was: "' . $other->getMessage() . '"';
+            if ($other instanceof Exception) {
+                $message = '. Message was: "' . $other->getMessage() . '" at'
+                        . "\n" . $other->getTraceAsString();
             }
+
             return sprintf(
               'exception of type "%s" matches expected exception "%s"%s',
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionCode.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
similarity index 84%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionCode.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
index a588c4e14533b553b2bb8aef87ffb6d3dc7c0958..8a4e7cc0fee6f1167597dc1ce81433a5166030e9 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionCode.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.6
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.6
@@ -66,19 +66,20 @@ class PHPUnit_Framework_Constraint_ExceptionCode extends PHPUnit_Framework_Const
      */
     public function __construct($expected)
     {
+        parent::__construct();
         $this->expectedCode = $expected;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
      * @param  Exception $other
      * @return boolean
      */
     protected function matches($other)
     {
-        return (string)$other->getCode() == (string)$this->expectedCode;
+        return (string) $other->getCode() == (string) $this->expectedCode;
     }
 
     /**
@@ -87,15 +88,15 @@ protected function matches($other)
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
     {
         return sprintf(
           '%s is equal to expected exception code %s',
-          PHPUnit_Util_Type::export($other->getCode()),
-          PHPUnit_Util_Type::export($this->expectedCode)
+          $this->exporter->export($other->getCode()),
+          $this->exporter->export($this->expectedCode)
         );
     }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionMessage.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionMessage.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
index ec84bff1bc938ae46a02ab45a88027988e927df8..407a5f60a54761e07e33e698dfcc858d658d89f7 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ExceptionMessage.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.6
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.6
@@ -66,19 +66,20 @@ class PHPUnit_Framework_Constraint_ExceptionMessage extends PHPUnit_Framework_Co
      */
     public function __construct($expected)
     {
+        parent::__construct();
         $this->expectedMessage = $expected;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
      * @param  Exception $other
      * @return boolean
      */
     protected function matches($other)
     {
-        return strpos($other->getMessage(), $this->expectedMessage) !== FALSE;
+        return strpos($other->getMessage(), $this->expectedMessage) !== false;
     }
 
     /**
@@ -87,7 +88,7 @@ protected function matches($other)
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/FileExists.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/FileExists.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
index fc57f5c3c1e00ceea242ca16a1df7ba3b077d452..4e43e13daef1c4715d850dc602fd1524773b4aa0 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/FileExists.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/FileExists.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -53,7 +53,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -61,10 +61,10 @@
 class PHPUnit_Framework_Constraint_FileExists extends PHPUnit_Framework_Constraint
 {
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -78,7 +78,7 @@ protected function matches($other)
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/GreaterThan.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/GreaterThan.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
index 1842710f1d8853e7ee1f1a84ca1b65b3466b328c..628bf0b30c496f8914ec4b6831cb95d489094195 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/GreaterThan.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -52,7 +52,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -69,14 +69,15 @@ class PHPUnit_Framework_Constraint_GreaterThan extends PHPUnit_Framework_Constra
      */
     public function __construct($value)
     {
+        parent::__construct();
         $this->value = $value;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -91,6 +92,6 @@ protected function matches($other)
      */
     public function toString()
     {
-        return 'is greater than ' . PHPUnit_Util_Type::export($this->value);
+        return 'is greater than ' . $this->exporter->export($this->value);
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsAnything.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
similarity index 78%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsAnything.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
index 47ae576dc9231034c85023b2ea18bcbb615676ec..c7a65e643974f14e5e17c8fbd2b37123514772a5 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsAnything.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsAnything.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -61,22 +61,22 @@ class PHPUnit_Framework_Constraint_IsAnything extends PHPUnit_Framework_Constrai
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
-        return $returnResult ? TRUE : NULL;
+        return $returnResult ? true : null;
     }
 
     /**
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEmpty.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEmpty.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
index c03cc2457e0eef3cb52fca41000f0cb54a3e26b5..cbd9b860a4b0fc2d840416660e48a63376b343d5 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEmpty.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.5.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.5.0
@@ -59,14 +59,18 @@
 class PHPUnit_Framework_Constraint_IsEmpty extends PHPUnit_Framework_Constraint
 {
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
+        if ($other instanceof Countable) {
+            return count($other) === 0;
+        }
+
         return empty($other);
     }
 
@@ -86,7 +90,7 @@ public function toString()
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEqual.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
similarity index 75%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEqual.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
index 2b1c162250cf3150abd6ad26cc3c545b4038f2a5..cd7a0c0b59081bd647044981a95abe299b816d4a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsEqual.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsEqual.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
  * @author     Kore Nordmann <kn@ez.no>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -59,7 +59,7 @@
  * @author     Kore Nordmann <kn@ez.no>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -74,7 +74,7 @@ class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint
     /**
      * @var float
      */
-    protected $delta = 0;
+    protected $delta = 0.0;
 
     /**
      * @var integer
@@ -84,27 +84,30 @@ class PHPUnit_Framework_Constraint_IsEqual extends PHPUnit_Framework_Constraint
     /**
      * @var boolean
      */
-    protected $canonicalize = FALSE;
+    protected $canonicalize = false;
 
     /**
      * @var boolean
      */
-    protected $ignoreCase = FALSE;
+    protected $ignoreCase = false;
 
     /**
-     * @var PHPUnit_Framework_ComparisonFailure
+     * @var SebastianBergmann\Comparator\ComparisonFailure
      */
     protected $lastFailure;
 
     /**
-     * @param mixed   $value
-     * @param float   $delta
-     * @param integer $maxDepth
-     * @param boolean $canonicalize
-     * @param boolean $ignoreCase
+     * @param  mixed                       $value
+     * @param  float                       $delta
+     * @param  integer                     $maxDepth
+     * @param  boolean                     $canonicalize
+     * @param  boolean                     $ignoreCase
+     * @throws PHPUnit_Framework_Exception
      */
-    public function __construct($value, $delta = 0, $maxDepth = 10, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function __construct($value, $delta = 0.0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
     {
+        parent::__construct();
+
         if (!is_numeric($delta)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'numeric');
         }
@@ -131,22 +134,22 @@ public function __construct($value, $delta = 0, $maxDepth = 10, $canonicalize =
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
-        $comparatorFactory = PHPUnit_Framework_ComparatorFactory::getDefaultInstance();
+        $comparatorFactory = new SebastianBergmann\Comparator\Factory;
 
         try {
             $comparator = $comparatorFactory->getComparatorFor(
@@ -160,11 +163,9 @@ public function evaluate($other, $description = '', $returnResult = FALSE)
               $this->canonicalize,
               $this->ignoreCase
             );
-        }
-
-        catch (PHPUnit_Framework_ComparisonFailure $f) {
+        } catch (SebastianBergmann\Comparator\ComparisonFailure $f) {
             if ($returnResult) {
-                return FALSE;
+                return false;
             }
 
             throw new PHPUnit_Framework_ExpectationFailedException(
@@ -173,7 +174,7 @@ public function evaluate($other, $description = '', $returnResult = FALSE)
             );
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
@@ -186,7 +187,7 @@ public function toString()
         $delta = '';
 
         if (is_string($this->value)) {
-            if (strpos($this->value, "\n") !== FALSE) {
+            if (strpos($this->value, "\n") !== false) {
                 return 'is equal to <text>';
             } else {
                 return sprintf(
@@ -207,7 +208,7 @@ public function toString()
             return sprintf(
               'is equal to %s%s',
 
-              PHPUnit_Util_Type::export($this->value),
+              $this->exporter->export($this->value),
               $delta
             );
         }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsFalse.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsFalse.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
index 2a2b593435d290e0f85ef2e0a920bf52e3b91312..bd76c4523509a4e375192b2d6b41012ec421dd12 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsFalse.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsFalse.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,20 +38,20 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
  */
 
 /**
- * Constraint that accepts FALSE.
+ * Constraint that accepts false.
  *
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
@@ -59,15 +59,15 @@
 class PHPUnit_Framework_Constraint_IsFalse extends PHPUnit_Framework_Constraint
 {
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
-        return $other === FALSE;
+        return $other === false;
     }
 
     /**
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsIdentical.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
similarity index 82%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsIdentical.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
index a06dfc001ee58757e1b6ea28cec10971354e8764..d96952c6da4d4bd6a897812af885488a4a5c7fa7 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsIdentical.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -59,7 +59,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -67,7 +67,7 @@
 class PHPUnit_Framework_Constraint_IsIdentical extends PHPUnit_Framework_Constraint
 {
     /**
-     * @var double
+     * @var float
      */
     const EPSILON = 0.0000000001;
 
@@ -81,34 +81,33 @@ class PHPUnit_Framework_Constraint_IsIdentical extends PHPUnit_Framework_Constra
      */
     public function __construct($value)
     {
+        parent::__construct();
         $this->value = $value;
     }
 
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
         if (is_double($this->value) && is_double($other) &&
             !is_infinite($this->value) && !is_infinite($other) &&
             !is_nan($this->value) && !is_nan($other)) {
             $success = abs($this->value - $other) < self::EPSILON;
-        }
-
-        else {
+        } else {
             $success = $this->value === $other;
         }
 
@@ -117,11 +116,11 @@ public function evaluate($other, $description = '', $returnResult = FALSE)
         }
 
         if (!$success) {
-            $f = NULL;
+            $f = null;
 
             // if both values are strings, make sure a diff is generated
             if (is_string($this->value) && is_string($other)) {
-                $f = new PHPUnit_Framework_ComparisonFailure(
+                $f = new SebastianBergmann\Comparator\ComparisonFailure(
                   $this->value,
                   $other,
                   $this->value,
@@ -139,7 +138,7 @@ public function evaluate($other, $description = '', $returnResult = FALSE)
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
@@ -167,7 +166,7 @@ public function toString()
                    get_class($this->value) . '"';
         } else {
             return 'is identical to ' .
-                   PHPUnit_Util_Type::export($this->value);
+                   $this->exporter->export($this->value);
         }
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsInstanceOf.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
similarity index 78%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsInstanceOf.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
index 363594ac78fc2c8ec030d86e95f8107ee4865b90..d288338c670c1d2350f215c544a1775b81c47485 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsInstanceOf.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -54,7 +54,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -71,14 +71,15 @@ class PHPUnit_Framework_Constraint_IsInstanceOf extends PHPUnit_Framework_Constr
      */
     public function __construct($className)
     {
+        parent::__construct();
         $this->className = $className;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -92,15 +93,15 @@ protected function matches($other)
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
     {
         return sprintf(
-          '%s is an instance of class "%s"',
-
-          PHPUnit_Util_Type::shortenedExport($other),
+          '%s is an instance of %s "%s"',
+          $this->exporter->shortenedExport($other),
+          $this->getType(),
           $this->className
         );
     }
@@ -113,9 +114,22 @@ protected function failureDescription($other)
     public function toString()
     {
         return sprintf(
-          'is instance of class "%s"',
-
+          'is instance of %s "%s"',
+          $this->getType(),
           $this->className
         );
     }
+
+    private function getType()
+    {
+        try {
+            $reflection = new ReflectionClass($this->className);
+            if ($reflection->isInterface()) {
+                return 'interface';
+            }
+        } catch (ReflectionException $e) {
+        }
+
+        return 'class';
+    }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsJson.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsJson.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
index c75d0934365ea69c895a125de57701b84261a657..f5f25ed3bfeaee851f464bb7f3cf28dfc4f872b5 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsJson.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsJson.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.20
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.7.20
@@ -57,20 +57,20 @@
 class PHPUnit_Framework_Constraint_IsJson extends PHPUnit_Framework_Constraint
 {
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
         json_decode($other);
         if (json_last_error()) {
-            return FALSE;
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
@@ -79,7 +79,7 @@ protected function matches($other)
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
@@ -92,7 +92,7 @@ protected function failureDescription($other)
         return sprintf(
           '%s is valid JSON (%s)',
 
-          PHPUnit_Util_Type::shortenedExport($other),
+          $this->exporter->shortenedExport($other),
           $error
         );
     }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsNull.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsNull.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
index 07f99d363f79c4e40ccdc24eab45a761bc8c8d9a..06654f7485ac221ecdda3c5fd01b41b58d65df6d 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsNull.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsNull.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,20 +38,20 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
  */
 
 /**
- * Constraint that accepts NULL.
+ * Constraint that accepts null.
  *
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
@@ -59,15 +59,15 @@
 class PHPUnit_Framework_Constraint_IsNull extends PHPUnit_Framework_Constraint
 {
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
-        return $other === NULL;
+        return $other === null;
     }
 
     /**
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsTrue.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsTrue.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
index aa9ae60cfcc17c664d2e80433ea605bc423e7506..c00e60e9fed4ee28af6fc29f043612c5b9965290 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsTrue.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsTrue.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,20 +38,20 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
  */
 
 /**
- * Constraint that accepts TRUE.
+ * Constraint that accepts true.
  *
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
@@ -59,15 +59,15 @@
 class PHPUnit_Framework_Constraint_IsTrue extends PHPUnit_Framework_Constraint
 {
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
-        return $other === TRUE;
+        return $other === true;
     }
 
     /**
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsType.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
similarity index 85%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsType.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
index 0d26a68889816bd0f23537724b53ee5fd935c518..3f6f4d0bbfa81cc4819b1ec0a35691c2d84819f6 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/IsType.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/IsType.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -54,7 +54,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -65,7 +65,7 @@ class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint
     const TYPE_BOOL     = 'bool';
     const TYPE_FLOAT    = 'float';
     const TYPE_INT      = 'int';
-    const TYPE_NULL     = 'null';
+    const TYPE_null     = 'null';
     const TYPE_NUMERIC  = 'numeric';
     const TYPE_OBJECT   = 'object';
     const TYPE_RESOURCE = 'resource';
@@ -77,19 +77,19 @@ class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint
      * @var array
      */
     protected $types = array(
-      'array' => TRUE,
-      'boolean' => TRUE,
-      'bool' => TRUE,
-      'float' => TRUE,
-      'integer' => TRUE,
-      'int' => TRUE,
-      'null' => TRUE,
-      'numeric' => TRUE,
-      'object' => TRUE,
-      'resource' => TRUE,
-      'string' => TRUE,
-      'scalar' => TRUE,
-      'callable' => TRUE
+      'array' => true,
+      'boolean' => true,
+      'bool' => true,
+      'float' => true,
+      'integer' => true,
+      'int' => true,
+      'null' => true,
+      'numeric' => true,
+      'object' => true,
+      'resource' => true,
+      'string' => true,
+      'scalar' => true,
+      'callable' => true
     );
 
     /**
@@ -98,11 +98,13 @@ class PHPUnit_Framework_Constraint_IsType extends PHPUnit_Framework_Constraint
     protected $type;
 
     /**
-     * @param  string $type
+     * @param  string                      $type
      * @throws PHPUnit_Framework_Exception
      */
     public function __construct($type)
     {
+        parent::__construct();
+
         if (!isset($this->types[$type])) {
             throw new PHPUnit_Framework_Exception(
               sprintf(
@@ -117,10 +119,10 @@ public function __construct($type)
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
similarity index 87%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
index 426af9ec833f920772e71131afd2d90dbcb45949..d9e7eedcba4adc83c5cd45c7fc0b84a00b5c632a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Bastian Feder <php@bastian-feder.de>
- * @copyright  2002-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Bastian Feder <php@bastian-feder.de>
- * @copyright  2011 Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.7.0
@@ -68,28 +68,29 @@ class PHPUnit_Framework_Constraint_JsonMatches extends PHPUnit_Framework_Constra
      */
     public function __construct($value)
     {
+        parent::__construct();
         $this->value = $value;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
      * This method can be overridden to implement the evaluation algorithm.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
         $decodedOther = json_decode($other);
         if (json_last_error()) {
-            return FALSE;
+            return false;
         }
 
         $decodedValue = json_decode($this->value);
         if (json_last_error()) {
-            return FALSE;
+            return false;
         }
 
         return $decodedOther == $decodedValue;
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches/ErrorMessageProvider.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
index fe6e16a4cb0f6faeb5a7334cad48cbf71e11e9b8..8606fc6f314f1ba7548b64c13f88d25e45a09254 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Bastian Feder <php@bastian-feder.de>
- * @copyright  2002-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Constraint
  * @author     Bastian Feder <php@bastian-feder.de>
- * @copyright  2011 Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.7.0
@@ -59,7 +59,7 @@ class PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider
     /**
      * Translates JSON error to a human readable string.
      *
-     * @param string $error
+     * @param  string $error
      * @return string
      */
     public static function determineJsonError($error, $prefix = '')
@@ -85,7 +85,7 @@ public static function determineJsonError($error, $prefix = '')
     /**
      * Translates a given type to a human readable message prefix.
      *
-     * @param string $type
+     * @param  string $type
      * @return string
      */
     public static function translateTypeToPrefix($type)
@@ -101,6 +101,7 @@ public static function translateTypeToPrefix($type)
                 $prefix = '';
                 break;
         }
+
         return $prefix;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/LessThan.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/LessThan.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
index adac4250c5800933b4230e8cbc4de56c77e60683..a47a91ce9d7125c923013615af4ab9b2598ce744 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/LessThan.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/LessThan.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -52,7 +52,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -69,14 +69,15 @@ class PHPUnit_Framework_Constraint_LessThan extends PHPUnit_Framework_Constraint
      */
     public function __construct($value)
     {
+        parent::__construct();
         $this->value = $value;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -91,6 +92,6 @@ protected function matches($other)
      */
     public function toString()
     {
-        return 'is less than ' . PHPUnit_Util_Type::export($this->value);
+        return 'is less than ' . $this->exporter->export($this->value);
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Not.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Not.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
index fbf1a5a0f2258d79456fdc797cb08fab35d7a86e..d34ca78608ae207f565b364710719ee99398a399 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Not.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Not.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -69,6 +69,8 @@ class PHPUnit_Framework_Constraint_Not extends PHPUnit_Framework_Constraint
      */
     public function __construct($constraint)
     {
+        parent::__construct();
+
         if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
             $constraint = new PHPUnit_Framework_Constraint_IsEqual($constraint);
         }
@@ -114,22 +116,22 @@ public static function negate($string)
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
-        $success = !$this->constraint->evaluate($other, $description, TRUE);
+        $success = !$this->constraint->evaluate($other, $description, true);
 
         if ($returnResult) {
             return $success;
@@ -146,7 +148,7 @@ public function evaluate($other, $description = '', $returnResult = FALSE)
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ObjectHasAttribute.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ObjectHasAttribute.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
index 48dd1fce8175293ae5e140f641586a52b538022c..46fab024e67e4577c04945b7f93f58f1700624b8 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/ObjectHasAttribute.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -54,7 +54,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -62,10 +62,10 @@
 class PHPUnit_Framework_Constraint_ObjectHasAttribute extends PHPUnit_Framework_Constraint_ClassHasAttribute
 {
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Or.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
similarity index 81%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Or.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
index cb56f5fa1d5eb679cacb1bc72eef9c3c06eb564d..9d879223ea1b97a59269b93aa4a52f36f14f1969 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Or.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Or.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -70,7 +70,7 @@ public function setConstraints(array $constraints)
     {
         $this->constraints = array();
 
-        foreach ($constraints as $key => $constraint) {
+        foreach ($constraints as $constraint) {
             if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
                 $constraint = new PHPUnit_Framework_Constraint_IsEqual(
                   $constraint
@@ -84,27 +84,27 @@ public function setConstraints(array $constraints)
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
-        $success = FALSE;
-        $constraint = NULL;
+        $success = false;
+        $constraint = null;
 
         foreach ($this->constraints as $constraint) {
-            if ($constraint->evaluate($other, $description, TRUE)) {
-                $success = TRUE;
+            if ($constraint->evaluate($other, $description, true)) {
+                $success = true;
                 break;
             }
         }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/PCREMatch.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/PCREMatch.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
index 0120396e6cc75c9bc13e19e234142400a2c7a829..ee7787126e5d9c97bcb6a0697a4f32bc1d88e065 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/PCREMatch.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -57,7 +57,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -74,14 +74,15 @@ class PHPUnit_Framework_Constraint_PCREMatch extends PHPUnit_Framework_Constrain
      */
     public function __construct($pattern)
     {
+        parent::__construct();
         $this->pattern = $pattern;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/SameSize.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/SameSize.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
index 32ce8bef3b156c0af2ecaeb322d496ad223faae6..f0a478aec4b28ed195e350c1c3f9a136c3940c8d 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/SameSize.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/SameSize.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.0
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringContains.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
similarity index 85%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringContains.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
index 6cc94122ee393caa1f3afdb6f100f4d65dcd9087..bf628a1601a2fa56d3b0211585867149509176d0 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringContains.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringContains.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -49,7 +49,7 @@
  * a given string.
  *
  * Uses strpos() to find the position of the string in the input, if not found
- * the evaluaton fails.
+ * the evaluation fails.
  *
  * The sub-string is passed in the constructor.
  *
@@ -57,7 +57,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -78,25 +78,27 @@ class PHPUnit_Framework_Constraint_StringContains extends PHPUnit_Framework_Cons
      * @param string  $string
      * @param boolean $ignoreCase
      */
-    public function __construct($string, $ignoreCase = FALSE)
+    public function __construct($string, $ignoreCase = false)
     {
+        parent::__construct();
+
         $this->string     = $string;
         $this->ignoreCase = $ignoreCase;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
     {
         if ($this->ignoreCase) {
-            return stripos($other, $this->string) !== FALSE;
+            return stripos($other, $this->string) !== false;
         } else {
-            return strpos($other, $this->string) !== FALSE;
+            return strpos($other, $this->string) !== false;
         }
     }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringEndsWith.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringEndsWith.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
index 9b4380825b6777f3f49831d296710f742fc6a848..5a77f8acee3a580264411b3cd561eeb4bc6c8bbf 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringEndsWith.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.4.0
@@ -52,7 +52,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.4.0
@@ -69,14 +69,15 @@ class PHPUnit_Framework_Constraint_StringEndsWith extends PHPUnit_Framework_Cons
      */
     public function __construct($suffix)
     {
+        parent::__construct();
         $this->suffix = $suffix;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringMatches.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringMatches.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
index 5d9a4171efdbca2bdda9e7c3b426fa57427a8f0e..234cd36d9abb79cfa8f7eeec706b1ca78c39fdad 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringMatches.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringMatches.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,12 +38,14 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.5.0
  */
 
+use SebastianBergmann\Diff\Differ;
+
 /**
  * ...
  *
@@ -51,7 +53,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.5.0
@@ -68,10 +70,13 @@ class PHPUnit_Framework_Constraint_StringMatches extends PHPUnit_Framework_Const
      */
     public function __construct($string)
     {
+        parent::__construct($string);
+
         $this->pattern = $this->createPatternFromFormat(
             preg_replace('/\r\n/', "\n", $string)
         );
-        $this->string  = $string;
+
+        $this->string = $string;
     }
 
     protected function failureDescription($other)
@@ -82,18 +87,24 @@ protected function failureDescription($other)
     protected function additionalFailureDescription($other)
     {
         $from = preg_split('(\r\n|\r|\n)', $this->string);
-        $to = preg_split('(\r\n|\r|\n)', $other);
+        $to   = preg_split('(\r\n|\r|\n)', $other);
+
         foreach ($from as $index => $line) {
             if (isset($to[$index]) && $line !== $to[$index]) {
                 $line = $this->createPatternFromFormat($line);
+
                 if (preg_match($line, $to[$index]) > 0) {
                     $from[$index] = $to[$index];
                 }
             }
         }
+
         $this->string = join("\n", $from);
-        $other = join("\n", $to);
-        return PHPUnit_Util_Diff::diff($this->string, $other);
+        $other        = join("\n", $to);
+
+        $differ = new Differ("--- Expected\n+++ Actual\n");
+
+        return $differ->diff($this->string, $other);
     }
 
     protected function createPatternFromFormat($string)
@@ -127,8 +138,8 @@ protected function createPatternFromFormat($string)
           ),
           preg_quote($string, '/')
         );
+
         return '/^' . $string . '$/s';
     }
 
 }
-
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringStartsWith.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringStartsWith.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
index 6e2cda32383b3165f63fc66825924b53e8d20cad..20276c486a9fd44548e83793567e81003f7d63c2 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/StringStartsWith.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.4.0
@@ -52,7 +52,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.4.0
@@ -69,14 +69,15 @@ class PHPUnit_Framework_Constraint_StringStartsWith extends PHPUnit_Framework_Co
      */
     public function __construct($prefix)
     {
+        parent::__construct();
         $this->prefix = $prefix;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContains.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
similarity index 72%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContains.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
index a0c6966483b59064059d270da1229165dd651c81..cb74e1d2b4dacd517dc8de8c3af69c19345135f7 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContains.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -52,7 +52,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -64,31 +64,44 @@ class PHPUnit_Framework_Constraint_TraversableContains extends PHPUnit_Framework
      */
     protected $checkForObjectIdentity;
 
+    /**
+     * @var boolean
+     */
+    protected $checkForNonObjectIdentity;
+
     /**
      * @var mixed
      */
     protected $value;
 
     /**
-     * @param  boolean $value
-     * @param  mixed   $checkForObjectIdentity
+     * @param  mixed                       $value
+     * @param  boolean                     $checkForObjectIdentity
+     * @param  boolean                     $checkForNonObjectIdentity
      * @throws PHPUnit_Framework_Exception
      */
-    public function __construct($value, $checkForObjectIdentity = TRUE)
+    public function __construct($value, $checkForObjectIdentity = true, $checkForNonObjectIdentity = false)
     {
+        parent::__construct();
+
         if (!is_bool($checkForObjectIdentity)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(2, 'boolean');
         }
 
-        $this->checkForObjectIdentity = $checkForObjectIdentity;
-        $this->value                  = $value;
+        if (!is_bool($checkForNonObjectIdentity)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(3, 'boolean');
+        }
+
+        $this->checkForObjectIdentity    = $checkForObjectIdentity;
+        $this->checkForNonObjectIdentity = $checkForNonObjectIdentity;
+        $this->value                     = $value;
     }
 
     /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
+     * Evaluates the constraint for parameter $other. Returns true if the
+     * constraint is met, false otherwise.
      *
-     * @param mixed $other Value or object to evaluate.
+     * @param  mixed $other Value or object to evaluate.
      * @return bool
      */
     protected function matches($other)
@@ -103,18 +116,21 @@ protected function matches($other)
                      $element === $this->value) ||
                     (!$this->checkForObjectIdentity &&
                      $element == $this->value)) {
-                    return TRUE;
+                    return true;
                 }
             }
         } else {
             foreach ($other as $element) {
-                if ($element == $this->value) {
-                    return TRUE;
+                if (($this->checkForNonObjectIdentity &&
+                     $element === $this->value) ||
+                    (!$this->checkForNonObjectIdentity &&
+                     $element == $this->value)) {
+                    return true;
                 }
             }
         }
 
-        return FALSE;
+        return false;
     }
 
     /**
@@ -124,10 +140,10 @@ protected function matches($other)
      */
     public function toString()
     {
-        if (is_string($this->value) && strpos($this->value, "\n") !== FALSE) {
+        if (is_string($this->value) && strpos($this->value, "\n") !== false) {
             return 'contains "' . $this->value . '"';
         } else {
-            return 'contains ' . PHPUnit_Util_Type::export($this->value);
+            return 'contains ' . $this->exporter->export($this->value);
         }
     }
 
@@ -137,15 +153,15 @@ public function toString()
      * The beginning of failure messages is "Failed asserting that" in most
      * cases. This method should return the second part of that sentence.
      *
-     * @param  mixed $other Evaluated value or object.
+     * @param  mixed  $other Evaluated value or object.
      * @return string
      */
     protected function failureDescription($other)
     {
         return sprintf(
-          'an %s %s',
+          '%s %s',
 
-           is_array($other) ? 'array' : 'iterator',
+           is_array($other) ? 'an array' : 'a traversable',
            $this->toString()
         );
     }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContainsOnly.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
similarity index 79%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContainsOnly.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
index b905823e9c0595cbaacd498f273d56933b025625..1116cf781f9c5cedb34cfc9556c49e519db32f9c 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/TraversableContainsOnly.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.1.4
@@ -52,7 +52,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.1.4
@@ -73,8 +73,10 @@ class PHPUnit_Framework_Constraint_TraversableContainsOnly extends PHPUnit_Frame
      * @param string  $type
      * @param boolean $isNativeType
      */
-    public function __construct($type, $isNativeType = TRUE)
+    public function __construct($type, $isNativeType = true)
     {
+        parent::__construct();
+
         if ($isNativeType) {
             $this->constraint = new PHPUnit_Framework_Constraint_IsType($type);
         } else {
@@ -89,27 +91,26 @@ public function __construct($type, $isNativeType = TRUE)
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
-        $success = TRUE;
-        $constraint = NULL;
+        $success = true;
 
         foreach ($other as $item) {
-            if (!$this->constraint->evaluate($item, '', TRUE)) {
-                $success = FALSE;
+            if (!$this->constraint->evaluate($item, '', true)) {
+                $success = false;
                 break;
             }
         }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Xor.php b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
similarity index 81%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Xor.php
rename to core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
index 98ac48ed2143cdde0402a0e79a6141825d0aedaa..187621594d8acd6335d5fd4a5d81bef1acb55175 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Constraint/Xor.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Constraint/Xor.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -51,7 +51,7 @@
  * @subpackage Framework_Constraint
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -70,7 +70,7 @@ public function setConstraints(array $constraints)
     {
         $this->constraints = array();
 
-        foreach ($constraints as $key => $constraint) {
+        foreach ($constraints as $constraint) {
             if (!($constraint instanceof PHPUnit_Framework_Constraint)) {
                 $constraint = new PHPUnit_Framework_Constraint_IsEqual(
                   $constraint
@@ -84,30 +84,30 @@ public function setConstraints(array $constraints)
     /**
      * Evaluates the constraint for parameter $other
      *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
+     * If $returnResult is set to false (the default), an exception is thrown
+     * in case of a failure. null is returned otherwise.
      *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
+     * If $returnResult is true, the result of the evaluation is returned as
+     * a boolean value instead: true in case of success, false in case of a
      * failure.
      *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
+     * @param  mixed                                        $other        Value or object to evaluate.
+     * @param  string                                       $description  Additional information about the test
+     * @param  bool                                         $returnResult Whether to return a result or throw an exception
      * @return mixed
      * @throws PHPUnit_Framework_ExpectationFailedException
      */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
+    public function evaluate($other, $description = '', $returnResult = false)
     {
-        $success = TRUE;
-        $lastResult = NULL;
-        $constraint = NULL;
+        $success = true;
+        $lastResult = null;
+        $constraint = null;
 
         foreach ($this->constraints as $constraint) {
-            $result = $constraint->evaluate($other, $description, TRUE);
+            $result = $constraint->evaluate($other, $description, true);
 
             if ($result === $lastResult) {
-                $success = FALSE;
+                $success = false;
                 break;
             }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Error.php b/core/vendor/phpunit/phpunit/src/Framework/Error.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Error.php
rename to core/vendor/phpunit/phpunit/src/Framework/Error.php
index c286f5edbb329829c3728ba28b6a690ffa810644..65ced265cfdb49845c7b485a17ffb62589b54658 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Error.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Error.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.2.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.2.0
@@ -59,13 +59,13 @@ class PHPUnit_Framework_Error extends Exception
     /**
      * Constructor.
      *
-     * @param  string     $message
-     * @param  integer    $code
-     * @param  string     $file
-     * @param  integer    $line
-     * @param  Exception  $previous
+     * @param string    $message
+     * @param integer   $code
+     * @param string    $file
+     * @param integer   $line
+     * @param Exception $previous
      */
-    public function __construct($message, $code, $file, $line, Exception $previous = NULL)
+    public function __construct($message, $code, $file, $line, Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Deprecated.php b/core/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Deprecated.php
rename to core/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
index 9ca841bfeb2efc9a2cb4d7fc524c9276da330f5e..30ebe0d77b672110f61e4a707760986d5cad31d4 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Deprecated.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Error/Deprecated.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Error
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
@@ -48,18 +48,18 @@
  * You can disable deprecated-to-exception conversion by setting
  *
  * <code>
- * PHPUnit_Framework_Error_Deprecated::$enabled = FALSE;
+ * PHPUnit_Framework_Error_Deprecated::$enabled = false;
  * </code>
  *
  * @package    PHPUnit
  * @subpackage Framework_Error
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
  */
 class PHPUnit_Framework_Error_Deprecated extends PHPUnit_Framework_Error
 {
-    public static $enabled = TRUE;
+    public static $enabled = true;
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Notice.php b/core/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Notice.php
rename to core/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
index a6c53e8c51bee195bc63f8a7f733d05ba428b44c..3ea050994c952d4e7f350cbb1b77fc3ecdbfeeea 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Notice.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Error/Notice.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Error
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
@@ -48,18 +48,18 @@
  * You can disable notice-to-exception conversion by setting
  *
  * <code>
- * PHPUnit_Framework_Error_Notice::$enabled = FALSE;
+ * PHPUnit_Framework_Error_Notice::$enabled = false;
  * </code>
  *
  * @package    PHPUnit
  * @subpackage Framework_Error
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
  */
 class PHPUnit_Framework_Error_Notice extends PHPUnit_Framework_Error
 {
-    public static $enabled = TRUE;
+    public static $enabled = true;
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Warning.php b/core/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Warning.php
rename to core/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
index 0e7c09743f43e726d89ea26d8cc91587901e9eea..569ae5fcec1fc83b2b5724b5c65a606e985cf01e 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Error/Warning.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Error/Warning.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_Error
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
@@ -48,18 +48,18 @@
  * You can disable notice-to-exception conversion by setting
  *
  * <code>
- * PHPUnit_Framework_Error_Warning::$enabled = FALSE;
+ * PHPUnit_Framework_Error_Warning::$enabled = false;
  * </code>
  *
  * @package    PHPUnit
  * @subpackage Framework_Error
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
  */
 class PHPUnit_Framework_Error_Warning extends PHPUnit_Framework_Error
 {
-    public static $enabled = TRUE;
+    public static $enabled = true;
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Exception.php b/core/vendor/phpunit/phpunit/src/Framework/Exception.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Exception.php
rename to core/vendor/phpunit/phpunit/src/Framework/Exception.php
index cad14f777b4baa0f5454a24b81b90e7a7808bed8..832b3a19b4f77247b26f2c186309939b1cffa9cd 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Exception.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Exception.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,23 +37,21 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.4.0
  */
 
 /**
- * Exception for PHPUnit runtime errors.
- *
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.4.0
  */
-class PHPUnit_Framework_Exception extends RuntimeException
+class PHPUnit_Framework_Exception extends RuntimeException implements PHPUnit_Exception
 {
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/ExpectationFailedException.php b/core/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
similarity index 83%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/ExpectationFailedException.php
rename to core/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
index 7d1e50af725de8073b1be6a31f9c57319c6c9365..84eda51ec51edbc6dec34cf50bc2d2922c35ba98 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/ExpectationFailedException.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/ExpectationFailedException.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -47,13 +47,13 @@
  * Exception for expectations which failed their check.
  *
  * The exception contains the error message and optionally a
- * PHPUnit_Framework_ComparisonFailure which is used to
+ * SebastianBergmann\Comparator\ComparisonFailure which is used to
  * generate diff output of the failed expectations.
  *
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -61,11 +61,11 @@
 class PHPUnit_Framework_ExpectationFailedException extends PHPUnit_Framework_AssertionFailedError
 {
     /**
-     * @var PHPUnit_Framework_ComparisonFailure
+     * @var SebastianBergmann\Comparator\ComparisonFailure
      */
     protected $comparisonFailure;
 
-    public function __construct($message, PHPUnit_Framework_ComparisonFailure $comparisonFailure = NULL, Exception $previous = NULL)
+    public function __construct($message, SebastianBergmann\Comparator\ComparisonFailure $comparisonFailure = null, Exception $previous = null)
     {
         $this->comparisonFailure = $comparisonFailure;
 
@@ -73,7 +73,7 @@ public function __construct($message, PHPUnit_Framework_ComparisonFailure $compa
     }
 
     /**
-     * @return PHPUnit_Framework_ComparisonFailure
+     * @return SebastianBergmann\Comparator\ComparisonFailure
      */
     public function getComparisonFailure()
     {
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTest.php b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTest.php
rename to core/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
index 1603e04e10b5b332b8483ccb11793c719a63f943..ed92f8a2b4e8aff7c200a53e25aaf922004de7be 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTest.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -50,7 +50,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Interface available since Release 2.0.0
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTestError.php b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTestError.php
rename to core/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
index 37ef30cc35d72e0c509dd123f1604d5f416c29b6..838b9858b4780917e31a338264252ab86ad21f8d 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/IncompleteTestError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/IncompleteTestError.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -50,7 +50,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php b/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
new file mode 100644
index 0000000000000000000000000000000000000000..3babf2dea2d48f45372bafafc9885ecad2a7bf1c
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a test that is skipped because of an invalid @covers annotation.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_InvalidCoversTargetError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_SkippedTest
+{
+}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php b/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
new file mode 100644
index 0000000000000000000000000000000000000000..86ee3557f4e60264e9fcc42bc7a7e14117d67b85
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_InvalidCoversTargetException extends PHPUnit_Framework_CodeCoverageException
+{
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/OutputError.php b/core/vendor/phpunit/phpunit/src/Framework/OutputError.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/OutputError.php
rename to core/vendor/phpunit/phpunit/src/Framework/OutputError.php
index b33014a85e74087b2ec0ff58774f69e682905035..e198887b96974c8ca84a69c4688477e5e8d341c1 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/OutputError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/OutputError.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.0
@@ -50,7 +50,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/RiskyTest.php b/core/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c1538e021593b2ac5157a4e4a8622255321bc8a6
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/RiskyTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * A marker interface for marking any exception/error as result of an unit
+ * test as risky.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Interface available since Release 4.0.0
+ */
+interface PHPUnit_Framework_RiskyTest
+{
+}
diff --git a/core/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php b/core/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d96ba445fd5857f7378cf77d998a6a2c06c26e3
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/RiskyTestError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a risky test.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_RiskyTestError extends PHPUnit_Framework_AssertionFailedError implements PHPUnit_Framework_RiskyTest
+{
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SelfDescribing.php b/core/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/SelfDescribing.php
rename to core/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
index 8661b33cd847067f64364aa43667e21e9439abca..033ae85ac9e4e7707284dc5fcb5abd08730c683a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SelfDescribing.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SelfDescribing.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Interface available since Release 3.0.0
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTest.php b/core/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTest.php
rename to core/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
index dd9b3762a5adfac99e88d677fe56da11c5dbb6c1..fa75648e63e10cf67ac259990ea42f8c8fb228f0 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTest.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SkippedTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Interface available since Release 3.0.0
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestError.php b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestError.php
rename to core/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
index aa3cab3814b72e3008cbcbee19fd15084ce18176..1f75c7bd494139d79526d87753d36c610de88920 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestError.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -50,7 +50,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestSuiteError.php b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestSuiteError.php
rename to core/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
index eec1b3f4af07449d18b7eb9693bcb29888f85d22..7e8added81a85ec601bcd1ce87e60891f47d843b 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SkippedTestSuiteError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.1.0
@@ -50,7 +50,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.1.0
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SyntheticError.php b/core/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
similarity index 94%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/SyntheticError.php
rename to core/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
index f69361e22973a79408070c8fd5978010d3cbc446..0bf01521731b209e8092792ceb05dc29a864a2b2 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/SyntheticError.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/SyntheticError.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.5.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.5.0
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Test.php b/core/vendor/phpunit/phpunit/src/Framework/Test.php
similarity index 90%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Test.php
rename to core/vendor/phpunit/phpunit/src/Framework/Test.php
index 2907270720fd1dfd6215ab9a5dcfc174c44b304d..e68314d82c19e698b82ec38edf91ecbeaaec5546 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Test.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Test.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Interface available since Release 2.0.0
@@ -62,5 +62,5 @@ interface PHPUnit_Framework_Test extends Countable
      * @param  PHPUnit_Framework_TestResult $result
      * @return PHPUnit_Framework_TestResult
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL);
+    public function run(PHPUnit_Framework_TestResult $result = null);
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php b/core/vendor/phpunit/phpunit/src/Framework/TestCase.php
old mode 100644
new mode 100755
similarity index 71%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php
rename to core/vendor/phpunit/phpunit/src/Framework/TestCase.php
index 050134734c2646f7d383237bc900aca847582749..a3141a5f678b3f8b9b72ad794d79174dd941a455
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestCase.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestCase.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -90,7 +90,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -104,7 +104,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
      *
      * @var boolean
      */
-    protected $backupGlobals = NULL;
+    protected $backupGlobals = null;
 
     /**
      * @var array
@@ -118,7 +118,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
      *
      * @var boolean
      */
-    protected $backupStaticAttributes = NULL;
+    protected $backupStaticAttributes = null;
 
     /**
      * @var array
@@ -130,7 +130,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
      *
      * @var boolean
      */
-    protected $runTestInSeparateProcess = NULL;
+    protected $runTestInSeparateProcess = null;
 
     /**
      * Whether or not this test should preserve the global state when
@@ -138,14 +138,14 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
      *
      * @var boolean
      */
-    protected $preserveGlobalState = TRUE;
+    protected $preserveGlobalState = true;
 
     /**
      * Whether or not this test is running in a separate PHP process.
      *
      * @var boolean
      */
-    private $inIsolation = FALSE;
+    private $inIsolation = false;
 
     /**
      * @var array
@@ -160,19 +160,14 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
     /**
      * @var boolean
      */
-    private $useErrorHandler = NULL;
-
-    /**
-     * @var boolean
-     */
-    private $useOutputBuffering = NULL;
+    private $useErrorHandler = null;
 
     /**
      * The name of the expected Exception.
      *
      * @var mixed
      */
-    private $expectedException = NULL;
+    private $expectedException = null;
 
     /**
      * The message of the expected Exception.
@@ -194,8 +189,9 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
      * @var array
      */
     private $required = array(
-        'PHP' => NULL,
-        'PHPUnit' => NULL,
+        'PHP' => null,
+        'PHPUnit' => null,
+        'OS' => null,
         'functions' => array(),
         'extensions' => array()
     );
@@ -205,7 +201,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
      *
      * @var string
      */
-    private $name = NULL;
+    private $name = null;
 
     /**
      * @var array
@@ -232,6 +228,11 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
      */
     private $mockObjects = array();
 
+    /**
+     * @var array
+     */
+    private $mockObjectGenerator = null;
+
     /**
      * @var integer
      */
@@ -265,43 +266,43 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
     /**
      * @var string
      */
-    private $outputExpectedRegex = NULL;
+    private $outputExpectedRegex = null;
 
     /**
      * @var string
      */
-    private $outputExpectedString = NULL;
+    private $outputExpectedString = null;
 
     /**
      * @var bool
      */
-    private $hasPerformedExpectationsOnOutput = FALSE;
+    private $hasPerformedExpectationsOnOutput = false;
 
     /**
      * @var mixed
      */
-    private $outputCallback = FALSE;
+    private $outputCallback = false;
 
     /**
      * @var boolean
      */
-    private $outputBufferingActive = FALSE;
+    private $outputBufferingActive = false;
 
     /**
      * Constructs a test case with the given name.
      *
-     * @param  string $name
-     * @param  array  $data
-     * @param  string $dataName
+     * @param string $name
+     * @param array  $data
+     * @param string $dataName
      */
-    public function __construct($name = NULL, array $data = array(), $dataName = '')
+    public function __construct($name = null, array $data = array(), $dataName = '')
     {
-        if ($name !== NULL) {
+        if ($name !== null) {
             $this->setName($name);
         }
 
-        $this->data     = $data;
-        $this->dataName = $dataName;
+        $this->data                = $data;
+        $this->dataName            = $dataName;
     }
 
     /**
@@ -317,7 +318,7 @@ public function toString()
           '%s::%s',
 
           $class->name,
-          $this->getName(FALSE)
+          $this->getName(false)
         );
 
         return $buffer . $this->getDataSetAsString();
@@ -352,10 +353,10 @@ public function getAnnotations()
      * @param  boolean $withDataSet
      * @return string
      */
-    public function getName($withDataSet = TRUE)
+    public function getName($withDataSet = true)
     {
         if ($withDataSet) {
-            return $this->name . $this->getDataSetAsString(FALSE);
+            return $this->name . $this->getDataSetAsString(false);
         } else {
             return $this->name;
         }
@@ -370,7 +371,7 @@ public function getName($withDataSet = TRUE)
     public function getSize()
     {
         return PHPUnit_Util_Test::getSize(
-          get_class($this), $this->getName(FALSE)
+          get_class($this), $this->getName(false)
         );
     }
 
@@ -388,31 +389,32 @@ public function getActualOutput()
     }
 
     /**
-     * @return string
+     * @return boolean
      * @since  Method available since Release 3.6.0
      */
     public function hasOutput()
     {
         if (strlen($this->output) === 0) {
-            return FALSE;
+            return false;
         }
 
-        if ($this->outputExpectedString !== NULL ||
-            $this->outputExpectedRegex  !== NULL ||
+        if ($this->outputExpectedString !== null ||
+            $this->outputExpectedRegex  !== null ||
             $this->hasPerformedExpectationsOnOutput) {
-            return FALSE;
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
-     * @param string $expectedRegex
+     * @param  string                      $expectedRegex
      * @since Method available since Release 3.6.0
+     * @throws PHPUnit_Framework_Exception
      */
     public function expectOutputRegex($expectedRegex)
     {
-        if ($this->outputExpectedString !== NULL) {
+        if ($this->outputExpectedString !== null) {
             throw new PHPUnit_Framework_Exception;
         }
 
@@ -427,7 +429,7 @@ public function expectOutputRegex($expectedRegex)
      */
     public function expectOutputString($expectedString)
     {
-        if ($this->outputExpectedRegex !== NULL) {
+        if ($this->outputExpectedRegex !== null) {
             throw new PHPUnit_Framework_Exception;
         }
 
@@ -455,12 +457,12 @@ public function getExpectedException()
     }
 
     /**
-     * @param  mixed   $exceptionName
-     * @param  string  $exceptionMessage
-     * @param  integer $exceptionCode
+     * @param mixed   $exceptionName
+     * @param string  $exceptionMessage
+     * @param integer $exceptionCode
      * @since  Method available since Release 3.2.0
      */
-    public function setExpectedException($exceptionName, $exceptionMessage = '', $exceptionCode = NULL)
+    public function setExpectedException($exceptionName, $exceptionMessage = '', $exceptionCode = null)
     {
         $this->expectedException        = $exceptionName;
         $this->expectedExceptionMessage = $exceptionMessage;
@@ -477,16 +479,14 @@ protected function setExpectedExceptionFromAnnotation()
               get_class($this), $this->name
             );
 
-            if ($expectedException !== FALSE) {
+            if ($expectedException !== false) {
                 $this->setExpectedException(
                   $expectedException['class'],
                   $expectedException['message'],
                   $expectedException['code']
                 );
             }
-        }
-
-        catch (ReflectionException $e) {
+        } catch (ReflectionException $e) {
         }
     }
 
@@ -509,40 +509,10 @@ protected function setUseErrorHandlerFromAnnotation()
               get_class($this), $this->name
             );
 
-            if ($useErrorHandler !== NULL) {
+            if ($useErrorHandler !== null) {
                 $this->setUseErrorHandler($useErrorHandler);
             }
-        }
-
-        catch (ReflectionException $e) {
-        }
-    }
-
-    /**
-     * @param boolean $useOutputBuffering
-     * @since Method available since Release 3.4.0
-     */
-    public function setUseOutputBuffering($useOutputBuffering)
-    {
-        $this->useOutputBuffering = $useOutputBuffering;
-    }
-
-    /**
-     * @since Method available since Release 3.4.0
-     */
-    protected function setUseOutputBufferingFromAnnotation()
-    {
-        try {
-            $useOutputBuffering = PHPUnit_Util_Test::getOutputBufferingSettings(
-              get_class($this), $this->name
-            );
-
-            if ($useOutputBuffering !== NULL) {
-                $this->setUseOutputBuffering($useOutputBuffering);
-            }
-        }
-
-        catch (ReflectionException $e) {
+        } catch (ReflectionException $e) {
         }
     }
 
@@ -564,6 +534,10 @@ protected function setRequirementsFromAnnotation()
                 $this->required['PHPUnit'] = $requirements['PHPUnit'];
             }
 
+            if (isset($requirements['OS'])) {
+                $this->required['OS'] = $requirements['OS'];
+            }
+
             if (isset($requirements['extensions'])) {
                 $this->required['extensions'] = $requirements['extensions'];
             }
@@ -571,9 +545,7 @@ protected function setRequirementsFromAnnotation()
             if (isset($requirements['functions'])) {
                 $this->required['functions'] = $requirements['functions'];
             }
-        }
-
-        catch (ReflectionException $e) {
+        } catch (ReflectionException $e) {
         }
     }
 
@@ -603,6 +575,14 @@ protected function checkRequirements()
             );
         }
 
+        if ($this->required['OS'] &&
+            !preg_match($this->required['OS'], PHP_OS)) {
+            $missingRequirements[] = sprintf(
+              'Operating system matching %s is required.',
+              $this->required['OS']
+            );
+        }
+
         foreach ($this->required['functions'] as $requiredFunction) {
             if (!function_exists($requiredFunction)) {
                 $missingRequirements[] = sprintf(
@@ -675,19 +655,18 @@ public function hasFailed()
      * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run(PHPUnit_Framework_TestResult $result = null)
     {
-        if ($result === NULL) {
+        if ($result === null) {
             $result = $this->createResult();
         }
 
         if (!$this instanceof PHPUnit_Framework_Warning) {
             $this->setTestResultObject($result);
             $this->setUseErrorHandlerFromAnnotation();
-            $this->setUseOutputBufferingFromAnnotation();
         }
 
-        if ($this->useErrorHandler !== NULL) {
+        if ($this->useErrorHandler !== null) {
             $oldErrorHandlerSetting = $result->getConvertErrorsToExceptions();
             $result->convertErrorsToExceptions($this->useErrorHandler);
         }
@@ -696,54 +675,48 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
             return;
         }
 
-        if ($this->runTestInSeparateProcess === TRUE &&
-            $this->inIsolation !== TRUE &&
+        if ($this->runTestInSeparateProcess === true &&
+            $this->inIsolation !== true &&
             !$this instanceof PHPUnit_Extensions_SeleniumTestCase &&
             !$this instanceof PHPUnit_Extensions_PhptTestCase) {
             $class = new ReflectionClass($this);
 
             $template = new Text_Template(
-              sprintf(
-                '%s%sProcess%sTestCaseMethod.tpl',
-
-                __DIR__,
-                DIRECTORY_SEPARATOR,
-                DIRECTORY_SEPARATOR,
-                DIRECTORY_SEPARATOR
-              )
+              __DIR__ . '/../Util/PHP/Template/TestCaseMethod.tpl'
             );
 
             if ($this->preserveGlobalState) {
                 $constants     = PHPUnit_Util_GlobalState::getConstantsAsString();
                 $globals       = PHPUnit_Util_GlobalState::getGlobalsAsString();
                 $includedFiles = PHPUnit_Util_GlobalState::getIncludedFilesAsString();
+                $iniSettings   = PHPUnit_Util_GlobalState::getIniSettingsAsString();
             } else {
                 $constants     = '';
                 $globals       = '';
                 $includedFiles = '';
+                $iniSettings   = '';
             }
 
-            if ($result->getCollectCodeCoverageInformation()) {
-                $coverage = 'TRUE';
-            } else {
-                $coverage = 'FALSE';
-            }
+            $coverage                                = $result->getCollectCodeCoverageInformation()       ? 'true' : 'false';
+            $isStrictAboutTestsThatDoNotTestAnything = $result->isStrictAboutTestsThatDoNotTestAnything() ? 'true' : 'false';
+            $isStrictAboutOutputDuringTests          = $result->isStrictAboutOutputDuringTests()          ? 'true' : 'false';
+            $isStrictAboutTestSize                   = $result->isStrictAboutTestSize()                   ? 'true' : 'false';
 
-            if ($result->isStrict()) {
-                $strict = 'TRUE';
+            if (defined('PHPUNIT_COMPOSER_INSTALL')) {
+                $composerAutoload = var_export(PHPUNIT_COMPOSER_INSTALL, true);
             } else {
-                $strict = 'FALSE';
+                $composerAutoload = '\'\'';
             }
 
-            if (defined('PHPUNIT_COMPOSER_INSTALL')) {
-                $composerAutoload = var_export(PHPUNIT_COMPOSER_INSTALL, TRUE);
+            if (defined('__PHPUNIT_PHAR__')) {
+                $phar = var_export(__PHPUNIT_PHAR__, true);
             } else {
-                $composerAutoload = '\'\'';
+                $phar = '\'\'';
             }
 
-            $data            = var_export(serialize($this->data), TRUE);
-            $dependencyInput = var_export(serialize($this->dependencyInput), TRUE);
-            $includePath     = var_export(get_include_path(), TRUE);
+            $data            = var_export(serialize($this->data), true);
+            $dependencyInput = var_export(serialize($this->dependencyInput), true);
+            $includePath     = var_export(get_include_path(), true);
             // must do these fixes because TestCaseMethod.tpl has unserialize('{data}') in it, and we can't break BC
             // the lines above used to use addcslashes() rather than var_export(), which breaks null byte escape sequences
             $data            = "'." . $data . ".'";
@@ -752,35 +725,39 @@ public function run(PHPUnit_Framework_TestResult $result = NULL)
 
             $template->setVar(
               array(
-                'composerAutoload'               => $composerAutoload,
-                'filename'                       => $class->getFileName(),
-                'className'                      => $class->getName(),
-                'methodName'                     => $this->name,
-                'collectCodeCoverageInformation' => $coverage,
-                'data'                           => $data,
-                'dataName'                       => $this->dataName,
-                'dependencyInput'                => $dependencyInput,
-                'constants'                      => $constants,
-                'globals'                        => $globals,
-                'include_path'                   => $includePath,
-                'included_files'                 => $includedFiles,
-                'strict'                         => $strict
+                'composerAutoload'                        => $composerAutoload,
+                'phar'                                    => $phar,
+                'filename'                                => $class->getFileName(),
+                'className'                               => $class->getName(),
+                'methodName'                              => $this->name,
+                'collectCodeCoverageInformation'          => $coverage,
+                'data'                                    => $data,
+                'dataName'                                => $this->dataName,
+                'dependencyInput'                         => $dependencyInput,
+                'constants'                               => $constants,
+                'globals'                                 => $globals,
+                'include_path'                            => $includePath,
+                'included_files'                          => $includedFiles,
+                'iniSettings'                             => $iniSettings,
+                'isStrictAboutTestsThatDoNotTestAnything' => $isStrictAboutTestsThatDoNotTestAnything,
+                'isStrictAboutOutputDuringTests'          => $isStrictAboutOutputDuringTests,
+                'isStrictAboutTestSize'                   => $isStrictAboutTestSize
               )
             );
 
             $this->prepareTemplate($template);
 
             $php = PHPUnit_Util_PHP::factory();
-            $php->runJob($template->render(), $this, $result);
+            $php->runTestJob($template->render(), $this, $result);
         } else {
             $result->run($this);
         }
 
-        if ($this->useErrorHandler !== NULL) {
+        if ($this->useErrorHandler !== null) {
             $result->convertErrorsToExceptions($oldErrorHandlerSetting);
         }
 
-        $this->result = NULL;
+        $this->result = null;
 
         return $result;
     }
@@ -793,16 +770,16 @@ public function runBare()
         $this->numAssertions = 0;
 
         // Backup the $GLOBALS array and static attributes.
-        if ($this->runTestInSeparateProcess !== TRUE &&
-            $this->inIsolation !== TRUE) {
-            if ($this->backupGlobals === NULL ||
-                $this->backupGlobals === TRUE) {
+        if ($this->runTestInSeparateProcess !== true &&
+            $this->inIsolation !== true) {
+            if ($this->backupGlobals === null ||
+                $this->backupGlobals === true) {
                 PHPUnit_Util_GlobalState::backupGlobals(
                   $this->backupGlobalsBlacklist
                 );
             }
 
-            if ($this->backupStaticAttributes === TRUE) {
+            if ($this->backupStaticAttributes === true) {
                 PHPUnit_Util_GlobalState::backupStaticAttributes(
                   $this->backupStaticAttributesBlacklist
                 );
@@ -811,7 +788,7 @@ public function runBare()
 
         // Start output buffering.
         ob_start();
-        $this->outputBufferingActive = TRUE;
+        $this->outputBufferingActive = true;
 
         // Clean up stat cache.
         clearstatcache();
@@ -819,37 +796,38 @@ public function runBare()
         // Backup the cwd
         $currentWorkingDirectory = getcwd();
 
+        $hookMethods = PHPUnit_Util_Test::getHookMethods(get_class($this));
+
         try {
+            $this->checkRequirements();
+
             if ($this->inIsolation) {
-                $this->setUpBeforeClass();
+                foreach ($hookMethods['beforeClass'] as $method) {
+                    $this->$method();
+                }
             }
 
             $this->setExpectedExceptionFromAnnotation();
-            $this->setUp();
-            $this->checkRequirements();
+
+            foreach ($hookMethods['before'] as $method) {
+                $this->$method();
+            }
+
             $this->assertPreConditions();
             $this->testResult = $this->runTest();
             $this->verifyMockObjects();
             $this->assertPostConditions();
             $this->status = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
-        }
-
-        catch (PHPUnit_Framework_IncompleteTest $e) {
+        } catch (PHPUnit_Framework_IncompleteTest $e) {
             $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE;
             $this->statusMessage = $e->getMessage();
-        }
-
-        catch (PHPUnit_Framework_SkippedTest $e) {
+        } catch (PHPUnit_Framework_SkippedTest $e) {
             $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED;
             $this->statusMessage = $e->getMessage();
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
+        } catch (PHPUnit_Framework_AssertionFailedError $e) {
             $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE;
             $this->statusMessage = $e->getMessage();
-        }
-
-        catch (Exception $e) {
+        } catch (Exception $e) {
             $this->status        = PHPUnit_Runner_BaseTestRunner::STATUS_ERROR;
             $this->statusMessage = $e->getMessage();
         }
@@ -860,21 +838,23 @@ public function runBare()
         // Tear down the fixture. An exception raised in tearDown() will be
         // caught and passed on when no exception was raised before.
         try {
-            $this->tearDown();
+            foreach ($hookMethods['after'] as $method) {
+                $this->$method();
+            }
 
             if ($this->inIsolation) {
-                $this->tearDownAfterClass();
+                foreach ($hookMethods['afterClass'] as $method) {
+                    $this->$method();
+                }
             }
-        }
-
-        catch (Exception $_e) {
+        } catch (Exception $_e) {
             if (!isset($e)) {
                 $e = $_e;
             }
         }
 
         // Stop output buffering.
-        if ($this->outputCallback === FALSE) {
+        if ($this->outputCallback === false) {
             $this->output = ob_get_contents();
         } else {
             $this->output = call_user_func_array(
@@ -883,7 +863,7 @@ public function runBare()
         }
 
         ob_end_clean();
-        $this->outputBufferingActive = FALSE;
+        $this->outputBufferingActive = false;
 
         // Clean up stat cache.
         clearstatcache();
@@ -894,16 +874,16 @@ public function runBare()
         }
 
         // Restore the $GLOBALS array and static attributes.
-        if ($this->runTestInSeparateProcess !== TRUE &&
-            $this->inIsolation !== TRUE) {
-            if ($this->backupGlobals === NULL ||
-                $this->backupGlobals === TRUE) {
+        if ($this->runTestInSeparateProcess !== true &&
+            $this->inIsolation !== true) {
+            if ($this->backupGlobals === null ||
+                $this->backupGlobals === true) {
                 PHPUnit_Util_GlobalState::restoreGlobals(
                    $this->backupGlobalsBlacklist
                 );
             }
 
-            if ($this->backupStaticAttributes === TRUE) {
+            if ($this->backupStaticAttributes === true) {
                 PHPUnit_Util_GlobalState::restoreStaticAttributes();
             }
         }
@@ -923,20 +903,16 @@ public function runBare()
         // Perform assertion on output.
         if (!isset($e)) {
             try {
-                if ($this->outputExpectedRegex !== NULL) {
-                    $this->hasPerformedExpectationsOnOutput = TRUE;
+                if ($this->outputExpectedRegex !== null) {
+                    $this->hasPerformedExpectationsOnOutput = true;
                     $this->assertRegExp($this->outputExpectedRegex, $this->output);
-                    $this->outputExpectedRegex = NULL;
-                }
-
-                else if ($this->outputExpectedString !== NULL) {
-                    $this->hasPerformedExpectationsOnOutput = TRUE;
+                    $this->outputExpectedRegex = null;
+                } elseif ($this->outputExpectedString !== null) {
+                    $this->hasPerformedExpectationsOnOutput = true;
                     $this->assertEquals($this->outputExpectedString, $this->output);
-                    $this->outputExpectedString = NULL;
+                    $this->outputExpectedString = null;
                 }
-            }
-
-            catch (Exception $_e) {
+            } catch (Exception $_e) {
                 $e = $_e;
             }
         }
@@ -951,22 +927,21 @@ public function runBare()
      * Override to run the test and assert its state.
      *
      * @return mixed
+     * @throws Exception|PHPUnit_Framework_Exception
      * @throws PHPUnit_Framework_Exception
      */
     protected function runTest()
     {
-        if ($this->name === NULL) {
+        if ($this->name === null) {
             throw new PHPUnit_Framework_Exception(
-              'PHPUnit_Framework_TestCase::$name must not be NULL.'
+              'PHPUnit_Framework_TestCase::$name must not be null.'
             );
         }
 
         try {
             $class  = new ReflectionClass($this);
             $method = $class->getMethod($this->name);
-        }
-
-        catch (ReflectionException $e) {
+        } catch (ReflectionException $e) {
             $this->fail($e->getMessage());
         }
 
@@ -974,23 +949,21 @@ protected function runTest()
             $testResult = $method->invokeArgs(
               $this, array_merge($this->data, $this->dependencyInput)
             );
-        }
-
-        catch (Exception $e) {
-            $checkException = FALSE;
+        } catch (Exception $e) {
+            $checkException = false;
 
             if (is_string($this->expectedException)) {
-                $checkException = TRUE;
+                $checkException = true;
 
                 if ($e instanceof PHPUnit_Framework_Exception) {
-                    $checkException = FALSE;
+                    $checkException = false;
                 }
 
                 $reflector = new ReflectionClass($this->expectedException);
 
                 if ($this->expectedException == 'PHPUnit_Framework_Exception' ||
                     $reflector->isSubclassOf('PHPUnit_Framework_Exception')) {
-                    $checkException = TRUE;
+                    $checkException = true;
                 }
             }
 
@@ -1012,7 +985,7 @@ protected function runTest()
                     );
                 }
 
-                if ($this->expectedExceptionCode !== NULL) {
+                if ($this->expectedExceptionCode !== null) {
                     $this->assertThat(
                       $e,
                       new PHPUnit_Framework_Constraint_ExceptionCode(
@@ -1027,9 +1000,9 @@ protected function runTest()
             }
         }
 
-        if ($this->expectedException !== NULL) {
+        if ($this->expectedException !== null) {
             $this->assertThat(
-              NULL,
+              null,
               new PHPUnit_Framework_Constraint_Exception(
                 $this->expectedException
               )
@@ -1052,7 +1025,6 @@ protected function verifyMockObjects()
             }
 
             $mockObject->__phpunit_verify();
-            $mockObject->__phpunit_cleanup();
         }
     }
 
@@ -1069,7 +1041,7 @@ public function setName($name)
     /**
      * Sets the dependencies of a TestCase.
      *
-     * @param  array $dependencies
+     * @param array $dependencies
      * @since  Method available since Release 3.4.0
      */
     public function setDependencies(array $dependencies)
@@ -1077,10 +1049,21 @@ public function setDependencies(array $dependencies)
         $this->dependencies = $dependencies;
     }
 
+    /**
+     * Returns true if the tests has dependencies
+     *
+     * @return boolean
+     * @since Method available since Release 4.0.0
+     */
+    public function hasDependencies()
+    {
+        return count($this->dependencies) > 0;
+    }
+
     /**
      * Sets
      *
-     * @param  array $dependencyInput
+     * @param array $dependencyInput
      * @since  Method available since Release 3.4.0
      */
     public function setDependencyInput(array $dependencyInput)
@@ -1091,7 +1074,7 @@ public function setDependencyInput(array $dependencyInput)
     /**
      * Calling this method in setUp() has no effect!
      *
-     * @param  boolean $backupGlobals
+     * @param boolean $backupGlobals
      * @since  Method available since Release 3.3.0
      */
     public function setBackupGlobals($backupGlobals)
@@ -1104,7 +1087,7 @@ public function setBackupGlobals($backupGlobals)
     /**
      * Calling this method in setUp() has no effect!
      *
-     * @param  boolean $backupStaticAttributes
+     * @param boolean $backupStaticAttributes
      * @since  Method available since Release 3.4.0
      */
     public function setBackupStaticAttributes($backupStaticAttributes)
@@ -1116,14 +1099,14 @@ public function setBackupStaticAttributes($backupStaticAttributes)
     }
 
     /**
-     * @param  boolean $runTestInSeparateProcess
+     * @param  boolean                     $runTestInSeparateProcess
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.4.0
      */
     public function setRunTestInSeparateProcess($runTestInSeparateProcess)
     {
         if (is_bool($runTestInSeparateProcess)) {
-            if ($this->runTestInSeparateProcess === NULL) {
+            if ($this->runTestInSeparateProcess === null) {
                 $this->runTestInSeparateProcess = $runTestInSeparateProcess;
             }
         } else {
@@ -1132,7 +1115,7 @@ public function setRunTestInSeparateProcess($runTestInSeparateProcess)
     }
 
     /**
-     * @param  boolean $preserveGlobalState
+     * @param  boolean                     $preserveGlobalState
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.4.0
      */
@@ -1146,7 +1129,7 @@ public function setPreserveGlobalState($preserveGlobalState)
     }
 
     /**
-     * @param  boolean $inIsolation
+     * @param  boolean                     $inIsolation
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.4.0
      */
@@ -1169,7 +1152,7 @@ public function getResult()
     }
 
     /**
-     * @param  mixed $result
+     * @param mixed $result
      * @since  Method available since Release 3.4.0
      */
     public function setResult($result)
@@ -1178,7 +1161,7 @@ public function setResult($result)
     }
 
     /**
-     * @param  callable $callback
+     * @param  callable                    $callback
      * @throws PHPUnit_Framework_Exception
      * @since Method available since Release 3.6.0
      */
@@ -1214,8 +1197,8 @@ public function setTestResultObject(PHPUnit_Framework_TestResult $result)
      * resets the modified php.ini setting to its original value after the
      * test is run.
      *
-     * @param  string  $varName
-     * @param  string  $newValue
+     * @param  string                      $varName
+     * @param  string                      $newValue
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.0.0
      */
@@ -1227,7 +1210,7 @@ protected function iniSet($varName, $newValue)
 
         $currentValue = ini_set($varName, $newValue);
 
-        if ($currentValue !== FALSE) {
+        if ($currentValue !== false) {
             $this->iniSettings[$varName] = $currentValue;
         } else {
             throw new PHPUnit_Framework_Exception(
@@ -1244,8 +1227,8 @@ protected function iniSet($varName, $newValue)
      * This method is a wrapper for the setlocale() function that automatically
      * resets the locale to its original value after the test is run.
      *
-     * @param  integer $category
-     * @param  string  $locale
+     * @param  integer                     $category
+     * @param  string                      $locale
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.1.0
      */
@@ -1276,11 +1259,11 @@ protected function setLocale()
             throw new PHPUnit_Framework_Exception;
         }
 
-        $this->locale[$category] = setlocale($category, NULL);
+        $this->locale[$category] = setlocale($category, null);
 
         $result = call_user_func_array( 'setlocale', $args );
 
-        if ($result === FALSE) {
+        if ($result === false) {
             throw new PHPUnit_Framework_Exception(
               'The locale functionality is not implemented on your platform, ' .
               'the specified locale does not exist or the category name is ' .
@@ -1292,21 +1275,25 @@ protected function setLocale()
     /**
      * Returns a mock object for the specified class.
      *
-     * @param  string  $originalClassName
-     * @param  array   $methods
-     * @param  array   $arguments
-     * @param  string  $mockClassName
-     * @param  boolean $callOriginalConstructor
-     * @param  boolean $callOriginalClone
-     * @param  boolean $callAutoload
-     * @param  boolean $cloneArguments
+     * @param  string                                  $originalClassName       Name of the class to mock.
+     * @param  array|null                              $methods                 When provided, only methods whose names are in the array
+     *                                                                          are replaced with a configurable test double. The behavior
+     *                                                                          of the other methods is not changed.
+     *                                                                          Providing null means that no methods will be replaced.
+     * @param  array                                   $arguments               Parameters to pass to the original class' constructor.
+     * @param  string                                  $mockClassName           Class name for the generated test double class.
+     * @param  boolean                                 $callOriginalConstructor Can be used to disable the call to the original class' constructor.
+     * @param  boolean                                 $callOriginalClone       Can be used to disable the call to the original class' clone constructor.
+     * @param  boolean                                 $callAutoload            Can be used to disable __autoload() during the generation of the test double class.
+     * @param  boolean                                 $cloneArguments
+     * @param  boolean                                 $callOriginalMethods
      * @return PHPUnit_Framework_MockObject_MockObject
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.0.0
      */
-    public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = FALSE)
+    public function getMock($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false, $callOriginalMethods = false)
     {
-        $mockObject = PHPUnit_Framework_MockObject_Generator::getMock(
+        $mockObject = $this->getMockObjectGenerator()->getMock(
           $originalClassName,
           $methods,
           $arguments,
@@ -1314,7 +1301,8 @@ public function getMock($originalClassName, $methods = array(), array $arguments
           $callOriginalConstructor,
           $callOriginalClone,
           $callAutoload,
-          $cloneArguments
+          $cloneArguments,
+          $callOriginalMethods
         );
 
         $this->mockObjects[] = $mockObject;
@@ -1325,7 +1313,7 @@ public function getMock($originalClassName, $methods = array(), array $arguments
     /**
      * Returns a builder object to create mock objects using a fluent interface.
      *
-     * @param  string $className
+     * @param  string                                   $className
      * @return PHPUnit_Framework_MockObject_MockBuilder
      * @since  Method available since Release 3.5.0
      */
@@ -1339,19 +1327,19 @@ public function getMockBuilder($className)
     /**
      * Mocks the specified class and returns the name of the mocked class.
      *
-     * @param  string  $originalClassName
-     * @param  array   $methods
-     * @param  array   $arguments
-     * @param  string  $mockClassName
-     * @param  boolean $callOriginalConstructor
-     * @param  boolean $callOriginalClone
-     * @param  boolean $callAutoload
-     * @param  boolean $cloneArguments
+     * @param  string                      $originalClassName
+     * @param  array                       $methods
+     * @param  array                       $arguments
+     * @param  string                      $mockClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  boolean                     $cloneArguments
      * @return string
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.5.0
      */
-    protected function getMockClass($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = FALSE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = FALSE)
+    protected function getMockClass($originalClassName, $methods = array(), array $arguments = array(), $mockClassName = '', $callOriginalConstructor = false, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false)
     {
         $mock = $this->getMock(
           $originalClassName,
@@ -1372,21 +1360,21 @@ protected function getMockClass($originalClassName, $methods = array(), array $a
      * methods of the class mocked. Concrete methods to mock can be specified with
      * the last parameter
      *
-     * @param  string  $originalClassName
-     * @param  array   $arguments
-     * @param  string  $mockClassName
-     * @param  boolean $callOriginalConstructor
-     * @param  boolean $callOriginalClone
-     * @param  boolean $callAutoload
-     * @param  array   $mockedMethods
-     * @param  boolean $cloneArguments
+     * @param  string                                  $originalClassName
+     * @param  array                                   $arguments
+     * @param  string                                  $mockClassName
+     * @param  boolean                                 $callOriginalConstructor
+     * @param  boolean                                 $callOriginalClone
+     * @param  boolean                                 $callAutoload
+     * @param  array                                   $mockedMethods
+     * @param  boolean                                 $cloneArguments
      * @return PHPUnit_Framework_MockObject_MockObject
      * @since  Method available since Release 3.4.0
      * @throws PHPUnit_Framework_Exception
      */
-    public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $mockedMethods = array(), $cloneArguments = FALSE)
+    public function getMockForAbstractClass($originalClassName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false)
     {
-        $mockObject = PHPUnit_Framework_MockObject_Generator::getMockForAbstractClass(
+        $mockObject = $this->getMockObjectGenerator()->getMockForAbstractClass(
           $originalClassName,
           $arguments,
           $mockClassName,
@@ -1405,15 +1393,16 @@ public function getMockForAbstractClass($originalClassName, array $arguments = a
     /**
      * Returns a mock object based on the given WSDL file.
      *
-     * @param  string  $wsdlFile
-     * @param  string  $originalClassName
-     * @param  string  $mockClassName
-     * @param  array   $methods
-     * @param  boolean $callOriginalConstructor
+     * @param  string                                  $wsdlFile
+     * @param  string                                  $originalClassName
+     * @param  string                                  $mockClassName
+     * @param  array                                   $methods
+     * @param  boolean                                 $callOriginalConstructor
+     * @param  array                                   $options                 An array of options passed to SOAPClient::_construct
      * @return PHPUnit_Framework_MockObject_MockObject
      * @since  Method available since Release 3.4.0
      */
-    protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClassName = '', array $methods = array(), $callOriginalConstructor = TRUE)
+    protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClassName = '', array $methods = array(), $callOriginalConstructor = true, array $options = array())
     {
         if ($originalClassName === '') {
             $originalClassName = str_replace(
@@ -1423,8 +1412,8 @@ protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClas
 
         if (!class_exists($originalClassName)) {
           eval(
-            PHPUnit_Framework_MockObject_Generator::generateClassFromWsdl(
-              $wsdlFile, $originalClassName, $methods
+            $this->getMockObjectGenerator()->generateClassFromWsdl(
+              $wsdlFile, $originalClassName, $methods, $options
             )
           );
         }
@@ -1432,31 +1421,66 @@ protected function getMockFromWsdl($wsdlFile, $originalClassName = '', $mockClas
         return $this->getMock(
           $originalClassName,
           $methods,
-          array('', array()),
+          array('', $options),
           $mockClassName,
           $callOriginalConstructor,
-          FALSE,
-          FALSE
+          false,
+          false
         );
     }
 
+    /**
+     * Returns a mock object for the specified trait with all abstract methods
+     * of the trait mocked. Concrete methods to mock can be specified with the
+     * `$mockedMethods` parameter.
+     *
+     * @param  string                                  $traitName
+     * @param  array                                   $arguments
+     * @param  string                                  $mockClassName
+     * @param  boolean                                 $callOriginalConstructor
+     * @param  boolean                                 $callOriginalClone
+     * @param  boolean                                 $callAutoload
+     * @param  array                                   $mockedMethods
+     * @param  boolean                                 $cloneArguments
+     * @return PHPUnit_Framework_MockObject_MockObject
+     * @since  Method available since Release 4.0.0
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function getMockForTrait($traitName, array $arguments = array(), $mockClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $mockedMethods = array(), $cloneArguments = false)
+    {
+        $mockObject = $this->getMockObjectGenerator()->getMockForTrait(
+          $traitName,
+          $arguments,
+          $mockClassName,
+          $callOriginalConstructor,
+          $callOriginalClone,
+          $callAutoload,
+          $mockedMethods,
+          $cloneArguments
+        );
+
+        $this->mockObjects[] = $mockObject;
+
+        return $mockObject;
+    }
+
     /**
      * Returns an object for the specified trait.
      *
-     * @param  string  $traitName
-     * @param  array   $arguments
-     * @param  string  $traitClassName
-     * @param  boolean $callOriginalConstructor
-     * @param  boolean $callOriginalClone
-     * @param  boolean $callAutoload
-     * @param  boolean $cloneArguments
+     * @param  string                      $traitName
+     * @param  array                       $arguments
+     * @param  string                      $traitClassName
+     * @param  boolean                     $callOriginalConstructor
+     * @param  boolean                     $callOriginalClone
+     * @param  boolean                     $callAutoload
+     * @param  boolean                     $cloneArguments
      * @return object
      * @since  Method available since Release 3.6.0
      * @throws PHPUnit_Framework_Exception
      */
-    protected function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = TRUE, $callOriginalClone = TRUE, $callAutoload = TRUE, $cloneArguments = FALSE)
+    protected function getObjectForTrait($traitName, array $arguments = array(), $traitClassName = '', $callOriginalConstructor = true, $callOriginalClone = true, $callAutoload = true, $cloneArguments = false)
     {
-        return PHPUnit_Framework_MockObject_Generator::getObjectForTrait(
+        return $this->getMockObjectGenerator()->getObjectForTrait(
           $traitName,
           $arguments,
           $traitClassName,
@@ -1541,7 +1565,7 @@ public static function once()
      * Returns a matcher that matches when the method it is evaluated for
      * is executed exactly $count times.
      *
-     * @param  integer $count
+     * @param  integer                                           $count
      * @return PHPUnit_Framework_MockObject_Matcher_InvokedCount
      * @since  Method available since Release 3.0.0
      */
@@ -1554,7 +1578,7 @@ public static function exactly($count)
      * Returns a matcher that matches when the method it is evaluated for
      * is invoked at the given $index.
      *
-     * @param  integer $index
+     * @param  integer                                             $index
      * @return PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex
      * @since  Method available since Release 3.0.0
      */
@@ -1566,7 +1590,7 @@ public static function at($index)
     /**
      *
      *
-     * @param  mixed $value
+     * @param  mixed                                    $value
      * @return PHPUnit_Framework_MockObject_Stub_Return
      * @since  Method available since Release 3.0.0
      */
@@ -1578,7 +1602,7 @@ public static function returnValue($value)
     /**
      *
      *
-     * @param  array $valueMap
+     * @param  array                                            $valueMap
      * @return PHPUnit_Framework_MockObject_Stub_ReturnValueMap
      * @since  Method available since Release 3.6.0
      */
@@ -1590,7 +1614,7 @@ public static function returnValueMap(array $valueMap)
     /**
      *
      *
-     * @param  integer $argumentIndex
+     * @param  integer                                          $argumentIndex
      * @return PHPUnit_Framework_MockObject_Stub_ReturnArgument
      * @since  Method available since Release 3.3.0
      */
@@ -1604,7 +1628,7 @@ public static function returnArgument($argumentIndex)
     /**
      *
      *
-     * @param  mixed $callback
+     * @param  mixed                                            $callback
      * @return PHPUnit_Framework_MockObject_Stub_ReturnCallback
      * @since  Method available since Release 3.3.0
      */
@@ -1629,7 +1653,7 @@ public static function returnSelf()
     /**
      *
      *
-     * @param  Exception $exception
+     * @param  Exception                                   $exception
      * @return PHPUnit_Framework_MockObject_Stub_Exception
      * @since  Method available since Release 3.1.0
      */
@@ -1639,9 +1663,7 @@ public static function throwException(Exception $exception)
     }
 
     /**
-     *
-     *
-     * @param  mixed $value, ...
+     * @param  mixed                                              $value, ...
      * @return PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls
      * @since  Method available since Release 3.0.0
      */
@@ -1653,7 +1675,7 @@ public static function onConsecutiveCalls()
     }
 
     /**
-     * @param  mixed $data
+     * @param  mixed  $data
      * @return string
      * @since  Method available since Release 3.2.1
      */
@@ -1661,48 +1683,38 @@ protected function dataToString($data)
     {
         $result = array();
 
-        // There seems to be no other way to check arrays for recursion
-        // http://www.php.net/manual/en/language.types.array.php#73936
-        preg_match_all('/\n            \[(\w+)\] => Array\s+\*RECURSION\*/', print_r($data, TRUE), $matches);
-        $recursiveKeys = array_unique($matches[1]);
-
-        // Convert to valid array keys
-        // Numeric integer strings are automatically converted to integers
-        // by PHP
-        foreach ($recursiveKeys as $key => $recursiveKey) {
-            if ((string)(integer)$recursiveKey === $recursiveKey) {
-                $recursiveKeys[$key] = (integer)$recursiveKey;
-            }
-        }
+        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+            throw new ErrorException($errstr, $errno, $errno, $errfile, $errline);
+        }, E_WARNING);
 
         foreach ($data as $key => $_data) {
-            if (in_array($key, $recursiveKeys, TRUE)) {
-                $result[] = '*RECURSION*';
-            }
-
-            else if (is_array($_data)) {
-                $result[] = 'array(' . $this->dataToString($_data) . ')';
-            }
-
-            else if (is_object($_data)) {
-                $object = new ReflectionObject($_data);
-
-                if ($object->hasMethod('__toString')) {
-                    $result[] = (string)$_data;
+            try {
+                // Detect array-recursions by using count
+                // http://php.net/manual/en/function.count.php
+                $iRecursiveCheck = count($_data, COUNT_RECURSIVE);
+
+                if (is_array($_data)) {
+                    $result[] = 'array(' . $this->dataToString($_data) . ')';
+                } elseif (is_object($_data)) {
+                    $object = new ReflectionObject($_data);
+
+                    if ($object->hasMethod('__toString')) {
+                        $result[] = (string) $_data;
+                    } else {
+                        $result[] = get_class($_data);
+                    }
+                } elseif (is_resource($_data)) {
+                    $result[] = '<resource>';
                 } else {
-                    $result[] = get_class($_data);
+                    $result[] = var_export($_data, true);
                 }
-            }
-
-            else if (is_resource($_data)) {
-                $result[] = '<resource>';
-            }
-
-            else {
-                $result[] = var_export($_data, TRUE);
+            } catch (ErrorException $e) {
+                $result[] = '*RECURSION*';
             }
         }
 
+        restore_error_handler();
+
         return join(', ', $result);
     }
 
@@ -1713,7 +1725,7 @@ protected function dataToString($data)
      * @return string
      * @since  Method available since Release 3.3.0
      */
-    protected function getDataSetAsString($includeData = TRUE)
+    protected function getDataSetAsString($includeData = true)
     {
         $buffer = '';
 
@@ -1756,7 +1768,7 @@ protected function handleDependencies()
             for ($i = 0; $i < $numKeys; $i++) {
                 $pos = strpos($passedKeys[$i], ' with data set');
 
-                if ($pos !== FALSE) {
+                if ($pos !== false) {
                     $passedKeys[$i] = substr($passedKeys[$i], 0, $pos);
                 }
             }
@@ -1764,7 +1776,7 @@ protected function handleDependencies()
             $passedKeys = array_flip(array_unique($passedKeys));
 
             foreach ($this->dependencies as $dependency) {
-                if (strpos($dependency, '::') === FALSE) {
+                if (strpos($dependency, '::') === false) {
                     $dependency = $className . '::' . $dependency;
                 }
 
@@ -1779,7 +1791,7 @@ protected function handleDependencies()
                       0
                     );
 
-                    return FALSE;
+                    return false;
                 }
 
                 if (isset($passed[$dependency])) {
@@ -1792,17 +1804,17 @@ protected function handleDependencies()
                           0
                         );
 
-                        return FALSE;
+                        return false;
                     }
 
                     $this->dependencyInput[] = $passed[$dependency]['result'];
                 } else {
-                    $this->dependencyInput[] = NULL;
+                    $this->dependencyInput[] = null;
                 }
             }
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
@@ -1867,8 +1879,9 @@ public static function tearDownAfterClass()
     /**
      * This method is called when a test method did not execute successfully.
      *
-     * @param Exception $e
+     * @param  Exception $e
      * @since Method available since Release 3.4.0
+     * @throws Exception
      */
     protected function onNotSuccessfulTest(Exception $e)
     {
@@ -1884,4 +1897,18 @@ protected function onNotSuccessfulTest(Exception $e)
     protected function prepareTemplate(Text_Template $template)
     {
     }
+
+    /**
+     * Get the mock object generator, creating it if it doesn't exist.
+     *
+     * @return   PHPUnit_Framework_MockObject_Generator
+     */
+    protected function getMockObjectGenerator()
+    {
+        if (null === $this->mockObjectGenerator) {
+            $this->mockObjectGenerator = new PHPUnit_Framework_MockObject_Generator;
+        }
+
+        return $this->mockObjectGenerator;
+    }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestFailure.php b/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/TestFailure.php
rename to core/vendor/phpunit/phpunit/src/Framework/TestFailure.php
index 6774c7524fd2a8111d252a208849e01ceff1b857..9da0b739efe4d054bcef6be8db42ba292d2eeb66 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestFailure.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestFailure.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -69,8 +69,8 @@ class PHPUnit_Framework_TestFailure
     /**
      * Constructs a TestFailure with the given test and exception.
      *
-     * @param  PHPUnit_Framework_Test $failedTest
-     * @param  Exception               $thrownException
+     * @param PHPUnit_Framework_Test $failedTest
+     * @param Exception              $thrownException
      */
     public function __construct(PHPUnit_Framework_Test $failedTest, Exception $thrownException)
     {
@@ -117,19 +117,15 @@ public static function exceptionToString(Exception $e)
             $buffer = $e->toString();
 
             if ($e instanceof PHPUnit_Framework_ExpectationFailedException && $e->getComparisonFailure()) {
-                $buffer = $buffer . "\n" . $e->getComparisonFailure()->getDiff();
+                $buffer = $buffer . $e->getComparisonFailure()->getDiff();
             }
 
             if (!empty($buffer)) {
                 $buffer = trim($buffer) . "\n";
             }
-        }
-
-        else if ($e instanceof PHPUnit_Framework_Error) {
+        } elseif ($e instanceof PHPUnit_Framework_Error) {
             $buffer = $e->getMessage() . "\n";
-        }
-
-        else {
+        } else {
             $buffer = get_class($e) . ': ' . $e->getMessage() . "\n";
         }
 
@@ -139,7 +135,7 @@ public static function exceptionToString(Exception $e)
     /**
      * Gets the failed test.
      *
-     * @return Test
+     * @return PHPUnit_Framework_Test
      */
     public function failedTest()
     {
@@ -167,7 +163,7 @@ public function exceptionMessage()
     }
 
     /**
-     * Returns TRUE if the thrown exception
+     * Returns true if the thrown exception
      * is of type AssertionFailedError.
      *
      * @return boolean
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestListener.php b/core/vendor/phpunit/phpunit/src/Framework/TestListener.php
similarity index 72%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/TestListener.php
rename to core/vendor/phpunit/phpunit/src/Framework/TestListener.php
index e64ef24c47d34db2ea71556a5aa5a0dad780cbff..8a4a604b47bc3bb689f028d72980bd1ab2c61fcd 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestListener.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestListener.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Interface available since Release 2.0.0
@@ -59,36 +59,46 @@ interface PHPUnit_Framework_TestListener
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time);
 
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time);
 
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time);
 
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time);
+
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      * @since  Method available since Release 3.0.0
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time);
@@ -96,7 +106,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time
     /**
      * A test suite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite);
@@ -104,7 +114,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite);
     /**
      * A test suite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite);
@@ -112,15 +122,15 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite);
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test);
 
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time);
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestResult.php b/core/vendor/phpunit/phpunit/src/Framework/TestResult.php
similarity index 64%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/TestResult.php
rename to core/vendor/phpunit/phpunit/src/Framework/TestResult.php
index 8e0c49e36adb6b9a544bd4a34c6bc7d03c0e47e5..f373b082f83a314f17af684dbab8160aeebf2155 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestResult.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestResult.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,23 +49,13 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
  */
 class PHPUnit_Framework_TestResult implements Countable
 {
-    /**
-     * @var boolean
-     */
-    protected static $xdebugLoaded = NULL;
-
-    /**
-     * @var boolean
-     */
-    protected static $useXdebug = NULL;
-
     /**
      * @var array
      */
@@ -91,6 +81,11 @@ class PHPUnit_Framework_TestResult implements Countable
      */
     protected $notImplemented = array();
 
+    /**
+     * @var array
+     */
+    protected $risky = array();
+
     /**
      * @var array
      */
@@ -114,7 +109,7 @@ class PHPUnit_Framework_TestResult implements Countable
     /**
      * @var PHPUnit_Framework_TestSuite
      */
-    protected $topTestSuite = NULL;
+    protected $topTestSuite = null;
 
     /**
      * Code Coverage information.
@@ -126,42 +121,57 @@ class PHPUnit_Framework_TestResult implements Countable
     /**
      * @var boolean
      */
-    protected $convertErrorsToExceptions = TRUE;
+    protected $convertErrorsToExceptions = true;
+
+    /**
+     * @var boolean
+     */
+    protected $stop = false;
+
+    /**
+     * @var boolean
+     */
+    protected $stopOnError = false;
+
+    /**
+     * @var boolean
+     */
+    protected $stopOnFailure = false;
 
     /**
      * @var boolean
      */
-    protected $stop = FALSE;
+    protected $beStrictAboutTestsThatDoNotTestAnything = false;
 
     /**
      * @var boolean
      */
-    protected $stopOnError = FALSE;
+    protected $beStrictAboutOutputDuringTests = false;
 
     /**
      * @var boolean
      */
-    protected $stopOnFailure = FALSE;
+    protected $beStrictAboutTestSize = false;
 
     /**
      * @var boolean
      */
-    protected $strictMode = FALSE;
+    protected $stopOnRisky = false;
 
     /**
      * @var boolean
      */
-    protected $stopOnIncomplete = FALSE;
+    protected $stopOnIncomplete = false;
 
     /**
      * @var boolean
      */
-    protected $stopOnSkipped = FALSE;
+    protected $stopOnSkipped = false;
 
     /**
      * @var boolean
      */
-    protected $lastTestFailed = FALSE;
+    protected $lastTestFailed = false;
 
     /**
      * @var integer
@@ -191,7 +201,7 @@ public function addListener(PHPUnit_Framework_TestListener $listener)
     /**
      * Unregisters a TestListener.
      *
-     * @param  PHPUnit_Framework_TestListener $listener
+     * @param PHPUnit_Framework_TestListener $listener
      */
     public function removeListener(PHPUnit_Framework_TestListener $listener)
     {
@@ -219,13 +229,23 @@ public function flushListeners()
     /**
      * Adds an error to the list of errors.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
-        if ($e instanceof PHPUnit_Framework_IncompleteTest) {
+        if ($e instanceof PHPUnit_Framework_RiskyTest) {
+            $this->risky[] = new PHPUnit_Framework_TestFailure(
+              $test, $e
+            );
+
+            $notifyMethod = 'addRiskyTest';
+
+            if ($this->stopOnRisky) {
+                $this->stop();
+            }
+        } elseif ($e instanceof PHPUnit_Framework_IncompleteTest) {
             $this->notImplemented[] = new PHPUnit_Framework_TestFailure(
               $test, $e
             );
@@ -235,18 +255,14 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
             if ($this->stopOnIncomplete) {
                 $this->stop();
             }
-        }
-
-        else if ($e instanceof PHPUnit_Framework_SkippedTest) {
+        } elseif ($e instanceof PHPUnit_Framework_SkippedTest) {
             $this->skipped[] = new PHPUnit_Framework_TestFailure($test, $e);
             $notifyMethod    = 'addSkippedTest';
 
             if ($this->stopOnSkipped) {
                 $this->stop();
             }
-        }
-
-        else {
+        } else {
             $this->errors[] = new PHPUnit_Framework_TestFailure($test, $e);
             $notifyMethod   = 'addError';
 
@@ -259,7 +275,7 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
             $listener->$notifyMethod($test, $e, $time);
         }
 
-        $this->lastTestFailed = TRUE;
+        $this->lastTestFailed = true;
         $this->time          += $time;
     }
 
@@ -267,13 +283,23 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
      * Adds a failure to the list of failures.
      * The passed in exception caused the failure.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
-        if ($e instanceof PHPUnit_Framework_IncompleteTest) {
+        if ($e instanceof PHPUnit_Framework_RiskyTest) {
+            $this->risky[] = new PHPUnit_Framework_TestFailure(
+              $test, $e
+            );
+
+            $notifyMethod = 'addRiskyTest';
+
+            if ($this->stopOnRisky) {
+                $this->stop();
+            }
+        } elseif ($e instanceof PHPUnit_Framework_IncompleteTest) {
             $this->notImplemented[] = new PHPUnit_Framework_TestFailure(
               $test, $e
             );
@@ -283,18 +309,14 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
             if ($this->stopOnIncomplete) {
                 $this->stop();
             }
-        }
-
-        else if ($e instanceof PHPUnit_Framework_SkippedTest) {
+        } elseif ($e instanceof PHPUnit_Framework_SkippedTest) {
             $this->skipped[] = new PHPUnit_Framework_TestFailure($test, $e);
             $notifyMethod    = 'addSkippedTest';
 
             if ($this->stopOnSkipped) {
                 $this->stop();
             }
-        }
-
-        else {
+        } else {
             $this->failures[] = new PHPUnit_Framework_TestFailure($test, $e);
             $notifyMethod     = 'addFailure';
 
@@ -307,7 +329,7 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
             $listener->$notifyMethod($test, $e, $time);
         }
 
-        $this->lastTestFailed = TRUE;
+        $this->lastTestFailed = true;
         $this->time          += $time;
     }
 
@@ -324,12 +346,12 @@ public function addDeprecatedFeature(PHPUnit_Util_DeprecatedFeature $deprecatedF
     /**
      * Informs the result that a testsuite will be started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     {
-        if ($this->topTestSuite === NULL) {
+        if ($this->topTestSuite === null) {
             $this->topTestSuite = $suite;
         }
 
@@ -341,7 +363,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * Informs the result that a testsuite was completed.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -354,11 +376,11 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * Informs the result that a test will be started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test)
     {
-        $this->lastTestFailed = FALSE;
+        $this->lastTestFailed = false;
         $this->runTests      += count($test);
 
         foreach ($this->listeners as $listener) {
@@ -369,8 +391,8 @@ public function startTest(PHPUnit_Framework_Test $test)
     /**
      * Informs the result that a test was completed.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
@@ -385,7 +407,7 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
             $this->passed[$key] = array(
               'result' => $test->getResult(),
               'size'   => PHPUnit_Util_Test::getSize(
-                            $class, $test->getName(FALSE)
+                            $class, $test->getName(false)
                           )
             );
 
@@ -394,7 +416,29 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
     }
 
     /**
-     * Returns TRUE if no incomplete test occured.
+     * Returns true if no risky test occurred.
+     *
+     * @return boolean
+     * @since  Method available since Release 4.0.0
+     */
+    public function allHarmless()
+    {
+        return $this->riskyCount() == 0;
+    }
+
+    /**
+     * Gets the number of risky tests.
+     *
+     * @return integer
+     * @since  Method available since Release 4.0.0
+     */
+    public function riskyCount()
+    {
+        return count($this->risky);
+    }
+
+    /**
+     * Returns true if no incomplete test occurred.
      *
      * @return boolean
      */
@@ -413,6 +457,17 @@ public function notImplementedCount()
         return count($this->notImplemented);
     }
 
+    /**
+     * Returns an Enumeration for the risky tests.
+     *
+     * @return array
+     * @since  Method available since Release 4.0.0
+     */
+    public function risky()
+    {
+        return $this->risky;
+    }
+
     /**
      * Returns an Enumeration for the incomplete tests.
      *
@@ -424,7 +479,7 @@ public function notImplemented()
     }
 
     /**
-     * Returns TRUE if no test has been skipped.
+     * Returns true if no test has been skipped.
      *
      * @return boolean
      * @since  Method available since Release 3.0.0
@@ -548,36 +603,27 @@ public function topTestSuite()
      */
     public function getCollectCodeCoverageInformation()
     {
-        return $this->codeCoverage !== NULL;
-    }
-
-    /**
-     * Returns the strict mode configuration option
-     *
-     * @return boolean
-     */
-    public function isStrict()
-    {
-        return $this->strictMode;
+        return $this->codeCoverage !== null;
     }
 
     /**
      * Runs a TestCase.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function run(PHPUnit_Framework_Test $test)
     {
         PHPUnit_Framework_Assert::resetCount();
 
-        $error      = FALSE;
-        $failure    = FALSE;
-        $incomplete = FALSE;
-        $skipped    = FALSE;
+        $error      = false;
+        $failure    = false;
+        $incomplete = false;
+        $risky      = false;
+        $skipped    = false;
 
         $this->startTest($test);
 
-        $errorHandlerSet = FALSE;
+        $errorHandlerSet = false;
 
         if ($this->convertErrorsToExceptions) {
             $oldErrorHandler = set_error_handler(
@@ -585,29 +631,21 @@ public function run(PHPUnit_Framework_Test $test)
               E_ALL | E_STRICT
             );
 
-            if ($oldErrorHandler === NULL) {
-                $errorHandlerSet = TRUE;
+            if ($oldErrorHandler === null) {
+                $errorHandlerSet = true;
             } else {
                 restore_error_handler();
             }
         }
 
-        if (self::$xdebugLoaded === NULL) {
-            self::$xdebugLoaded = extension_loaded('xdebug');
-            self::$useXdebug    = self::$xdebugLoaded;
-        }
-
-        $useXdebug = self::$useXdebug &&
-                     $this->codeCoverage !== NULL &&
-                     !$test instanceof PHPUnit_Extensions_SeleniumTestCase &&
-                     !$test instanceof PHPUnit_Framework_Warning;
+        $collectCodeCoverage = $this->codeCoverage !== null &&
+                               !$test instanceof PHPUnit_Extensions_SeleniumTestCase &&
+                               !$test instanceof PHPUnit_Framework_Warning;
 
-        if ($useXdebug) {
+        if ($collectCodeCoverage) {
             // We need to blacklist test source files when no whitelist is used.
             if (!$this->codeCoverage->filter()->hasWhitelist()) {
-                $classes = PHPUnit_Util_Class::getHierarchy(
-                  get_class($test), TRUE
-                );
+                $classes = $this->getHierarchy(get_class($test), true);
 
                 foreach ($classes as $class) {
                     $this->codeCoverage->filter()->addFileToBlacklist(
@@ -623,7 +661,7 @@ public function run(PHPUnit_Framework_Test $test)
 
         try {
             if (!$test instanceof PHPUnit_Framework_Warning &&
-                $this->strictMode &&
+                $this->beStrictAboutTestSize &&
                 extension_loaded('pcntl') && class_exists('PHP_Invoker')) {
                 switch ($test->getSize()) {
                     case PHPUnit_Util_Test::SMALL: {
@@ -647,38 +685,66 @@ public function run(PHPUnit_Framework_Test $test)
             } else {
                 $test->runBare();
             }
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            $failure = TRUE;
-
-            if ($e instanceof PHPUnit_Framework_IncompleteTestError) {
-                $incomplete = TRUE;
-            }
-
-            else if ($e instanceof PHPUnit_Framework_SkippedTestError) {
-                $skipped = TRUE;
+        } catch (PHPUnit_Framework_AssertionFailedError $e) {
+            $failure = true;
+
+            if ($e instanceof PHPUnit_Framework_RiskyTestError) {
+                $risky = true;
+            } elseif ($e instanceof PHPUnit_Framework_IncompleteTestError) {
+                $incomplete = true;
+            } elseif ($e instanceof PHPUnit_Framework_SkippedTestError) {
+                $skipped = true;
             }
-        }
-
-        catch (Exception $e) {
-            $error = TRUE;
+        } catch (Exception $e) {
+            $error = true;
         }
 
         $time = PHP_Timer::stop();
         $test->addToAssertionCount(PHPUnit_Framework_Assert::getCount());
 
-        if ($this->strictMode && $test->getNumAssertions() == 0) {
-            $incomplete = TRUE;
+        if ($this->beStrictAboutTestsThatDoNotTestAnything &&
+            $test->getNumAssertions() == 0) {
+            $risky = true;
         }
 
-        if ($useXdebug) {
-            try {
-                $this->codeCoverage->stop(!$incomplete && !$skipped);
+        if ($collectCodeCoverage) {
+            $append           = !$risky && !$incomplete && !$skipped;
+            $linesToBeCovered = array();
+            $linesToBeUsed    = array();
+
+            if ($append && $test instanceof PHPUnit_Framework_TestCase) {
+                $linesToBeCovered = PHPUnit_Util_Test::getLinesToBeCovered(
+                  get_class($test), $test->getName(false)
+                );
+
+                $linesToBeUsed = PHPUnit_Util_Test::getLinesToBeUsed(
+                  get_class($test), $test->getName(false)
+                );
             }
 
-            catch (PHP_CodeCoverage_Exception $cce) {
-                $error = TRUE;
+            try {
+                $this->codeCoverage->stop(
+                  $append, $linesToBeCovered, $linesToBeUsed
+                );
+            } catch (PHP_CodeCoverage_Exception_UnintentionallyCoveredCode $cce) {
+                $this->addFailure(
+                  $test,
+                  new PHPUnit_Framework_UnintentionallyCoveredCodeError(
+                    'This test executed code that is not listed as code to be covered or used:' .
+                    PHP_EOL . $cce->getMessage()
+                  ),
+                  $time
+                );
+            } catch (PHPUnit_Framework_InvalidCoversTargetException $cce) {
+                $this->addFailure(
+                  $test,
+                  new PHPUnit_Framework_InvalidCoversTargetError(
+                    $cce->getMessage()
+                  ),
+                  $time
+                );
+            } catch (PHP_CodeCoverage_Exception $cce) {
+                $error = true;
 
                 if (!isset($e)) {
                     $e = $cce;
@@ -686,29 +752,24 @@ public function run(PHPUnit_Framework_Test $test)
             }
         }
 
-        if ($errorHandlerSet === TRUE) {
+        if ($errorHandlerSet === true) {
             restore_error_handler();
         }
 
-        if ($error === TRUE) {
+        if ($error === true) {
             $this->addError($test, $e, $time);
-        }
-
-        else if ($failure === TRUE) {
+        } elseif ($failure === true) {
             $this->addFailure($test, $e, $time);
-        }
-
-        else if ($this->strictMode && $test->getNumAssertions() == 0) {
+        } elseif ($this->beStrictAboutTestsThatDoNotTestAnything &&
+                 $test->getNumAssertions() == 0) {
             $this->addFailure(
               $test,
-              new PHPUnit_Framework_IncompleteTestError(
+              new PHPUnit_Framework_RiskyTestError(
                 'This test did not perform any assertions'
               ),
               $time
             );
-        }
-
-        else if ($this->strictMode && $test->hasOutput()) {
+        } elseif ($this->beStrictAboutOutputDuringTests && $test->hasOutput()) {
             $this->addFailure(
               $test,
               new PHPUnit_Framework_OutputError(
@@ -750,7 +811,7 @@ public function shouldStop()
      */
     public function stop()
     {
-        $this->stop = TRUE;
+        $this->stop = true;
     }
 
     /**
@@ -765,10 +826,10 @@ public function getCodeCoverage()
     }
 
     /**
-     * Returns the PHP_CodeCoverage object.
+     * Sets the PHP_CodeCoverage object.
      *
-     * @return PHP_CodeCoverage
-     * @since  Method available since Release 3.6.0
+     * @param PHP_CodeCoverage $codeCoverage
+     * @since Method available since Release 3.6.0
      */
     public function setCodeCoverage(PHP_CodeCoverage $codeCoverage)
     {
@@ -778,17 +839,17 @@ public function setCodeCoverage(PHP_CodeCoverage $codeCoverage)
     /**
      * Enables or disables the error-to-exception conversion.
      *
-     * @param  boolean $flag
+     * @param  boolean                     $flag
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.2.14
      */
     public function convertErrorsToExceptions($flag)
     {
-        if (is_bool($flag)) {
-            $this->convertErrorsToExceptions = $flag;
-        } else {
+        if (!is_bool($flag)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
         }
+
+        $this->convertErrorsToExceptions = $flag;
     }
 
     /**
@@ -805,85 +866,150 @@ public function getConvertErrorsToExceptions()
     /**
      * Enables or disables the stopping when an error occurs.
      *
-     * @param  boolean $flag
+     * @param  boolean                     $flag
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.5.0
      */
     public function stopOnError($flag)
     {
-        if (is_bool($flag)) {
-            $this->stopOnError = $flag;
-        } else {
+        if (!is_bool($flag)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
         }
+
+        $this->stopOnError = $flag;
     }
 
     /**
      * Enables or disables the stopping when a failure occurs.
      *
-     * @param  boolean $flag
+     * @param  boolean                     $flag
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.1.0
      */
     public function stopOnFailure($flag)
     {
-        if (is_bool($flag)) {
-            $this->stopOnFailure = $flag;
-        } else {
+        if (!is_bool($flag)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
         }
+
+        $this->stopOnFailure = $flag;
     }
 
     /**
-     * Enables or disables the strict mode.
-     *
-     * When active
-     *   * Tests that do not assert anything will be marked as incomplete.
-     *   * Tests that are incomplete or skipped yield no code coverage.
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public function beStrictAboutTestsThatDoNotTestAnything($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->beStrictAboutTestsThatDoNotTestAnything = $flag;
+    }
+
+    /**
+     * @return boolean
+     * @since  Method available since Release 4.0.0
+     */
+    public function isStrictAboutTestsThatDoNotTestAnything()
+    {
+        return $this->beStrictAboutTestsThatDoNotTestAnything;
+    }
+
+    /**
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public function beStrictAboutOutputDuringTests($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->beStrictAboutOutputDuringTests = $flag;
+    }
+
+    /**
+     * @return boolean
+     * @since  Method available since Release 4.0.0
+     */
+    public function isStrictAboutOutputDuringTests()
+    {
+        return $this->beStrictAboutOutputDuringTests;
+    }
+
+    /**
+     * @param  boolean                     $flag
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 4.0.0
+     */
+    public function beStrictAboutTestSize($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+
+        $this->beStrictAboutTestSize = $flag;
+    }
+
+    /**
+     * @return boolean
+     * @since  Method available since Release 4.0.0
+     */
+    public function isStrictAboutTestSize()
+    {
+        return $this->beStrictAboutTestSize;
+    }
+
+    /**
+     * Enables or disables the stopping for risky tests.
      *
-     * @param  boolean $flag
+     * @param  boolean                     $flag
      * @throws PHPUnit_Framework_Exception
-     * @since  Method available since Release 3.5.2
+     * @since  Method available since Release 4.0.0
      */
-    public function strictMode($flag)
+    public function stopOnRisky($flag)
     {
-        if (is_bool($flag)) {
-            $this->strictMode = $flag;
-        } else {
+        if (!is_bool($flag)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
         }
+
+        $this->stopOnRisky = $flag;
     }
 
     /**
      * Enables or disables the stopping for incomplete tests.
      *
-     * @param  boolean $flag
+     * @param  boolean                     $flag
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.5.0
      */
     public function stopOnIncomplete($flag)
     {
-        if (is_bool($flag)) {
-            $this->stopOnIncomplete = $flag;
-        } else {
+        if (!is_bool($flag)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
         }
+
+        $this->stopOnIncomplete = $flag;
     }
 
     /**
      * Enables or disables the stopping for skipped tests.
      *
-     * @param  boolean $flag
+     * @param  boolean                     $flag
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.1.0
      */
     public function stopOnSkipped($flag)
     {
-        if (is_bool($flag)) {
-            $this->stopOnSkipped = $flag;
-        } else {
+        if (!is_bool($flag)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
         }
+
+        $this->stopOnSkipped = $flag;
     }
 
     /**
@@ -909,48 +1035,90 @@ public function wasSuccessful()
     /**
      * Sets the timeout for small tests.
      *
-     * @param  integer $timeout
+     * @param  integer                     $timeout
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.6.0
      */
     public function setTimeoutForSmallTests($timeout)
     {
-        if (is_integer($timeout)) {
-            $this->timeoutForSmallTests = $timeout;
-        } else {
+        if (!is_integer($timeout)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
         }
+
+        $this->timeoutForSmallTests = $timeout;
     }
 
     /**
      * Sets the timeout for medium tests.
      *
-     * @param  integer $timeout
+     * @param  integer                     $timeout
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.6.0
      */
     public function setTimeoutForMediumTests($timeout)
     {
-        if (is_integer($timeout)) {
-            $this->timeoutForMediumTests = $timeout;
-        } else {
+        if (!is_integer($timeout)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
         }
+
+        $this->timeoutForMediumTests = $timeout;
     }
 
     /**
      * Sets the timeout for large tests.
      *
-     * @param  integer $timeout
+     * @param  integer                     $timeout
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.6.0
      */
     public function setTimeoutForLargeTests($timeout)
     {
-        if (is_integer($timeout)) {
-            $this->timeoutForLargeTests = $timeout;
-        } else {
+        if (!is_integer($timeout)) {
             throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'integer');
         }
+
+        $this->timeoutForLargeTests = $timeout;
+    }
+
+    /**
+     * Returns the class hierarchy for a given class.
+     *
+     * @param  string  $className
+     * @param  boolean $asReflectionObjects
+     * @return array
+     */
+    protected function getHierarchy($className, $asReflectionObjects = false)
+    {
+        if ($asReflectionObjects) {
+            $classes = array(new ReflectionClass($className));
+        } else {
+            $classes = array($className);
+        }
+
+        $done = false;
+
+        while (!$done) {
+            if ($asReflectionObjects) {
+                $class = new ReflectionClass(
+                  $classes[count($classes)-1]->getName()
+                );
+            } else {
+                $class = new ReflectionClass($classes[count($classes)-1]);
+            }
+
+            $parent = $class->getParentClass();
+
+            if ($parent !== false) {
+                if ($asReflectionObjects) {
+                    $classes[] = $parent;
+                } else {
+                    $classes[] = $parent->getName();
+                }
+            } else {
+                $done = true;
+            }
+        }
+
+        return $classes;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite.php b/core/vendor/phpunit/phpunit/src/Framework/TestSuite.php
similarity index 70%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite.php
rename to core/vendor/phpunit/phpunit/src/Framework/TestSuite.php
index 70e4eb54f9a20bda823011f10a86eb4de4709ce9..03f36cd260ae2c10f801f1b401016b66a445e30e 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestSuite.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -74,7 +74,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -84,49 +84,59 @@ class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Fra
     /**
      * Enable or disable the backup and restoration of the $GLOBALS array.
      *
-     * @var    boolean
+     * @var boolean
      */
-    protected $backupGlobals = NULL;
+    protected $backupGlobals = null;
 
     /**
      * Enable or disable the backup and restoration of static attributes.
      *
-     * @var    boolean
+     * @var boolean
      */
-    protected $backupStaticAttributes = NULL;
+    protected $backupStaticAttributes = null;
+
+    /**
+     * @var boolean
+     */
+    protected $runTestInSeparateProcess = false;
 
     /**
      * The name of the test suite.
      *
-     * @var    string
+     * @var string
      */
     protected $name = '';
 
     /**
      * The test groups of the test suite.
      *
-     * @var    array
+     * @var array
      */
     protected $groups = array();
 
     /**
      * The tests in the test suite.
      *
-     * @var    array
+     * @var array
      */
     protected $tests = array();
 
     /**
      * The number of tests in the test suite.
      *
-     * @var    integer
+     * @var integer
      */
     protected $numTests = -1;
 
     /**
      * @var boolean
      */
-    protected $testCase = FALSE;
+    protected $testCase = false;
+
+    /**
+     * @var PHPUnit_Runner_Filter_Factory
+     */
+    private $iteratorFilter = null;
 
     /**
      * Constructs a new TestSuite:
@@ -145,33 +155,30 @@ class PHPUnit_Framework_TestSuite implements PHPUnit_Framework_Test, PHPUnit_Fra
      *     name of an existing class) or constructs an empty TestSuite
      *     with the given name.
      *
-     * @param  mixed  $theClass
-     * @param  string $name
+     * @param  mixed                       $theClass
+     * @param  string                      $name
      * @throws PHPUnit_Framework_Exception
      */
     public function __construct($theClass = '', $name = '')
     {
-        $argumentsValid = FALSE;
+        $argumentsValid = false;
 
         if (is_object($theClass) &&
             $theClass instanceof ReflectionClass) {
-            $argumentsValid = TRUE;
-        }
-
-        else if (is_string($theClass) &&
+            $argumentsValid = true;
+        } elseif (is_string($theClass) &&
                  $theClass !== '' &&
-                 class_exists($theClass, FALSE)) {
-            $argumentsValid = TRUE;
+                 class_exists($theClass, false)) {
+            $argumentsValid = true;
 
             if ($name == '') {
                 $name = $theClass;
             }
 
             $theClass = new ReflectionClass($theClass);
-        }
-
-        else if (is_string($theClass)) {
+        } elseif (is_string($theClass)) {
             $this->setName($theClass);
+
             return;
         }
 
@@ -193,7 +200,7 @@ class_exists($theClass, FALSE)) {
 
         $constructor = $theClass->getConstructor();
 
-        if ($constructor !== NULL &&
+        if ($constructor !== null &&
             !$constructor->isPublic()) {
             $this->addTest(
               self::warning(
@@ -224,7 +231,7 @@ class_exists($theClass, FALSE)) {
             );
         }
 
-        $this->testCase = TRUE;
+        $this->testCase = true;
     }
 
     /**
@@ -240,8 +247,8 @@ public function toString()
     /**
      * Adds a test to the suite.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  array                  $groups
+     * @param PHPUnit_Framework_Test $test
+     * @param array                  $groups
      */
     public function addTest(PHPUnit_Framework_Test $test, $groups = array())
     {
@@ -273,7 +280,7 @@ public function addTest(PHPUnit_Framework_Test $test, $groups = array())
     /**
      * Adds the tests from the given class to the suite.
      *
-     * @param  mixed $testClass
+     * @param  mixed                       $testClass
      * @throws PHPUnit_Framework_Exception
      */
     public function addTestSuite($testClass)
@@ -290,10 +297,8 @@ public function addTestSuite($testClass)
 
         if ($testClass instanceof PHPUnit_Framework_TestSuite) {
             $this->addTest($testClass);
-        }
-
-        else if ($testClass instanceof ReflectionClass) {
-            $suiteMethod = FALSE;
+        } elseif ($testClass instanceof ReflectionClass) {
+            $suiteMethod = false;
 
             if (!$testClass->isAbstract()) {
                 if ($testClass->hasMethod(PHPUnit_Runner_BaseTestRunner::SUITE_METHODNAME)) {
@@ -303,10 +308,10 @@ public function addTestSuite($testClass)
 
                     if ($method->isStatic()) {
                         $this->addTest(
-                          $method->invoke(NULL, $testClass->getName())
+                          $method->invoke(null, $testClass->getName())
                         );
 
-                        $suiteMethod = TRUE;
+                        $suiteMethod = true;
                     }
                 }
             }
@@ -314,9 +319,7 @@ public function addTestSuite($testClass)
             if (!$suiteMethod && !$testClass->isAbstract()) {
                 $this->addTest(new PHPUnit_Framework_TestSuite($testClass));
             }
-        }
-
-        else {
+        } else {
             throw new PHPUnit_Framework_Exception;
         }
     }
@@ -329,10 +332,10 @@ public function addTestSuite($testClass)
      * added, a <code>PHPUnit_Framework_Warning</code> will be created instead,
      * leaving the current test run untouched.
      *
-     * @param  string  $filename
-     * @param  array   $phptOptions Array with ini settings for the php instance
-     *                              run, key being the name if the setting,
-     *                              value the ini value.
+     * @param  string                      $filename
+     * @param  array                       $phptOptions Array with ini settings for the php instance
+     *                                                  run, key being the name if the setting,
+     *                                                  value the ini value.
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 2.3.0
      * @author Stefano F. Rausch <stefano@rausch-e.net>
@@ -351,9 +354,9 @@ public function addTestFile($filename, $phptOptions = array())
             return;
         }
 
-        PHPUnit_Util_Class::collectStart();
+        $classes    = get_declared_classes();
         $filename   = PHPUnit_Util_Fileloader::checkAndLoad($filename);
-        $newClasses = PHPUnit_Util_Class::collectEnd();
+        $newClasses = array_values(array_diff(get_declared_classes(), $classes));
         $baseName   = str_replace('.php', '', basename($filename));
 
         foreach ($newClasses as $className) {
@@ -367,8 +370,6 @@ public function addTestFile($filename, $phptOptions = array())
             }
         }
 
-        $testsFound = FALSE;
-
         foreach ($newClasses as $className) {
             $class = new ReflectionClass($className);
 
@@ -379,16 +380,10 @@ public function addTestFile($filename, $phptOptions = array())
                     );
 
                     if ($method->isStatic()) {
-                        $this->addTest($method->invoke(NULL, $className));
-
-                        $testsFound = TRUE;
+                        $this->addTest($method->invoke(null, $className));
                     }
-                }
-
-                else if ($class->implementsInterface('PHPUnit_Framework_Test')) {
+                } elseif ($class->implementsInterface('PHPUnit_Framework_Test')) {
                     $this->addTestSuite($class);
-
-                    $testsFound = TRUE;
                 }
             }
         }
@@ -399,7 +394,7 @@ public function addTestFile($filename, $phptOptions = array())
     /**
      * Wrapper for addTestFile() that adds multiple test files.
      *
-     * @param  array|Iterator $filenames
+     * @param  array|Iterator              $filenames
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 2.3.0
      */
@@ -413,7 +408,7 @@ public function addTestFiles($filenames)
         }
 
         foreach ($filenames as $filename) {
-            $this->addTestFile((string)$filename);
+            $this->addTestFile((string) $filename);
         }
     }
 
@@ -424,22 +419,18 @@ public function addTestFiles($filenames)
      */
     public function count()
     {
-        if ($this->numTests > -1) {
-            return $this->numTests;
-        }
-
-        $this->numTests = 0;
+        $numTests = 0;
 
-        foreach ($this->tests as $test) {
-            $this->numTests += count($test);
+        foreach ($this as $test) {
+            $numTests += count($test);
         }
 
-        return $this->numTests;
+        return $numTests;
     }
 
     /**
-     * @param  ReflectionClass $theClass
-     * @param  string          $name
+     * @param  ReflectionClass             $theClass
+     * @param  string                      $name
      * @return PHPUnit_Framework_Test
      * @throws PHPUnit_Framework_Exception
      */
@@ -465,7 +456,7 @@ public static function createTest(ReflectionClass $theClass, $name)
 
         $constructor = $theClass->getConstructor();
 
-        if ($constructor !== NULL) {
+        if ($constructor !== null) {
             $parameters = $constructor->getParameters();
 
             // TestCase() or TestCase($name)
@@ -479,9 +470,7 @@ public static function createTest(ReflectionClass $theClass, $name)
                     $data = PHPUnit_Util_Test::getProvidedData(
                       $className, $name
                     );
-                }
-
-                catch (Exception $e) {
+                } catch (Exception $e) {
                     $message = sprintf(
                       'The data provider specified for %s::%s is invalid.',
                       $className,
@@ -516,27 +505,25 @@ public static function createTest(ReflectionClass $theClass, $name)
 
                     if ($data instanceof PHPUnit_Framework_Warning) {
                         $test->addTest($data, $groups);
-                    }
-
-                    else {
+                    } else {
                         foreach ($data as $_dataName => $_data) {
                             $_test = new $className($name, $_data, $_dataName);
 
                             if ($runTestInSeparateProcess) {
-                                $_test->setRunTestInSeparateProcess(TRUE);
+                                $_test->setRunTestInSeparateProcess(true);
 
-                                if ($preserveGlobalState !== NULL) {
+                                if ($preserveGlobalState !== null) {
                                     $_test->setPreserveGlobalState($preserveGlobalState);
                                 }
                             }
 
-                            if ($backupSettings['backupGlobals'] !== NULL) {
+                            if ($backupSettings['backupGlobals'] !== null) {
                                 $_test->setBackupGlobals(
                                   $backupSettings['backupGlobals']
                                 );
                             }
 
-                            if ($backupSettings['backupStaticAttributes'] !== NULL) {
+                            if ($backupSettings['backupStaticAttributes'] !== null) {
                                 $_test->setBackupStaticAttributes(
                                   $backupSettings['backupStaticAttributes']
                                 );
@@ -545,9 +532,7 @@ public static function createTest(ReflectionClass $theClass, $name)
                             $test->addTest($_test, $groups);
                         }
                     }
-                }
-
-                else {
+                } else {
                     $test = new $className;
                 }
             }
@@ -561,18 +546,18 @@ public static function createTest(ReflectionClass $theClass, $name)
             $test->setName($name);
 
             if ($runTestInSeparateProcess) {
-                $test->setRunTestInSeparateProcess(TRUE);
+                $test->setRunTestInSeparateProcess(true);
 
-                if ($preserveGlobalState !== NULL) {
+                if ($preserveGlobalState !== null) {
                     $test->setPreserveGlobalState($preserveGlobalState);
                 }
             }
 
-            if ($backupSettings['backupGlobals'] !== NULL) {
+            if ($backupSettings['backupGlobals'] !== null) {
                 $test->setBackupGlobals($backupSettings['backupGlobals']);
             }
 
-            if ($backupSettings['backupStaticAttributes'] !== NULL) {
+            if ($backupSettings['backupStaticAttributes'] !== null) {
                 $test->setBackupStaticAttributes(
                   $backupSettings['backupStaticAttributes']
                 );
@@ -613,162 +598,116 @@ public function getGroups()
         return array_keys($this->groups);
     }
 
+    public function getGroupDetails()
+    {
+        return $this->groups;
+    }
+
+    /**
+     * Set tests groups of the test case
+     *
+     * @param array $groups
+     * @since Method available since Release 4.0.0
+     */
+    public function setGroupDetails(array $groups)
+    {
+        $this->groups = $groups;
+    }
+
     /**
      * Runs the tests and collects their result in a TestResult.
      *
-     * @param  PHPUnit_Framework_TestResult $result
-     * @param  mixed                        $filter
-     * @param  array                        $groups
-     * @param  array                        $excludeGroups
-     * @param  boolean                      $processIsolation
+     * @param PHPUnit_Framework_TestResult $result
      * @return PHPUnit_Framework_TestResult
-     * @throws PHPUnit_Framework_Exception
      */
-    public function run(PHPUnit_Framework_TestResult $result = NULL, $filter = FALSE, array $groups = array(), array $excludeGroups = array(), $processIsolation = FALSE)
+    public function run(PHPUnit_Framework_TestResult $result = null)
     {
-        if ($result === NULL) {
+        if ($result === null) {
             $result = $this->createResult();
         }
 
-        $result->startTestSuite($this);
-
-        $doSetup = TRUE;
-
-        if (!empty($excludeGroups)) {
-            foreach ($this->groups as $_group => $_tests) {
-                if (in_array($_group, $excludeGroups) &&
-                    count($_tests) == count($this->tests)) {
-                    $doSetup = FALSE;
-                }
-            }
+        if (count($this) == 0) {
+            return $result;
         }
 
-        if ($doSetup) {
-            try {
-                $this->setUp();
+        $hookMethods = PHPUnit_Util_Test::getHookMethods($this->name);
 
-                if ($this->testCase &&
-                    // Some extensions use test names that are not classes;
-                    // The method_exists() triggers an autoload call that causes issues with die()ing autoloaders.
-                    class_exists($this->name, false) &&
-                    method_exists($this->name, 'setUpBeforeClass')) {
-                    call_user_func(array($this->name, 'setUpBeforeClass'));
-                }
-            }
+        $result->startTestSuite($this);
 
-            catch (PHPUnit_Framework_SkippedTestSuiteError $e) {
-                $numTests = count($this);
+        try {
+            $this->setUp();
 
-                for ($i = 0; $i < $numTests; $i++) {
-                    $result->addFailure($this, $e, 0);
+            foreach ($hookMethods['beforeClass'] as $beforeClassMethod) {
+                if ($this->testCase === true && class_exists($this->name, false) && method_exists($this->name, $beforeClassMethod)) {
+                    call_user_func(array($this->name, $beforeClassMethod));
                 }
-
-                return $result;
             }
+        } catch (PHPUnit_Framework_SkippedTestSuiteError $e) {
+            $numTests = count($this);
 
-            catch (Exception $e) {
-                $numTests = count($this);
-
-                for ($i = 0; $i < $numTests; $i++) {
-                    $result->addError($this, $e, 0);
-                }
-
-                return $result;
+            for ($i = 0; $i < $numTests; $i++) {
+                $result->addFailure($this, $e, 0);
             }
-        }
 
-        if (empty($groups)) {
-            $tests = $this->tests;
-        } else {
-            $tests = new SplObjectStorage;
+            return $result;
+        } catch (Exception $e) {
+            $numTests = count($this);
 
-            foreach ($groups as $group) {
-                if (isset($this->groups[$group])) {
-                    foreach ($this->groups[$group] as $test) {
-                        $tests->attach($test);
-                    }
-                }
+            for ($i = 0; $i < $numTests; $i++) {
+                $result->addError($this, $e, 0);
             }
+
+            return $result;
         }
 
-        foreach ($tests as $test) {
+        foreach ($this as $test) {
             if ($result->shouldStop()) {
                 break;
             }
 
-            if ($test instanceof PHPUnit_Framework_TestSuite) {
+            if ($test instanceof PHPUnit_Framework_TestCase ||
+                $test instanceof PHPUnit_Framework_TestSuite) {
                 $test->setBackupGlobals($this->backupGlobals);
                 $test->setBackupStaticAttributes($this->backupStaticAttributes);
-
-                $test->run(
-                  $result, $filter, $groups, $excludeGroups, $processIsolation
-                );
-            } else {
-                $runTest = TRUE;
-
-                if ($filter !== FALSE ) {
-                    $tmp = PHPUnit_Util_Test::describe($test, FALSE);
-
-                    if ($tmp[0] != '') {
-                        $name = join('::', $tmp);
-                    } else {
-                        $name = $tmp[1];
-                    }
-
-                    if (preg_match($filter, $name) == 0) {
-                        $runTest = FALSE;
-                    }
-                }
-
-                if ($runTest && !empty($excludeGroups)) {
-                    foreach ($this->groups as $_group => $_tests) {
-                        if (in_array($_group, $excludeGroups)) {
-                            foreach ($_tests as $_test) {
-                                if ($test === $_test) {
-                                    $runTest = FALSE;
-                                    break 2;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if ($runTest) {
-                    if ($test instanceof PHPUnit_Framework_TestCase) {
-                        $test->setBackupGlobals($this->backupGlobals);
-                        $test->setBackupStaticAttributes(
-                          $this->backupStaticAttributes
-                        );
-                        $test->setRunTestInSeparateProcess($processIsolation);
-                    }
-
-                    $this->runTest($test, $result);
-                }
+                $test->setRunTestInSeparateProcess($this->runTestInSeparateProcess);
             }
+
+            $test->run($result);
         }
 
-        if ($doSetup) {
-            if ($this->testCase &&
-                // Some extensions use test names that are not classes;
-                // The method_exists() triggers an autoload call that causes issues with die()ing autoloaders.
-                class_exists($this->name, false) &&
-                method_exists($this->name, 'tearDownAfterClass')) {
-                call_user_func(array($this->name, 'tearDownAfterClass'));
+        foreach ($hookMethods['afterClass'] as $afterClassMethod) {
+            if ($this->testCase === true && class_exists($this->name, false) && method_exists($this->name, $afterClassMethod)) {
+                call_user_func(array($this->name, $afterClassMethod));
             }
-
-            $this->tearDown();
         }
 
+        $this->tearDown();
+
         $result->endTestSuite($this);
 
         return $result;
     }
 
+    /**
+     * @param  boolean                     $runTestInSeparateProcess
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.7.0
+     */
+    public function setRunTestInSeparateProcess($runTestInSeparateProcess)
+    {
+        if (is_bool($runTestInSeparateProcess)) {
+            $this->runTestInSeparateProcess = $runTestInSeparateProcess;
+        } else {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'boolean');
+        }
+    }
+
     /**
      * Runs a test.
      *
-     * @param  PHPUnit_Framework_Test        $test
-     * @param  PHPUnit_Framework_TestResult  $result
+     * @deprecated
+     * @param PHPUnit_Framework_Test       $test
+     * @param PHPUnit_Framework_TestResult $result
      */
     public function runTest(PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result)
     {
@@ -796,7 +735,7 @@ public function testAt($index)
         if (isset($this->tests[$index])) {
             return $this->tests[$index];
         } else {
-            return FALSE;
+            return false;
         }
     }
 
@@ -810,10 +749,21 @@ public function tests()
         return $this->tests;
     }
 
+    /**
+     * Set tests of the test suite
+     *
+     * @param array $tests
+     * @since Method available since Release 4.0.0
+     */
+    public function setTests(array $tests)
+    {
+        $this->tests = $tests;
+    }
+
     /**
      * Mark the test suite as skipped.
      *
-     * @param  string  $message
+     * @param  string                                  $message
      * @throws PHPUnit_Framework_SkippedTestSuiteError
      * @since  Method available since Release 3.0.0
      */
@@ -828,43 +778,38 @@ public function markTestSuiteSkipped($message = '')
      */
     protected function addTestMethod(ReflectionClass $class, ReflectionMethod $method)
     {
-        $name = $method->getName();
+        if (!$this->isTestMethod($method))
+            return;
 
-        if ($this->isPublicTestMethod($method)) {
-            $test = self::createTest($class, $name);
+        $name = $method->getName();
 
-            if ($test instanceof PHPUnit_Framework_TestCase ||
-                $test instanceof PHPUnit_Framework_TestSuite_DataProvider) {
-                $test->setDependencies(
-                  PHPUnit_Util_Test::getDependencies($class->getName(), $name)
+        if (!$method->isPublic()) {
+            $this->addTest(
+                self::warning(
+                    sprintf(
+                        'Test method "%s" in test class "%s" is not public.',
+                        $name,
+                        $class->getName()
+                        )
+                    )
                 );
-            }
 
-            $this->addTest($test, PHPUnit_Util_Test::getGroups(
-              $class->getName(), $name)
-            );
+            return;
         }
 
-        else if ($this->isTestMethod($method)) {
-            $this->addTest(
-              self::warning(
-                sprintf(
-                  'Test method "%s" in test class "%s" is not public.',
-                  $name,
-                  $class->getName()
-                )
-              )
+        $test = self::createTest($class, $name);
+
+        if ($test instanceof PHPUnit_Framework_TestCase ||
+            $test instanceof PHPUnit_Framework_TestSuite_DataProvider) {
+            $test->setDependencies(
+                PHPUnit_Util_Test::getDependencies($class->getName(), $name)
             );
         }
-    }
 
-    /**
-     * @param  ReflectionMethod $method
-     * @return boolean
-     */
-    public static function isPublicTestMethod(ReflectionMethod $method)
-    {
-        return (self::isTestMethod($method) && $method->isPublic());
+        $this->addTest(
+            $test,
+            PHPUnit_Util_Test::getGroups($class->getName(), $name)
+        );
     }
 
     /**
@@ -874,17 +819,19 @@ public static function isPublicTestMethod(ReflectionMethod $method)
     public static function isTestMethod(ReflectionMethod $method)
     {
         if (strpos($method->name, 'test') === 0) {
-            return TRUE;
+            return true;
         }
 
         // @scenario on TestCase::testMethod()
         // @test     on TestCase::testMethod()
-        return strpos($method->getDocComment(), '@test')     !== FALSE ||
-               strpos($method->getDocComment(), '@scenario') !== FALSE;
+        $doc_comment = $method->getDocComment();
+
+        return strpos($doc_comment, '@test')     !== false ||
+               strpos($doc_comment, '@scenario') !== false;
     }
 
     /**
-     * @param  string  $message
+     * @param  string                    $message
      * @return PHPUnit_Framework_Warning
      */
     protected static function warning($message)
@@ -893,7 +840,7 @@ protected static function warning($message)
     }
 
     /**
-     * @param  boolean $backupGlobals
+     * @param boolean $backupGlobals
      * @since  Method available since Release 3.3.0
      */
     public function setBackupGlobals($backupGlobals)
@@ -904,7 +851,7 @@ public function setBackupGlobals($backupGlobals)
     }
 
     /**
-     * @param  boolean $backupStaticAttributes
+     * @param boolean $backupStaticAttributes
      * @since  Method available since Release 3.4.0
      */
     public function setBackupStaticAttributes($backupStaticAttributes)
@@ -923,9 +870,23 @@ public function setBackupStaticAttributes($backupStaticAttributes)
      */
     public function getIterator()
     {
-        return new RecursiveIteratorIterator(
-          new PHPUnit_Util_TestSuiteIterator($this)
-        );
+        $iterator = new PHPUnit_Util_TestSuiteIterator($this);
+
+        if ($this->iteratorFilter !== null) {
+            $iterator = $this->iteratorFilter->factory($iterator, $this);
+        }
+
+        return $iterator;
+    }
+
+    public function injectFilter(PHPUnit_Runner_Filter_Factory $filter)
+    {
+        $this->iteratorFilter = $filter;
+        foreach ($this as $test) {
+            if ($test instanceof PHPUnit_Framework_TestSuite) {
+                $test->injectFilter($filter);
+            }
+        }
     }
 
     /**
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite/DataProvider.php b/core/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite/DataProvider.php
rename to core/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
index b0ebf10e1e002fc15bb5e998e07eee34f9285754..a8e28a9472bbcaf609e3c3a52e14640dedddc70c 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/TestSuite/DataProvider.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework_TestSuite
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.4.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework_TestSuite
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.4.0
diff --git a/core/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php b/core/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
new file mode 100644
index 0000000000000000000000000000000000000000..6e0954d58c903586d87be64b47397ce92742fffa
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
+ * case of a test test that unintentionally covers code.
+ *
+ * @package    PHPUnit
+ * @subpackage Framework
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Framework_UnintentionallyCoveredCodeError extends PHPUnit_Framework_RiskyTestError
+{
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Warning.php b/core/vendor/phpunit/phpunit/src/Framework/Warning.php
similarity index 87%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Warning.php
rename to core/vendor/phpunit/phpunit/src/Framework/Warning.php
index b2516e7b4e4d960f73907e97c5aff607664d8a85..0fcb9316963b56a201d9a89c2f6555d45baf419c 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Warning.php
+++ b/core/vendor/phpunit/phpunit/src/Framework/Warning.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Framework
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -64,27 +64,22 @@ class PHPUnit_Framework_Warning extends PHPUnit_Framework_TestCase
     /**
      * @var boolean
      */
-    protected $backupGlobals = FALSE;
+    protected $backupGlobals = false;
 
     /**
      * @var boolean
      */
-    protected $backupStaticAttributes = FALSE;
+    protected $backupStaticAttributes = false;
 
     /**
      * @var boolean
      */
-    protected $runTestInSeparateProcess = FALSE;
+    protected $runTestInSeparateProcess = false;
 
     /**
      * @var boolean
      */
-    protected $useErrorHandler = FALSE;
-
-    /**
-     * @var boolean
-     */
-    protected $useOutputBuffering = FALSE;
+    protected $useErrorHandler = false;
 
     /**
      * @param string $message
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Runner/BaseTestRunner.php b/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
similarity index 85%
rename from core/vendor/phpunit/phpunit/PHPUnit/Runner/BaseTestRunner.php
rename to core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
index d6663f6ac1ee6b30925f97a3e5b8972a7e93df4e..d92b200fd1c09002f4fd8f20eb82766da25749f3 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Runner/BaseTestRunner.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/BaseTestRunner.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -61,6 +61,7 @@ abstract class PHPUnit_Runner_BaseTestRunner
     const STATUS_INCOMPLETE = 2;
     const STATUS_FAILURE    = 3;
     const STATUS_ERROR      = 4;
+    const STATUS_RISKY      = 5;
     const SUITE_METHODNAME  = 'suite';
 
     /**
@@ -78,9 +79,9 @@ public function getLoader()
      * This is a template method, subclasses override
      * the runFailed() and clearStatus() methods.
      *
-     * @param  string  $suiteClassName
-     * @param  string  $suiteClassFile
-     * @param  mixed   $suffixes
+     * @param  string                 $suiteClassName
+     * @param  string                 $suiteClassFile
+     * @param  mixed                  $suffixes
      * @return PHPUnit_Framework_Test
      */
     public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '')
@@ -102,11 +103,10 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '')
             $testClass = $this->loadSuiteClass(
               $suiteClassName, $suiteClassFile
             );
-        }
-
-        catch (Exception $e) {
+        } catch (PHPUnit_Framework_Exception $e) {
             $this->runFailed($e->getMessage());
-            return NULL;
+
+            return null;
         }
 
         try {
@@ -117,14 +117,12 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '')
                   'suite() method must be static.'
                 );
 
-                return NULL;
+                return null;
             }
 
             try {
-                $test = $suiteMethod->invoke(NULL, $testClass->getName());
-            }
-
-            catch (ReflectionException $e) {
+                $test = $suiteMethod->invoke(null, $testClass->getName());
+            } catch (ReflectionException $e) {
                 $this->runFailed(
                   sprintf(
                     "Failed to invoke suite() method.\n%s",
@@ -133,16 +131,12 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '')
                   )
                 );
 
-                return NULL;
+                return null;
             }
-        }
-
-        catch (ReflectionException $e) {
+        } catch (ReflectionException $e) {
             try {
                 $test = new PHPUnit_Framework_TestSuite($testClass);
-            }
-
-            catch (PHPUnit_Framework_Exception $e) {
+            } catch (PHPUnit_Framework_Exception $e) {
                 $test = new PHPUnit_Framework_TestSuite;
                 $test->setName($suiteClassName);
             }
@@ -156,8 +150,8 @@ public function getTest($suiteClassName, $suiteClassFile = '', $suffixes = '')
     /**
      * Returns the loaded ReflectionClass for a suite name.
      *
-     * @param  string  $suiteClassName
-     * @param  string  $suiteClassFile
+     * @param  string          $suiteClassName
+     * @param  string          $suiteClassFile
      * @return ReflectionClass
      */
     protected function loadSuiteClass($suiteClassName, $suiteClassFile = '')
@@ -183,7 +177,7 @@ protected function clearStatus()
      * Override to define how to handle a failed loading of
      * a test suite.
      *
-     * @param  string  $message
+     * @param string $message
      */
     abstract protected function runFailed($message);
 }
diff --git a/core/vendor/phpunit/phpunit/src/Runner/Exception.php b/core/vendor/phpunit/phpunit/src/Runner/Exception.php
new file mode 100644
index 0000000000000000000000000000000000000000..bce04aec667d1985a2e7f1ea3ee2ccbb6975f00e
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Runner/Exception.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Runner_Exception extends RuntimeException implements PHPUnit_Exception
+{
+}
diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b2abf1f36d9b06abdd392564d375dac27d957d5
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Factory.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Runner_Filter_Factory
+{
+    /**
+     * @var array
+     */
+    private $filters = array();
+
+    /**
+     * @param ReflectionClass $filter
+     * @param mixed           $args
+     */
+    public function addFilter(ReflectionClass $filter, $args)
+    {
+        if (!$filter->isSubclassOf('RecursiveFilterIterator')) {
+            throw new InvalidArgumentException(
+              sprintf(
+                'Class "%s" does not extend RecursiveFilterIterator',
+                $filter->name
+              )
+            );
+        }
+
+        $this->filters[] = array($filter, $args);
+    }
+
+    /**
+     * @return FilterIterator
+     */
+    public function factory(Iterator $iterator, PHPUnit_Framework_TestSuite $suite)
+    {
+        foreach ($this->filters as $filter) {
+            list($class, $args) = $filter;
+            $iterator = $class->newInstance($iterator, $args, $suite);
+        }
+
+        return $iterator;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php
new file mode 100644
index 0000000000000000000000000000000000000000..ee097ce73297570b1bdf88250e8646feb8893310
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+abstract class PHPUnit_Runner_Filter_GroupFilterIterator extends RecursiveFilterIterator
+{
+    /**
+     * @var array
+     */
+    protected $groupTests = array();
+
+    /**
+     * @param RecursiveIterator           $iterator
+     * @param array                       $groups
+     * @param PHPUnit_Framework_TestSuite $suite
+     */
+    public function __construct(RecursiveIterator $iterator, array $groups, PHPUnit_Framework_TestSuite $suite)
+    {
+        parent::__construct($iterator);
+
+        foreach ($suite->getGroupDetails() as $group => $tests) {
+            if (in_array($group, $groups)) {
+                $testHashes = array_map(
+                  function ($test) { return spl_object_hash($test); },
+                  $tests
+                );
+
+                $this->groupTests = array_merge($this->groupTests, $testHashes);
+            }
+        }
+    }
+
+    /**
+     * @return boolean
+     */
+    public function accept()
+    {
+        $test = $this->getInnerIterator()->current();
+
+        if ($test instanceof PHPUnit_Framework_TestSuite) {
+            return true;
+        }
+
+        return $this->doAccept(spl_object_hash($test));
+    }
+
+    abstract protected function doAccept($hash);
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Default.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
similarity index 77%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Default.php
rename to core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
index c8b53a7937b391b9a9364a65c6a9ed8144197e87..e2a22d0656c38af80b98ab4940d1cfb2365e9904 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Default.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,33 +35,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit
- * @subpackage Util
+ * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
- * @since      File available since Release 3.5.12
+ * @since      File available since Release 4.0.0
  */
 
 /**
- * Default utility for PHP sub-processes.
- *
  * @package    PHPUnit
- * @subpackage Util
+ * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.5.12
+ * @since      Class available since Release 4.0.0
  */
-class PHPUnit_Util_PHP_Default extends PHPUnit_Util_PHP
+class PHPUnit_Runner_Filter_Group_Exclude extends PHPUnit_Runner_Filter_GroupFilterIterator
 {
-    /**
-     * @param resource $pipe
-     * @since Method available since Release 3.5.12
-     */
-    protected function process($pipe, $job)
+    protected function doAccept($hash)
     {
-        fwrite($pipe, $job);
+        return !in_array($hash, $this->groupTests);
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase/Logger.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
similarity index 79%
rename from core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase/Logger.php
rename to core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
index f8eda20c1b58a27a1ec6f5e5e7b6fc25cf3b2235..ce8cd826ceadbe2805b6ee706458c3b1abb0f053 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Extensions/PhptTestCase/Logger.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Group/Include.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,28 +35,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  * @package    PHPUnit
- * @subpackage Extensions_PhptTestCase
+ * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
- * @since      File available since Release 3.1.4
+ * @since      File available since Release 4.0.0
  */
 
 /**
- * Dummy logger for PEAR_RunTest.
- *
  * @package    PHPUnit
- * @subpackage Extensions_PhptTestCase
+ * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.1.4
+ * @since      Class available since Release 4.0.0
  */
-class PHPUnit_Extensions_PhptTestCase_Logger
+class PHPUnit_Runner_Filter_Group_Include extends PHPUnit_Runner_Filter_GroupFilterIterator
 {
-    public function log($level, $msg, $append_crlf = TRUE)
+    protected function doAccept($hash)
     {
+        return in_array($hash, $this->groupTests);
     }
 }
diff --git a/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php b/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..106b8a98be91eadaaa5f25a88b82ee7230bd9139
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Runner/Filter/Test.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * @package    PHPUnit
+ * @subpackage Runner
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Runner_Filter_Test extends RecursiveFilterIterator
+{
+    /**
+     * @var string
+     */
+    protected $filter = null;
+
+    /**
+     * @var integer
+     */
+    protected $filterMin;
+    /**
+     * @var integer
+     */
+    protected $filterMax;
+
+    /**
+     * @param RecursiveIterator $iterator
+     * @param string            $filter
+     */
+    public function __construct(RecursiveIterator $iterator, $filter)
+    {
+        parent::__construct($iterator);
+        $this->setFilter($filter);
+    }
+
+    /**
+     * @param string $filter
+     */
+    protected function setFilter($filter)
+    {
+        if ($filter[0] != substr($filter, -1) ||
+            preg_match('/^[a-zA-Z0-9_]/', $filter)) {
+
+            // Handles:
+            //  * testAssertEqualsSucceeds#4
+            //  * testAssertEqualsSucceeds#4-8
+            if (preg_match('/^(.*?)#(\d+)(?:-(\d+))?$/', $filter, $matches)) {
+                if (isset($matches[3]) && $matches[2] < $matches[3]) {
+                    $filter = sprintf(
+                      '%s.*with data set #(\d+)$',
+                      $matches[1]
+                    );
+
+                    $this->filterMin = $matches[2];
+                    $this->filterMax = $matches[3];
+                } else {
+                    $filter = sprintf(
+                      '%s.*with data set #%s$',
+                      $matches[1],
+                      $matches[2]
+                    );
+                }
+            }
+
+            // Handles:
+            //  * testDetermineJsonError@JSON_ERROR_NONE
+            //  * testDetermineJsonError@JSON.*
+            elseif (preg_match('/^(.*?)@(.+)$/', $filter, $matches)) {
+                $filter = sprintf(
+                  '%s.*with data set "%s"$',
+                  $matches[1],
+                  $matches[2]
+                );
+            }
+
+            // Escape delimiters in regular expression. Do NOT use preg_quote,
+            // to keep magic characters.
+            $filter = sprintf('/%s/', str_replace(
+              '/', '\\/', $filter
+            ));
+        }
+
+        $this->filter = $filter;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function accept()
+    {
+        $test = $this->getInnerIterator()->current();
+
+        if ($test instanceof PHPUnit_Framework_TestSuite) {
+            return true;
+        }
+
+        $tmp = PHPUnit_Util_Test::describe($test, false);
+
+        if ($tmp[0] != '') {
+            $name = join('::', $tmp);
+        } else {
+            $name = $tmp[1];
+        }
+
+        $accepted = preg_match($this->filter, $name, $matches);
+
+        if ($accepted && isset($this->filterMax)) {
+            $set = end($matches);
+            $accepted = $set >= $this->filterMin && $set <= $this->filterMax;
+        }
+
+        return $accepted;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Runner/StandardTestSuiteLoader.php b/core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Runner/StandardTestSuiteLoader.php
rename to core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
index eef656cd8acaf094567a2eb82a1559d100494006..9de65a8c49934e21b672395bf7d58786380cc07c 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Runner/StandardTestSuiteLoader.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -57,8 +57,8 @@
 class PHPUnit_Runner_StandardTestSuiteLoader implements PHPUnit_Runner_TestSuiteLoader
 {
     /**
-     * @param  string  $suiteClassName
-     * @param  string  $suiteClassFile
+     * @param  string                      $suiteClassName
+     * @param  string                      $suiteClassFile
      * @return ReflectionClass
      * @throws PHPUnit_Framework_Exception
      */
@@ -72,13 +72,17 @@ public function load($suiteClassName, $suiteClassFile = '')
             );
         }
 
-        if (!class_exists($suiteClassName, FALSE)) {
-            PHPUnit_Util_Class::collectStart();
+        if (!class_exists($suiteClassName, false)) {
+            $loadedClasses = get_declared_classes();
+
             $filename = PHPUnit_Util_Fileloader::checkAndLoad($suiteClassFile);
-            $loadedClasses = PHPUnit_Util_Class::collectEnd();
+
+            $loadedClasses = array_values(
+              array_diff(get_declared_classes(), $loadedClasses)
+            );
         }
 
-        if (!class_exists($suiteClassName, FALSE) && !empty($loadedClasses)) {
+        if (!class_exists($suiteClassName, false) && !empty($loadedClasses)) {
             $offset = 0 - strlen($suiteClassName);
 
             foreach ($loadedClasses as $loadedClass) {
@@ -91,7 +95,7 @@ public function load($suiteClassName, $suiteClassFile = '')
             }
         }
 
-        if (!class_exists($suiteClassName, FALSE) && !empty($loadedClasses)) {
+        if (!class_exists($suiteClassName, false) && !empty($loadedClasses)) {
             $testCaseClass = 'PHPUnit_Framework_TestCase';
 
             foreach ($loadedClasses as $loadedClass) {
@@ -124,7 +128,7 @@ public function load($suiteClassName, $suiteClassFile = '')
             }
         }
 
-        if (class_exists($suiteClassName, FALSE)) {
+        if (class_exists($suiteClassName, false)) {
             $class = new ReflectionClass($suiteClassName);
 
             if ($class->getFileName() == realpath($suiteClassFile)) {
@@ -143,7 +147,7 @@ public function load($suiteClassName, $suiteClassFile = '')
     }
 
     /**
-     * @param  ReflectionClass  $aClass
+     * @param  ReflectionClass $aClass
      * @return ReflectionClass
      */
     public function reload(ReflectionClass $aClass)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Runner/TestSuiteLoader.php b/core/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/PHPUnit/Runner/TestSuiteLoader.php
rename to core/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
index 43d6a5d461716ed5f77636efc0ed462a20576dd2..37001c6fef5145931e4e6ad9cb07121845ce250a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Runner/TestSuiteLoader.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/TestSuiteLoader.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Interface available since Release 2.0.0
@@ -57,8 +57,8 @@
 interface PHPUnit_Runner_TestSuiteLoader
 {
     /**
-     * @param  string  $suiteClassName
-     * @param  string  $suiteClassFile
+     * @param  string          $suiteClassName
+     * @param  string          $suiteClassFile
      * @return ReflectionClass
      */
     public function load($suiteClassName, $suiteClassFile = '');
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php b/core/vendor/phpunit/phpunit/src/Runner/Version.php
similarity index 71%
rename from core/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php
rename to core/vendor/phpunit/phpunit/src/Runner/Version.php
index 82061f99fc6ee21d8f2b234fb5346b6d648ab811..4a07746e95a1819add5db46046ac0cb90277bc4b 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Runner/Version.php
+++ b/core/vendor/phpunit/phpunit/src/Runner/Version.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,15 +49,15 @@
  * @package    PHPUnit
  * @subpackage Runner
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
  */
 class PHPUnit_Runner_Version
 {
-    const VERSION = '3.7.21';
-    protected static $version;
+    private static $pharVersion;
+    private static $version;
 
     /**
      * Returns the current version of PHPUnit.
@@ -66,27 +66,13 @@ class PHPUnit_Runner_Version
      */
     public static function id()
     {
-        if (self::$version === NULL) {
-            self::$version = self::VERSION;
-
-            if (is_dir(dirname(dirname(__DIR__)) . '/.git')) {
-                $dir = getcwd();
-                chdir(__DIR__);
-                $version = exec('git describe --tags 2>&1', $output, $returnCode);
-                chdir($dir);
-
-                if ($version && $returnCode === 0) {
-                    if (count(explode('.', self::VERSION)) == 3) {
-                        self::$version = $version;
-                    } else {
-                        $version = explode('-', $version);
+        if (self::$pharVersion !== null) {
+            return self::$pharVersion;
+        }
 
-                        self::$version = self::VERSION . '-' . $version[2];
-                    }
-                } else {
-                    self::$version = self::VERSION . '-dev';
-                }
-            }
+        if (self::$version === null) {
+            $version = new SebastianBergmann\Version('4.1.3', dirname(dirname(__DIR__)));
+            self::$version = $version->getVersion();
         }
 
         return self::$version;
@@ -99,4 +85,21 @@ public static function getVersionString()
     {
         return 'PHPUnit ' . self::id() . ' by Sebastian Bergmann.';
     }
+
+    /**
+     * @return string
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getReleaseChannel()
+    {
+        if (strpos(self::$pharVersion, 'alpha') !== false) {
+            return '-alpha';
+        }
+
+        if (strpos(self::$pharVersion, 'beta') !== false) {
+            return '-beta';
+        }
+
+        return '';
+    }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/TextUI/Command.php b/core/vendor/phpunit/phpunit/src/TextUI/Command.php
similarity index 67%
rename from core/vendor/phpunit/phpunit/PHPUnit/TextUI/Command.php
rename to core/vendor/phpunit/phpunit/src/TextUI/Command.php
index 6c11130da6916ac9eb53bdb6ff172b7a11a702db..9039451146a60135fbd6975c9bb41fe20ca5983a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/TextUI/Command.php
+++ b/core/vendor/phpunit/phpunit/src/TextUI/Command.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage TextUI
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -50,7 +50,7 @@
  * @package    PHPUnit
  * @subpackage TextUI
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -61,9 +61,9 @@ class PHPUnit_TextUI_Command
      * @var array
      */
     protected $arguments = array(
-      'listGroups'              => FALSE,
-      'loader'                  => NULL,
-      'useDefaultConfiguration' => TRUE
+      'listGroups'              => false,
+      'loader'                  => null,
+      'useDefaultConfiguration' => true
     );
 
     /**
@@ -75,57 +75,60 @@ class PHPUnit_TextUI_Command
      * @var array
      */
     protected $longOptions = array(
-      'colors' => NULL,
-      'bootstrap=' => NULL,
-      'configuration=' => NULL,
-      'coverage-html=' => NULL,
-      'coverage-clover=' => NULL,
-      'coverage-php=' => NULL,
-      'coverage-text==' => NULL,
-      'debug' => NULL,
-      'exclude-group=' => NULL,
-      'filter=' => NULL,
-      'testsuite=' => NULL,
-      'group=' => NULL,
-      'help' => NULL,
-      'include-path=' => NULL,
-      'list-groups' => NULL,
-      'loader=' => NULL,
-      'log-json=' => NULL,
-      'log-junit=' => NULL,
-      'log-tap=' => NULL,
-      'process-isolation' => NULL,
-      'repeat=' => NULL,
-      'stderr' => NULL,
-      'stop-on-error' => NULL,
-      'stop-on-failure' => NULL,
-      'stop-on-incomplete' => NULL,
-      'stop-on-skipped' => NULL,
-      'strict' => NULL,
-      'tap' => NULL,
-      'testdox' => NULL,
-      'testdox-html=' => NULL,
-      'testdox-text=' => NULL,
-      'test-suffix=' => NULL,
-      'no-configuration' => NULL,
-      'no-globals-backup' => NULL,
-      'printer=' => NULL,
-      'static-backup' => NULL,
-      'verbose' => NULL,
-      'version' => NULL
+      'colors' => null,
+      'bootstrap=' => null,
+      'configuration=' => null,
+      'coverage-clover=' => null,
+      'coverage-crap4j=' => null,
+      'coverage-html=' => null,
+      'coverage-php=' => null,
+      'coverage-text==' => null,
+      'coverage-xml=' => null,
+      'debug' => null,
+      'exclude-group=' => null,
+      'filter=' => null,
+      'testsuite=' => null,
+      'group=' => null,
+      'help' => null,
+      'include-path=' => null,
+      'list-groups' => null,
+      'loader=' => null,
+      'log-json=' => null,
+      'log-junit=' => null,
+      'log-tap=' => null,
+      'process-isolation' => null,
+      'repeat=' => null,
+      'stderr' => null,
+      'stop-on-error' => null,
+      'stop-on-failure' => null,
+      'stop-on-incomplete' => null,
+      'stop-on-risky' => null,
+      'stop-on-skipped' => null,
+      'report-useless-tests' => null,
+      'strict-coverage' => null,
+      'disallow-test-output' => null,
+      'enforce-time-limit' => null,
+      'strict' => null,
+      'tap' => null,
+      'testdox' => null,
+      'testdox-html=' => null,
+      'testdox-text=' => null,
+      'test-suffix=' => null,
+      'no-configuration' => null,
+      'no-globals-backup' => null,
+      'printer=' => null,
+      'static-backup' => null,
+      'verbose' => null,
+      'version' => null
     );
 
-    /**
-     * @var array
-     */
-    protected $missingExtensions = array();
-
     /**
      * @param boolean $exit
      */
-    public static function main($exit = TRUE)
+    public static function main($exit = true)
     {
-        $command = new PHPUnit_TextUI_Command;
+        $command = new static;
+
         return $command->run($_SERVER['argv'], $exit);
     }
 
@@ -133,7 +136,7 @@ public static function main($exit = TRUE)
      * @param array   $argv
      * @param boolean $exit
      */
-    public function run(array $argv, $exit = TRUE)
+    public function run(array $argv, $exit = true)
     {
         $this->handleArguments($argv);
 
@@ -174,9 +177,7 @@ public function run(array $argv, $exit = TRUE)
 
         try {
             $result = $runner->doRun($suite, $this->arguments);
-        }
-
-        catch (PHPUnit_Framework_Exception $e) {
+        } catch (PHPUnit_Framework_Exception $e) {
             print $e->getMessage() . "\n";
         }
 
@@ -184,9 +185,7 @@ public function run(array $argv, $exit = TRUE)
 
         if (isset($result) && $result->wasSuccessful()) {
             $ret = PHPUnit_TextUI_TestRunner::SUCCESS_EXIT;
-        }
-
-        else if (!isset($result) || $result->errorCount() > 0) {
+        } elseif (!isset($result) || $result->errorCount() > 0) {
             $ret = PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT;
         }
 
@@ -221,13 +220,33 @@ protected function createRunner()
      * {
      *     public function __construct()
      *     {
-     *         $this->longOptions['--my-switch'] = 'myHandler';
+     *         // my-switch won't accept a value, it's an on/off
+     *         $this->longOptions['my-switch'] = 'myHandler';
+     *         // my-secondswitch will accept a value - note the equals sign
+     *         $this->longOptions['my-secondswitch='] = 'myOtherHandler';
      *     }
      *
-     *     // --my-switch foo -> myHandler('foo')
-     *     protected function myHandler($value)
+     *     // --my-switch  -> myHandler()
+     *     protected function myHandler()
      *     {
      *     }
+     *
+     *     // --my-secondswitch foo -> myOtherHandler('foo')
+     *     protected function myOtherHandler ($value)
+     *     {
+     *     }
+     *
+     *     // You will also need this - the static keyword in the
+     *     // PHPUnit_TextUI_Command will mean that it'll be
+     *     // PHPUnit_TextUI_Command that gets instantiated,
+     *     // not MyCommand
+     *     public static function main($exit = true)
+     *     {
+     *         $command = new static;
+     *
+     *         return $command->run($_SERVER['argv'], $exit);
+     *     }
+     *
      * }
      * </code>
      *
@@ -235,22 +254,25 @@ protected function createRunner()
      */
     protected function handleArguments(array $argv)
     {
+        if (defined('__PHPUNIT_PHAR__')) {
+            $this->longOptions['selfupdate']  = null;
+            $this->longOptions['self-update'] = null;
+        }
+
         try {
             $this->options = PHPUnit_Util_Getopt::getopt(
               $argv,
               'd:c:hv',
               array_keys($this->longOptions)
             );
-        }
-
-        catch (PHPUnit_Framework_Exception $e) {
+        } catch (PHPUnit_Framework_Exception $e) {
             PHPUnit_TextUI_TestRunner::showError($e->getMessage());
         }
 
         foreach ($this->options[0] as $option) {
             switch ($option[0]) {
                 case '--colors': {
-                    $this->arguments['colors'] = TRUE;
+                    $this->arguments['colors'] = true;
                 }
                 break;
 
@@ -265,52 +287,39 @@ protected function handleArguments(array $argv)
                 }
                 break;
 
-                case '--coverage-clover':
-                case '--coverage-html':
-                case '--coverage-php':
-                case '--coverage-text': {
-                    if (!extension_loaded('tokenizer')) {
-                        $this->showExtensionNotLoadedMessage(
-                          'tokenizer', 'No code coverage will be generated.'
-                        );
-
-                        continue;
-                    }
-
-                    if (!extension_loaded('xdebug')) {
-                        $this->showExtensionNotLoadedMessage(
-                          'Xdebug', 'No code coverage will be generated.'
-                        );
+                case '--coverage-clover': {
+                    $this->arguments['coverageClover'] = $option[1];
+                }
+                break;
 
-                        continue;
-                    }
+                case '--coverage-crap4j': {
+                    $this->arguments['coverageCrap4J'] = $option[1];
+                }
+                break;
 
-                    switch ($option[0]) {
-                        case '--coverage-clover': {
-                            $this->arguments['coverageClover'] = $option[1];
-                        }
-                        break;
+                case '--coverage-html': {
+                    $this->arguments['coverageHtml'] = $option[1];
+                }
+                break;
 
-                        case '--coverage-html': {
-                            $this->arguments['reportDirectory'] = $option[1];
-                        }
-                        break;
+                case '--coverage-php': {
+                    $this->arguments['coveragePHP'] = $option[1];
+                }
+                break;
 
-                        case '--coverage-php': {
-                            $this->arguments['coveragePHP'] = $option[1];
-                        }
-                        break;
+                case '--coverage-text': {
+                    if ($option[1] === null) {
+                        $option[1] = 'php://stdout';
+                    }
 
-                        case '--coverage-text': {
-                            if ($option[1] === NULL) {
-                                $option[1] = 'php://stdout';
-                            }
+                    $this->arguments['coverageText'] = $option[1];
+                    $this->arguments['coverageTextShowUncoveredFiles'] = false;
+                    $this->arguments['coverageTextShowOnlySummary'] = false;
+                }
+                break;
 
-                            $this->arguments['coverageText'] = $option[1];
-                            $this->arguments['coverageTextShowUncoveredFiles'] = FALSE;
-                        }
-                        break;
-                    }
+                case '--coverage-xml': {
+                    $this->arguments['coverageXml'] = $option[1];
                 }
                 break;
 
@@ -321,14 +330,14 @@ protected function handleArguments(array $argv)
                         if (isset($ini[1])) {
                             ini_set($ini[0], $ini[1]);
                         } else {
-                            ini_set($ini[0], TRUE);
+                            ini_set($ini[0], true);
                         }
                     }
                 }
                 break;
 
                 case '--debug': {
-                    $this->arguments['debug'] = TRUE;
+                    $this->arguments['debug'] = true;
                 }
                 break;
 
@@ -374,7 +383,7 @@ protected function handleArguments(array $argv)
                 break;
 
                 case '--list-groups': {
-                    $this->arguments['listGroups'] = TRUE;
+                    $this->arguments['listGroups'] = true;
                 }
                 break;
 
@@ -404,40 +413,42 @@ protected function handleArguments(array $argv)
                 break;
 
                 case '--process-isolation': {
-                    $this->arguments['processIsolation'] = TRUE;
+                    $this->arguments['processIsolation'] = true;
                 }
                 break;
 
                 case '--repeat': {
-                    $this->arguments['repeat'] = (int)$option[1];
+                    $this->arguments['repeat'] = (int) $option[1];
                 }
                 break;
 
                 case '--stderr': {
-                    $this->arguments['printer'] = new PHPUnit_TextUI_ResultPrinter(
-                      'php://stderr',
-                      isset($this->arguments['verbose']) ? $this->arguments['verbose'] : FALSE
-                    );
+                    $this->arguments['stderr'] = true;
                 }
                 break;
 
                 case '--stop-on-error': {
-                    $this->arguments['stopOnError'] = TRUE;
+                    $this->arguments['stopOnError'] = true;
                 }
                 break;
 
                 case '--stop-on-failure': {
-                    $this->arguments['stopOnFailure'] = TRUE;
+                    $this->arguments['stopOnFailure'] = true;
                 }
                 break;
 
                 case '--stop-on-incomplete': {
-                    $this->arguments['stopOnIncomplete'] = TRUE;
+                    $this->arguments['stopOnIncomplete'] = true;
+                }
+                break;
+
+                case '--stop-on-risky': {
+                    $this->arguments['stopOnRisky'] = true;
                 }
                 break;
 
                 case '--stop-on-skipped': {
-                    $this->arguments['stopOnSkipped'] = TRUE;
+                    $this->arguments['stopOnSkipped'] = true;
                 }
                 break;
 
@@ -462,23 +473,23 @@ protected function handleArguments(array $argv)
                 break;
 
                 case '--no-configuration': {
-                    $this->arguments['useDefaultConfiguration'] = FALSE;
+                    $this->arguments['useDefaultConfiguration'] = false;
                 }
                 break;
 
                 case '--no-globals-backup': {
-                    $this->arguments['backupGlobals'] = FALSE;
+                    $this->arguments['backupGlobals'] = false;
                 }
                 break;
 
                 case '--static-backup': {
-                    $this->arguments['backupStaticAttributes'] = TRUE;
+                    $this->arguments['backupStaticAttributes'] = true;
                 }
                 break;
 
                 case 'v':
                 case '--verbose': {
-                    $this->arguments['verbose'] = TRUE;
+                    $this->arguments['verbose'] = true;
                 }
                 break;
 
@@ -488,8 +499,37 @@ protected function handleArguments(array $argv)
                 }
                 break;
 
+                case '--report-useless-tests': {
+                    $this->arguments['reportUselessTests'] = true;
+                }
+                break;
+
+                case '--strict-coverage': {
+                    $this->arguments['strictCoverage'] = true;
+                }
+                break;
+
+                case '--disallow-test-output': {
+                    $this->arguments['disallowTestOutput'] = true;
+                }
+                break;
+
+                case '--enforce-time-limit': {
+                    $this->arguments['enforceTimeLimit'] = true;
+                }
+                break;
+
                 case '--strict': {
-                    $this->arguments['strict'] = TRUE;
+                    $this->arguments['reportUselessTests'] = true;
+                    $this->arguments['strictCoverage']     = true;
+                    $this->arguments['disallowTestOutput'] = true;
+                    $this->arguments['enforceTimeLimit']   = true;
+                }
+                break;
+
+                case '--selfupdate':
+                case '--self-update': {
+                    $this->handleSelfUpdate();
                 }
                 break;
 
@@ -498,9 +538,7 @@ protected function handleArguments(array $argv)
 
                     if (isset($this->longOptions[$optionName])) {
                         $handler = $this->longOptions[$optionName];
-                    }
-
-                    else if (isset($this->longOptions[$optionName . '='])) {
+                    } elseif (isset($this->longOptions[$optionName . '='])) {
                         $handler = $this->longOptions[$optionName . '='];
                     }
 
@@ -520,7 +558,7 @@ protected function handleArguments(array $argv)
             }
 
             if (isset($this->options[1][1])) {
-                $this->arguments['testFile'] = $this->options[1][1];
+                $this->arguments['testFile'] = realpath($this->options[1][1]);
             } else {
                 $this->arguments['testFile'] = '';
             }
@@ -553,7 +591,7 @@ protected function handleArguments(array $argv)
             $this->arguments['printer'] = $this->handlePrinter($this->arguments['printer']);
         }
 
-        if ($this->arguments['loader'] !== NULL) {
+        if ($this->arguments['loader'] !== null) {
             $this->arguments['loader'] = $this->handleLoader($this->arguments['loader']);
         }
 
@@ -566,20 +604,16 @@ protected function handleArguments(array $argv)
                 $this->arguments['configuration'] = realpath(
                   $configurationFile
                 );
-            }
-
-            else if (file_exists($configurationFile . '.dist')) {
+            } elseif (file_exists($configurationFile . '.dist')) {
                 $this->arguments['configuration'] = realpath(
                   $configurationFile . '.dist'
                 );
             }
-        }
-
-        else if (!isset($this->arguments['configuration']) &&
+        } elseif (!isset($this->arguments['configuration']) &&
                  $this->arguments['useDefaultConfiguration']) {
             if (file_exists('phpunit.xml')) {
                 $this->arguments['configuration'] = realpath('phpunit.xml');
-            } else if (file_exists('phpunit.xml.dist')) {
+            } elseif (file_exists('phpunit.xml.dist')) {
                 $this->arguments['configuration'] = realpath(
                   'phpunit.xml.dist'
                 );
@@ -591,9 +625,7 @@ protected function handleArguments(array $argv)
                 $configuration = PHPUnit_Util_Configuration::getInstance(
                   $this->arguments['configuration']
                 );
-            }
-
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 print $e->getMessage() . "\n";
                 exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
             }
@@ -606,6 +638,16 @@ protected function handleArguments(array $argv)
                 $this->handleBootstrap($phpunit['bootstrap']);
             }
 
+            /**
+             * Issue #657
+             */
+            if (isset($phpunit['stderr']) && $phpunit['stderr'] == true) {
+                $this->arguments['printer'] = new PHPUnit_TextUI_ResultPrinter(
+                  'php://stderr',
+                  isset($this->arguments['verbose']) ? $this->arguments['verbose'] : FALSE
+                );
+            }
+
             if (isset($phpunit['printerClass'])) {
                 if (isset($phpunit['printerFile'])) {
                     $file = $phpunit['printerFile'];
@@ -630,22 +672,6 @@ protected function handleArguments(array $argv)
                 );
             }
 
-            $logging = $configuration->getLoggingConfiguration();
-
-            if (isset($logging['coverage-html']) || isset($logging['coverage-clover']) || isset($logging['coverage-text']) ) {
-                if (!extension_loaded('tokenizer')) {
-                    $this->showExtensionNotLoadedMessage(
-                      'tokenizer', 'No code coverage will be generated.'
-                    );
-                }
-
-                else if (!extension_loaded('Xdebug')) {
-                    $this->showExtensionNotLoadedMessage(
-                      'Xdebug', 'No code coverage will be generated.'
-                    );
-                }
-            }
-
             $browsers = $configuration->getSeleniumBrowserConfiguration();
 
             if (!empty($browsers) &&
@@ -656,7 +682,7 @@ class_exists('PHPUnit_Extensions_SeleniumTestCase')) {
             if (!isset($this->arguments['test'])) {
                 $testSuite = $configuration->getTestSuiteConfiguration(isset($this->arguments['testsuite']) ? $this->arguments['testsuite'] : null);
 
-                if ($testSuite !== NULL) {
+                if ($testSuite !== null) {
                     $this->arguments['test'] = $testSuite;
                 }
             }
@@ -679,13 +705,13 @@ class_exists('PHPUnit_Extensions_SeleniumTestCase')) {
     /**
      * Handles the loading of the PHPUnit_Runner_TestSuiteLoader implementation.
      *
-     * @param  string  $loaderClass
-     * @param  string  $loaderFile
+     * @param  string                         $loaderClass
+     * @param  string                         $loaderFile
      * @return PHPUnit_Runner_TestSuiteLoader
      */
     protected function handleLoader($loaderClass, $loaderFile = '')
     {
-        if (!class_exists($loaderClass, FALSE)) {
+        if (!class_exists($loaderClass, false)) {
             if ($loaderFile == '') {
                 $loaderFile = PHPUnit_Util_Filesystem::classNameToFilename(
                   $loaderClass
@@ -699,7 +725,7 @@ protected function handleLoader($loaderClass, $loaderFile = '')
             }
         }
 
-        if (class_exists($loaderClass, FALSE)) {
+        if (class_exists($loaderClass, false)) {
             $class = new ReflectionClass($loaderClass);
 
             if ($class->implementsInterface('PHPUnit_Runner_TestSuiteLoader') &&
@@ -724,13 +750,13 @@ protected function handleLoader($loaderClass, $loaderFile = '')
     /**
      * Handles the loading of the PHPUnit_Util_Printer implementation.
      *
-     * @param  string $printerClass
-     * @param  string $printerFile
+     * @param  string               $printerClass
+     * @param  string               $printerFile
      * @return PHPUnit_Util_Printer
      */
     protected function handlePrinter($printerClass, $printerFile = '')
     {
-        if (!class_exists($printerClass, FALSE)) {
+        if (!class_exists($printerClass, false)) {
             if ($printerFile == '') {
                 $printerFile = PHPUnit_Util_Filesystem::classNameToFilename(
                   $printerClass
@@ -744,12 +770,16 @@ protected function handlePrinter($printerClass, $printerFile = '')
             }
         }
 
-        if (class_exists($printerClass, FALSE)) {
+        if (class_exists($printerClass)) {
             $class = new ReflectionClass($printerClass);
 
             if ($class->implementsInterface('PHPUnit_Framework_TestListener') &&
                 $class->isSubclassOf('PHPUnit_Util_Printer') &&
                 $class->isInstantiable()) {
+                if ($class->isSubclassOf('PHPUnit_TextUI_ResultPrinter')) {
+                    return $printerClass;
+                }
+
                 $printer = $class->newInstance();
             }
         }
@@ -776,51 +806,75 @@ protected function handleBootstrap($filename)
     {
         try {
             PHPUnit_Util_Fileloader::checkAndLoad($filename);
-        }
-
-        catch (PHPUnit_Framework_Exception $e) {
+        } catch (PHPUnit_Framework_Exception $e) {
             PHPUnit_TextUI_TestRunner::showError($e->getMessage());
         }
     }
 
     /**
-     * @param string  $message
-     * @since Method available since Release 3.6.0
+     * @since Method available since Release 4.0.0
      */
-    protected function showExtensionNotLoadedMessage($extension, $message = '')
+    protected function handleSelfUpdate()
     {
-        if (isset($this->missingExtensions[$extension])) {
-            return;
-        }
+        PHPUnit_TextUI_TestRunner::printVersionString();
 
-        if (!empty($message)) {
-            $message = ' ' . $message;
+        if (!extension_loaded('openssl')) {
+            print "The OpenSSL extension is not loaded.\n";
+            exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
         }
 
-        $this->showMessage(
-          'The ' . $extension . ' extension is not loaded.' . $message . "\n",
-          FALSE
+        $remoteFilename = sprintf(
+          'https://phar.phpunit.de/phpunit%s.phar',
+          PHPUnit_Runner_Version::getReleaseChannel()
         );
 
-        $this->missingExtensions[$extension] = TRUE;
-    }
+        $localFilename = realpath($_SERVER['argv'][0]);
+        $tempFilename  = basename($localFilename, '.phar') . '-temp.phar';
 
-    /**
-     * Shows a message.
-     *
-     * @param string  $message
-     * @param boolean $exit
-     */
-    protected function showMessage($message, $exit = TRUE)
-    {
-        PHPUnit_TextUI_TestRunner::printVersionString();
-        print $message . "\n";
+        // Workaround for https://bugs.php.net/bug.php?id=65538
+        $caFile = dirname($tempFilename) . '/ca.pem';
+        copy(__PHPUNIT_PHAR_ROOT__ . '/ca.pem', $caFile);
 
-        if ($exit) {
+        print 'Updating the PHPUnit PHAR ... ';
+
+        $options = array(
+            'ssl' => array(
+                'allow_self_signed' => false,
+                'cafile' => $caFile,
+                'verify_peer' => true
+            )
+        );
+
+        if (PHP_VERSION_ID < 50600) {
+            $options['ssl']['CN_match']        = 'phar.phpunit.de';
+            $options['ssl']['SNI_server_name'] = 'phar.phpunit.de';
+        }
+
+        file_put_contents(
+          $tempFilename,
+          file_get_contents(
+            $remoteFilename,
+            false,
+            stream_context_create($options)
+          )
+        );
+
+        chmod($tempFilename, 0777 & ~umask());
+
+        try {
+            $phar = new Phar($tempFilename);
+            unset($phar);
+            rename($tempFilename, $localFilename);
+            unlink($caFile);
+        } catch (Exception $e) {
+            unlink($caFile);
+            unlink($tempFilename);
+            print " done\n\n" . $e->getMessage() . "\n";
             exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
-        } else {
-            print "\n";
         }
+
+        print " done\n";
+        exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
     }
 
     /**
@@ -831,22 +885,29 @@ protected function showHelp()
         PHPUnit_TextUI_TestRunner::printVersionString();
 
         print <<<EOT
-Usage: phpunit [switches] UnitTest [UnitTest.php]
-       phpunit [switches] <directory>
+Usage: phpunit [options] UnitTest [UnitTest.php]
+       phpunit [options] <directory>
 
-  --log-junit <file>        Log test execution in JUnit XML format to file.
-  --log-tap <file>          Log test execution in TAP format to file.
-  --log-json <file>         Log test execution in JSON format.
+Code Coverage Options:
 
   --coverage-clover <file>  Generate code coverage report in Clover XML format.
+  --coverage-crap4j <file>  Generate code coverage report in Crap4J XML format.
   --coverage-html <dir>     Generate code coverage report in HTML format.
-  --coverage-php <file>     Serialize PHP_CodeCoverage object to file.
+  --coverage-php <file>     Export PHP_CodeCoverage object to file.
   --coverage-text=<file>    Generate code coverage report in text format.
-                            Default to writing to the standard output.
+                            Default: Standard output.
+  --coverage-xml <dir>      Generate code coverage report in PHPUnit XML format.
+
+Logging Options:
 
+  --log-junit <file>        Log test execution in JUnit XML format to file.
+  --log-tap <file>          Log test execution in TAP format to file.
+  --log-json <file>         Log test execution in JSON format.
   --testdox-html <file>     Write agile documentation in HTML format to file.
   --testdox-text <file>     Write agile documentation in Text format to file.
 
+Test Selection Options:
+
   --filter <pattern>        Filter which tests to run.
   --testsuite <pattern>     Filter which testsuite to run.
   --group ...               Only runs tests from the specified group(s).
@@ -855,26 +916,35 @@ protected function showHelp()
   --test-suffix ...         Only search for test in files with specified
                             suffix(es). Default: Test.php,.phpt
 
-  --loader <loader>         TestSuiteLoader implementation to use.
-  --printer <printer>       TestSuiteListener implementation to use.
-  --repeat <times>          Runs the test(s) repeatedly.
+Test Execution Options:
 
-  --tap                     Report test execution progress in TAP format.
-  --testdox                 Report test execution progress in TestDox format.
+  --report-useless-tests    Be strict about tests that do not test anything.
+  --strict-coverage         Be strict about unintentionally covered code.
+  --disallow-test-output    Be strict about output during tests.
+  --enforce-time-limit      Enforce time limit based on test size.
+  --strict                  Run tests in strict mode (enables all of the above).
+
+  --process-isolation       Run each test in a separate PHP process.
+  --no-globals-backup       Do not backup and restore \$GLOBALS for each test.
+  --static-backup           Backup and restore static attributes for each test.
 
   --colors                  Use colors in output.
   --stderr                  Write to STDERR instead of STDOUT.
   --stop-on-error           Stop execution upon first error.
   --stop-on-failure         Stop execution upon first error or failure.
+  --stop-on-risky           Stop execution upon first risky test.
   --stop-on-skipped         Stop execution upon first skipped test.
   --stop-on-incomplete      Stop execution upon first incomplete test.
-  --strict                  Run tests in strict mode.
   -v|--verbose              Output more verbose information.
   --debug                   Display debugging information during test execution.
 
-  --process-isolation       Run each test in a separate PHP process.
-  --no-globals-backup       Do not backup and restore \$GLOBALS for each test.
-  --static-backup           Backup and restore static attributes for each test.
+  --loader <loader>         TestSuiteLoader implementation to use.
+  --repeat <times>          Runs the test(s) repeatedly.
+  --tap                     Report test execution progress in TAP format.
+  --testdox                 Report test execution progress in TestDox format.
+  --printer <printer>       TestSuiteListener implementation to use.
+
+Configuration Options:
 
   --bootstrap <file>        A "bootstrap" PHP file that is run before the tests.
   -c|--configuration <file> Read configuration from XML file.
@@ -882,10 +952,16 @@ protected function showHelp()
   --include-path <path(s)>  Prepend PHP's include_path with given path(s).
   -d key[=value]            Sets a php.ini value.
 
+Miscellaneous Options:
+
   -h|--help                 Prints this usage information.
   --version                 Prints the version and exits.
 
 EOT;
+
+        if (defined('__PHPUNIT_PHAR__')) {
+            print "\n  --self-update             Update PHPUnit to the latest version.\n";
+        }
     }
 
     /**
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/TextUI/ResultPrinter.php b/core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
similarity index 54%
rename from core/vendor/phpunit/phpunit/PHPUnit/TextUI/ResultPrinter.php
rename to core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
index 13cca92730fd137d257289217b226c9d58b431c4..3a316c19bed1a856b37414b03b4e1d1da7d8c159 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/TextUI/ResultPrinter.php
+++ b/core/vendor/phpunit/phpunit/src/TextUI/ResultPrinter.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage TextUI
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage TextUI
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -61,6 +61,21 @@ class PHPUnit_TextUI_ResultPrinter extends PHPUnit_Util_Printer implements PHPUn
     const EVENT_TESTSUITE_START = 2;
     const EVENT_TESTSUITE_END   = 3;
 
+    /**
+     * @var array
+     */
+    private static $ansiCodes = array(
+      'bold'       => 1,
+      'fg-black'   => 30,
+      'fg-red'     => 31,
+      'fg-yellow'  => 33,
+      'fg-cyan'    => 36,
+      'fg-white'   => 37,
+      'bg-red'     => 41,
+      'bg-green'   => 42,
+      'bg-yellow'  => 43
+    );
+
     /**
      * @var integer
      */
@@ -74,7 +89,7 @@ class PHPUnit_TextUI_ResultPrinter extends PHPUnit_Util_Printer implements PHPUn
     /**
      * @var boolean
      */
-    protected $lastTestFailed = FALSE;
+    protected $lastTestFailed = false;
 
     /**
      * @var integer
@@ -99,29 +114,29 @@ class PHPUnit_TextUI_ResultPrinter extends PHPUnit_Util_Printer implements PHPUn
     /**
      * @var boolean
      */
-    protected $colors = FALSE;
+    protected $colors = false;
 
     /**
      * @var boolean
      */
-    protected $debug = FALSE;
+    protected $debug = false;
 
     /**
      * @var boolean
      */
-    protected $verbose = FALSE;
+    protected $verbose = false;
 
     /**
      * Constructor.
      *
-     * @param  mixed   $out
-     * @param  boolean $verbose
-     * @param  boolean $colors
-     * @param  boolean $debug
+     * @param  mixed                       $out
+     * @param  boolean                     $verbose
+     * @param  boolean                     $colors
+     * @param  boolean                     $debug
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.0.0
      */
-    public function __construct($out = NULL, $verbose = FALSE, $colors = FALSE, $debug = FALSE)
+    public function __construct($out = null, $verbose = false, $colors = false, $debug = false)
     {
         parent::__construct($out);
 
@@ -145,63 +160,67 @@ public function __construct($out = NULL, $verbose = FALSE, $colors = FALSE, $deb
     }
 
     /**
-     * @param  PHPUnit_Framework_TestResult $result
+     * @param PHPUnit_Framework_TestResult $result
      */
     public function printResult(PHPUnit_Framework_TestResult $result)
     {
         $this->printHeader();
 
-        if ($result->errorCount() > 0) {
-            $this->printErrors($result);
+        $this->printErrors($result);
+        $printSeparator = $result->errorCount() > 0;
+
+        if ($printSeparator && $result->failureCount() > 0) {
+            $this->write("\n--\n\n");
         }
 
-        if ($result->failureCount() > 0) {
-            if ($result->errorCount() > 0) {
-                print "\n--\n\n";
+        $printSeparator = $printSeparator || $result->failureCount() > 0;
+        $this->printFailures($result);
+
+        if ($this->verbose) {
+            if ($printSeparator && $result->deprecatedFeaturesCount() > 0) {
+                $this->write("\n--\n\n");
             }
 
-            $this->printFailures($result);
-        }
+            $printSeparator = $printSeparator ||
+                              $result->deprecatedFeaturesCount() > 0;
 
-        if ($this->verbose) {
-            if ($result->deprecatedFeaturesCount() > 0) {
-                if ($result->failureCount() > 0) {
-                    print "\n--\n\nDeprecated PHPUnit features are being used";
-                }
-
-                foreach ($result->deprecatedFeatures() as $deprecatedFeature) {
-                    $this->write($deprecatedFeature . "\n\n");
-                }
+            $this->printDeprecated($result);
+
+            if ($printSeparator && $result->riskyCount() > 0) {
+                $this->write("\n--\n\n");
             }
 
-            if ($result->notImplementedCount() > 0) {
-                if ($result->failureCount() > 0) {
-                    print "\n--\n\n";
-                }
+            $printSeparator = $printSeparator ||
+                              $result->riskyCount() > 0;
 
-                $this->printIncompletes($result);
+            $this->printRisky($result);
+
+            if ($printSeparator && $result->notImplementedCount() > 0) {
+                $this->write("\n--\n\n");
             }
 
-            if ($result->skippedCount() > 0) {
-                if ($result->notImplementedCount() > 0) {
-                    print "\n--\n\n";
-                }
+            $printSeparator = $printSeparator ||
+                              $result->notImplementedCount() > 0;
+
+            $this->printIncompletes($result);
 
-                $this->printSkipped($result);
+            if ($printSeparator && $result->skippedCount() > 0) {
+                $this->write("\n--\n\n");
             }
+
+            $this->printSkipped($result);
         }
 
         $this->printFooter($result);
     }
 
     /**
-     * @param  array   $defects
-     * @param  integer $count
-     * @param  string  $type
+     * @param array  $defects
+     * @param string $type
      */
-    protected function printDefects(array $defects, $count, $type)
+    protected function printDefects(array $defects, $type)
     {
-        static $called = FALSE;
+        $count = count($defects);
 
         if ($count == 0) {
             return;
@@ -209,9 +228,8 @@ protected function printDefects(array $defects, $count, $type)
 
         $this->write(
           sprintf(
-            "%sThere %s %d %s%s:\n",
+            "There %s %d %s%s:\n",
 
-            $called ? "\n" : '',
             ($count == 1) ? 'was' : 'were',
             $count,
             $type,
@@ -224,13 +242,11 @@ protected function printDefects(array $defects, $count, $type)
         foreach ($defects as $defect) {
             $this->printDefect($defect, $i++);
         }
-
-        $called = TRUE;
     }
 
     /**
-     * @param  PHPUnit_Framework_TestFailure $defect
-     * @param  integer                       $count
+     * @param PHPUnit_Framework_TestFailure $defect
+     * @param integer                       $count
      */
     protected function printDefect(PHPUnit_Framework_TestFailure $defect, $count)
     {
@@ -239,8 +255,8 @@ protected function printDefect(PHPUnit_Framework_TestFailure $defect, $count)
     }
 
     /**
-     * @param  PHPUnit_Framework_TestFailure $defect
-     * @param  integer                       $count
+     * @param PHPUnit_Framework_TestFailure $defect
+     * @param integer                       $count
      */
     protected function printDefectHeader(PHPUnit_Framework_TestFailure $defect, $count)
     {
@@ -263,17 +279,20 @@ protected function printDefectHeader(PHPUnit_Framework_TestFailure $defect, $cou
     }
 
     /**
-     * @param  PHPUnit_Framework_TestFailure $defect
+     * @param PHPUnit_Framework_TestFailure $defect
      */
     protected function printDefectTrace(PHPUnit_Framework_TestFailure $defect)
     {
-        $this->write(
-          $defect->getExceptionAsString() . "\n" .
-          PHPUnit_Util_Filter::getFilteredStacktrace(
-            $defect->thrownException()
-          )
+        $this->write($defect->getExceptionAsString());
+
+        $trace = PHPUnit_Util_Filter::getFilteredStacktrace(
+          $defect->thrownException()
         );
-        
+
+        if (!empty($trace)) {
+            $this->write("\n" . $trace);
+        }
+
         $e = $defect->thrownException()->getPrevious();
 
         while ($e) {
@@ -288,48 +307,83 @@ protected function printDefectTrace(PHPUnit_Framework_TestFailure $defect)
     }
 
     /**
-     * @param  PHPUnit_Framework_TestResult  $result
+     * @param PHPUnit_Framework_TestResult $result
      */
     protected function printErrors(PHPUnit_Framework_TestResult $result)
     {
-        $this->printDefects($result->errors(), $result->errorCount(), 'error');
+        $this->printDefects($result->errors(), 'error');
     }
 
     /**
-     * @param  PHPUnit_Framework_TestResult  $result
+     * @param PHPUnit_Framework_TestResult $result
      */
     protected function printFailures(PHPUnit_Framework_TestResult $result)
     {
-        $this->printDefects(
-          $result->failures(),
-          $result->failureCount(),
-          'failure'
-        );
+        $this->printDefects($result->failures(), 'failure');
     }
 
     /**
-     * @param  PHPUnit_Framework_TestResult  $result
+     * @param PHPUnit_Framework_TestResult $result
      */
     protected function printIncompletes(PHPUnit_Framework_TestResult $result)
     {
-        $this->printDefects(
-          $result->notImplemented(),
-          $result->notImplementedCount(),
-          'incomplete test'
-        );
+        $this->printDefects($result->notImplemented(), 'incomplete test');
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     * @since  Method available since Release 4.0.0
+     */
+    protected function printRisky(PHPUnit_Framework_TestResult $result)
+    {
+        $this->printDefects($result->risky(), 'risky test');
     }
 
     /**
-     * @param  PHPUnit_Framework_TestResult  $result
+     * @param PHPUnit_Framework_TestResult $result
      * @since  Method available since Release 3.0.0
      */
     protected function printSkipped(PHPUnit_Framework_TestResult $result)
     {
-        $this->printDefects(
-          $result->skipped(),
-          $result->skippedCount(),
-          'skipped test'
+        $this->printDefects($result->skipped(), 'skipped test');
+    }
+
+    /**
+     * @param PHPUnit_Framework_TestResult $result
+     * @since Method available since Release 4.0.0
+     */
+    protected function printDeprecated(PHPUnit_Framework_TestResult $result)
+    {
+        $deprecatedFeatures = $result->deprecatedFeatures();
+        $count              = count($deprecatedFeatures);
+
+        if ($count == 0) {
+            return;
+        }
+
+        $this->write(
+          sprintf(
+            "There %s %d tests that use%s deprecated features:\n",
+
+            ($count == 1) ? 'was' : 'were',
+            $count,
+            ($count != 1) ? '' : 's'
+          )
         );
+
+        $i = 1;
+
+        foreach ($result->deprecatedFeatures() as $deprecatedFeature) {
+            $this->write(
+              sprintf(
+                "\n%d) %s\n\n%s\n",
+
+                $i++,
+                $deprecatedFeature->getMessage(),
+                $deprecatedFeature->getSource()
+              )
+            );
+        }
     }
 
     protected function printHeader()
@@ -338,34 +392,24 @@ protected function printHeader()
     }
 
     /**
-     * @param  PHPUnit_Framework_TestResult  $result
+     * @param PHPUnit_Framework_TestResult $result
      */
     protected function printFooter(PHPUnit_Framework_TestResult $result)
     {
         if (count($result) === 0) {
-            if ($this->colors) {
-                $this->write("\x1b[30;43m\x1b[2K");
-            }
-
-            $this->write(
-              "No tests executed!\n"
+            $this->writeWithColor(
+              'fg-black, bg-yellow',
+              'No tests executed!'
             );
+        } elseif ($result->wasSuccessful() &&
+                 $result->allHarmless() &&
+                 $result->allCompletelyImplemented() &&
+                 $result->noneSkipped()) {
 
-            if ($this->colors) {
-                $this->write("\x1b[0m\x1b[2K");
-            }
-        }
-
-        else if ($result->wasSuccessful() &&
-            $result->allCompletelyImplemented() &&
-            $result->noneSkipped()) {
-            if ($this->colors) {
-                $this->write("\x1b[30;42m\x1b[2K");
-            }
-
-            $this->write(
+            $this->writeWithColor(
+              'fg-black, bg-green',
               sprintf(
-                "OK (%d test%s, %d assertion%s)\n",
+                'OK (%d test%s, %d assertion%s)',
 
                 count($result),
                 (count($result) == 1) ? '' : 's',
@@ -373,28 +417,17 @@ protected function printFooter(PHPUnit_Framework_TestResult $result)
                 ($this->numAssertions == 1) ? '' : 's'
               )
             );
-
-            if ($this->colors) {
-                $this->write("\x1b[0m\x1b[2K");
-            }
-        }
-
-        else if ((!$result->allCompletelyImplemented() ||
+        } elseif ((!$result->allCompletelyImplemented() ||
+                  !$result->allHarmless() ||
                   !$result->noneSkipped()) &&
                  $result->wasSuccessful()) {
-            if ($this->colors) {
-                $this->write(
-                  "\x1b[30;43m\x1b[2KOK, but incomplete or skipped tests!\n" .
-                  "\x1b[0m\x1b[30;43m\x1b[2K"
-                );
-            } else {
-                $this->write("OK, but incomplete or skipped tests!\n");
-            }
-
-            $this->write(
+            $this->writeWithColor(
+              'fg-black, bg-yellow',
               sprintf(
-                "Tests: %d, Assertions: %d%s%s.\n",
+                "%sOK, but incomplete, skipped, or risky tests!\n" .
+                'Tests: %d, Assertions: %d%s%s%s.',
 
+                $this->verbose ? "\n" : '',
                 count($result),
                 $this->numAssertions,
                 $this->getCountString(
@@ -402,29 +435,18 @@ protected function printFooter(PHPUnit_Framework_TestResult $result)
                 ),
                 $this->getCountString(
                   $result->skippedCount(), 'Skipped'
+                ),
+                $this->getCountString(
+                  $result->riskyCount(), 'Risky'
                 )
               )
             );
-
-            if ($this->colors) {
-                $this->write("\x1b[0m\x1b[2K");
-            }
-        }
-
-        else {
-            $this->write("\n");
-
-            if ($this->colors) {
-                $this->write(
-                  "\x1b[37;41m\x1b[2KFAILURES!\n\x1b[0m\x1b[37;41m\x1b[2K"
-                );
-            } else {
-                $this->write("FAILURES!\n");
-            }
-
-            $this->write(
+        } else {
+            $this->writeWithColor(
+              'fg-white, bg-red',
               sprintf(
-                "Tests: %d, Assertions: %s%s%s%s%s.\n",
+                "\nFAILURES!\n" .
+                'Tests: %d, Assertions: %s%s%s%s%s.',
 
                 count($result),
                 $this->numAssertions,
@@ -436,26 +458,21 @@ protected function printFooter(PHPUnit_Framework_TestResult $result)
                 $this->getCountString($result->skippedCount(), 'Skipped')
               )
             );
-
-            if ($this->colors) {
-                $this->write("\x1b[0m\x1b[2K");
-            }
         }
 
         if (!$this->verbose &&
             $result->deprecatedFeaturesCount() > 0) {
-            $message = sprintf(
-              "Warning: Deprecated PHPUnit features are being used %s times!\n" .
-              "Use --verbose for more information.\n",
-              $result->deprecatedFeaturesCount()
-            );
+            $this->write("\n");
 
-            if ($this->colors) {
-                $message = "\x1b[37;41m\x1b[2K" . $message .
-                           "\x1b[0m";
-            }
+            $this->writeWithColor(
+              'fg-white, bg-red',
+              sprintf(
+                "Warning: Deprecated PHPUnit features are being used %s times!\n" .
+                'Use --verbose for more information.',
 
-            $this->write("\n" . $message);
+                $result->deprecatedFeaturesCount()
+              )
+            );
         }
     }
 
@@ -491,87 +508,81 @@ public function printWaitPrompt()
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
-        if ($this->colors) {
-            $this->writeProgress("\x1b[31;1mE\x1b[0m");
-        } else {
-            $this->writeProgress('E');
-        }
-
-        $this->lastTestFailed = TRUE;
+        $this->writeProgressWithColor('fg-red, bold', 'E');
+        $this->lastTestFailed = true;
     }
 
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
-        if ($this->colors) {
-            $this->writeProgress("\x1b[41;37mF\x1b[0m");
-        } else {
-            $this->writeProgress('F');
-        }
-
-        $this->lastTestFailed = TRUE;
+        $this->writeProgressWithColor('bg-red, fg-white', 'F');
+        $this->lastTestFailed = true;
     }
 
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
-        if ($this->colors) {
-            $this->writeProgress("\x1b[33;1mI\x1b[0m");
-        } else {
-            $this->writeProgress('I');
-        }
+        $this->writeProgressWithColor('fg-yellow, bold', 'I');
+        $this->lastTestFailed = true;
+    }
 
-        $this->lastTestFailed = TRUE;
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeProgressWithColor('fg-yellow, bold', 'R');
+        $this->lastTestFailed = true;
     }
 
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      * @since  Method available since Release 3.0.0
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
-        if ($this->colors) {
-            $this->writeProgress("\x1b[36;1mS\x1b[0m");
-        } else {
-            $this->writeProgress('S');
-        }
-
-        $this->lastTestFailed = TRUE;
+        $this->writeProgressWithColor('fg-cyan, bold', 'S');
+        $this->lastTestFailed = true;
     }
 
     /**
      * A testsuite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     {
         if ($this->numTests == -1) {
             $this->numTests      = count($suite);
-            $this->numTestsWidth = strlen((string)$this->numTests);
+            $this->numTestsWidth = strlen((string) $this->numTests);
             $this->maxColumn     = 69 - (2 * $this->numTestsWidth);
         }
     }
@@ -579,7 +590,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A testsuite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -589,7 +600,7 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test)
     {
@@ -605,8 +616,8 @@ public function startTest(PHPUnit_Framework_Test $test)
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
@@ -616,13 +627,11 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
 
         if ($test instanceof PHPUnit_Framework_TestCase) {
             $this->numAssertions += $test->getNumAssertions();
-        }
-
-        else if ($test instanceof PHPUnit_Extensions_PhptTestCase) {
+        } elseif ($test instanceof PHPUnit_Extensions_PhptTestCase) {
             $this->numAssertions++;
         }
 
-        $this->lastTestFailed = FALSE;
+        $this->lastTestFailed = false;
 
         if ($test instanceof PHPUnit_Framework_TestCase) {
             if (!$test->hasPerformedExpectationsOnOutput()) {
@@ -632,7 +641,7 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
     }
 
     /**
-     * @param  string $progress
+     * @param string $progress
      */
     protected function writeProgress($progress)
     {
@@ -661,4 +670,63 @@ protected function writeNewLine()
         $this->column = 0;
         $this->write("\n");
     }
+
+    /**
+     * Formats a buffer with a specified ANSI color sequence if colors are
+     * enabled.
+     *
+     * @param  string $color
+     * @param  string $buffer
+     * @return string
+     * @since  Method available since Release 4.0.0
+     */
+    protected function formatWithColor($color, $buffer)
+    {
+        if (!$this->colors) {
+            return $buffer;
+        }
+
+        $codes = array_map('trim', explode(',', $color));
+        $lines = explode("\n", $buffer);
+        $padding = max(array_map('strlen', $lines));
+
+        $styles = array();
+        foreach ($codes as $code) {
+            $styles[] = self::$ansiCodes[$code];
+        }
+        $style = sprintf("\x1b[%sm", implode(';', $styles));
+
+        $styledLines = array();
+        foreach ($lines as $line) {
+            $styledLines[] = $style . str_pad($line, $padding) . "\x1b[0m";
+        }
+
+        return implode("\n", $styledLines);
+    }
+
+    /**
+     * Writes a buffer out with a color sequence if colors are enabled.
+     *
+     * @param string $color
+     * @param string $buffer
+     * @since  Method available since Release 4.0.0
+     */
+    protected function writeWithColor($color, $buffer)
+    {
+        $buffer = $this->formatWithColor($color, $buffer);
+        $this->write($buffer . "\n");
+    }
+
+    /**
+     * Writes progress with a color sequence if colors are enabled.
+     *
+     * @param string $color
+     * @param string $buffer
+     * @since  Method available since Release 4.0.0
+     */
+    protected function writeProgressWithColor($color, $buffer)
+    {
+        $buffer = $this->formatWithColor($color, $buffer);
+        $this->writeProgress($buffer);
+    }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/TextUI/TestRunner.php b/core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
similarity index 66%
rename from core/vendor/phpunit/phpunit/PHPUnit/TextUI/TestRunner.php
rename to core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
index ca4ceb0a91904255aab181cba5326d1e12e48bde..73f0383f445c192dac3f2d4e55274e08269d8cd2 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/TextUI/TestRunner.php
+++ b/core/vendor/phpunit/phpunit/src/TextUI/TestRunner.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,12 +37,14 @@
  * @package    PHPUnit
  * @subpackage TextUI
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
  */
 
+use SebastianBergmann\Environment\Runtime;
+
 /**
  * A TestRunner for the Command Line Interface (CLI)
  * PHP SAPI Module.
@@ -50,7 +52,7 @@
  * @package    PHPUnit
  * @subpackage TextUI
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -69,36 +71,50 @@ class PHPUnit_TextUI_TestRunner extends PHPUnit_Runner_BaseTestRunner
     /**
      * @var PHPUnit_Runner_TestSuiteLoader
      */
-    protected $loader = NULL;
+    protected $loader = null;
 
     /**
      * @var PHPUnit_TextUI_ResultPrinter
      */
-    protected $printer = NULL;
+    protected $printer = null;
 
     /**
      * @var boolean
      */
-    protected static $versionStringPrinted = FALSE;
+    protected static $versionStringPrinted = false;
+
+    /**
+     * @var array
+     */
+    private $missingExtensions = array();
+
+    /**
+     * @var boolean
+     */
+    private $canCollectCodeCoverage;
 
     /**
      * @param PHPUnit_Runner_TestSuiteLoader $loader
      * @param PHP_CodeCoverage_Filter        $filter
      * @since Method available since Release 3.4.0
      */
-    public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = NULL, PHP_CodeCoverage_Filter $filter = NULL)
+    public function __construct(PHPUnit_Runner_TestSuiteLoader $loader = null, PHP_CodeCoverage_Filter $filter = null)
     {
-        if ($filter === NULL) {
+        if ($filter === null) {
             $filter = new PHP_CodeCoverage_Filter;
         }
 
         $this->codeCoverageFilter = $filter;
         $this->loader             = $loader;
+
+        $runtime = new Runtime;
+        $this->canCollectCodeCoverage = $runtime->canCollectCodeCoverage();
     }
 
     /**
-     * @param  mixed $test
-     * @param  array $arguments
+     * @param  PHPUnit_Framework_Test|ReflectionClass $test
+     * @param  array                               $arguments
+     * @return PHPUnit_Framework_TestResult
      * @throws PHPUnit_Framework_Exception
      */
     public static function run($test, array $arguments = array())
@@ -129,34 +145,66 @@ protected function createTestResult()
         return new PHPUnit_Framework_TestResult;
     }
 
+    private function processSuiteFilters(PHPUnit_Framework_TestSuite $suite, array $arguments)
+    {
+        if (!$arguments['filter'] &&
+            empty($arguments['groups']) &&
+            empty($arguments['excludeGroups'])) {
+            return;
+        }
+
+        $filterFactory = new PHPUnit_Runner_Filter_Factory();
+
+        if (!empty($arguments['excludeGroups'])) {
+            $filterFactory->addFilter(
+                new ReflectionClass('PHPUnit_Runner_Filter_Group_Exclude'),
+                $arguments['excludeGroups']
+            );
+        }
+
+        if (!empty($arguments['groups'])) {
+            $filterFactory->addFilter(
+                new ReflectionClass('PHPUnit_Runner_Filter_Group_Include'),
+                $arguments['groups']
+            );
+        }
+
+        if ($arguments['filter']) {
+            $filterFactory->addFilter(
+                new ReflectionClass('PHPUnit_Runner_Filter_Test'),
+                $arguments['filter']
+            );
+        }
+        $suite->injectFilter($filterFactory);
+    }
+
     /**
-     * @param  PHPUnit_Framework_Test $suite
-     * @param  array                  $arguments
+     * @param  PHPUnit_Framework_Test       $suite
+     * @param  array                        $arguments
      * @return PHPUnit_Framework_TestResult
      */
     public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
     {
         $this->handleConfiguration($arguments);
 
+        $this->processSuiteFilters($suite, $arguments);
+
         if (isset($arguments['bootstrap'])) {
             $GLOBALS['__PHPUNIT_BOOTSTRAP'] = $arguments['bootstrap'];
         }
 
-        if ($arguments['backupGlobals'] === FALSE) {
-            $suite->setBackupGlobals(FALSE);
+        if ($arguments['backupGlobals'] === false) {
+            $suite->setBackupGlobals(false);
         }
 
-        if ($arguments['backupStaticAttributes'] === TRUE) {
-            $suite->setBackupStaticAttributes(TRUE);
+        if ($arguments['backupStaticAttributes'] === true) {
+            $suite->setBackupStaticAttributes(true);
         }
 
         if (is_integer($arguments['repeat'])) {
             $test = new PHPUnit_Extensions_RepeatedTest(
               $suite,
               $arguments['repeat'],
-              $arguments['filter'],
-              $arguments['groups'],
-              $arguments['excludeGroups'],
               $arguments['processIsolation']
             );
 
@@ -167,40 +215,55 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
         $result = $this->createTestResult();
 
         if (!$arguments['convertErrorsToExceptions']) {
-            $result->convertErrorsToExceptions(FALSE);
+            $result->convertErrorsToExceptions(false);
         }
 
         if (!$arguments['convertNoticesToExceptions']) {
-            PHPUnit_Framework_Error_Notice::$enabled = FALSE;
+            PHPUnit_Framework_Error_Notice::$enabled = false;
         }
 
         if (!$arguments['convertWarningsToExceptions']) {
-            PHPUnit_Framework_Error_Warning::$enabled = FALSE;
+            PHPUnit_Framework_Error_Warning::$enabled = false;
         }
 
         if ($arguments['stopOnError']) {
-            $result->stopOnError(TRUE);
+            $result->stopOnError(true);
         }
 
         if ($arguments['stopOnFailure']) {
-            $result->stopOnFailure(TRUE);
+            $result->stopOnFailure(true);
         }
 
         if ($arguments['stopOnIncomplete']) {
-            $result->stopOnIncomplete(TRUE);
+            $result->stopOnIncomplete(true);
+        }
+
+        if ($arguments['stopOnRisky']) {
+            $result->stopOnRisky(true);
         }
 
         if ($arguments['stopOnSkipped']) {
-            $result->stopOnSkipped(TRUE);
+            $result->stopOnSkipped(true);
         }
 
-        if ($this->printer === NULL) {
+        if ($this->printer === null) {
             if (isset($arguments['printer']) &&
                 $arguments['printer'] instanceof PHPUnit_Util_Printer) {
                 $this->printer = $arguments['printer'];
             } else {
-                $this->printer = new PHPUnit_TextUI_ResultPrinter(
-                  NULL,
+                $printerClass = 'PHPUnit_TextUI_ResultPrinter';
+                if (isset($arguments['printer']) &&
+                    is_string($arguments['printer']) &&
+                    class_exists($arguments['printer'], false)) {
+                    $class = new ReflectionClass($arguments['printer']);
+
+                    if ($class->isSubclassOf('PHPUnit_TextUI_ResultPrinter')) {
+                        $printerClass = $arguments['printer'];
+                    }
+                }
+
+                $this->printer = new $printerClass(
+                  isset($arguments['stderr']) ? 'php://stderr' : null,
                   $arguments['verbose'],
                   $arguments['colors'],
                   $arguments['debug']
@@ -208,12 +271,13 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
             }
         }
 
-        if (!$this->printer instanceof PHPUnit_Util_Log_TAP &&
-            !self::$versionStringPrinted) {
+        if (!$this->printer instanceof PHPUnit_Util_Log_TAP) {
             $this->printer->write(
               PHPUnit_Runner_Version::getVersionString() . "\n\n"
             );
 
+            self::$versionStringPrinted = true;
+
             if (isset($arguments['configuration'])) {
                 $this->printer->write(
                   sprintf(
@@ -252,33 +316,57 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
 
         $codeCoverageReports = 0;
 
-        if (extension_loaded('xdebug')) {
-            if (isset($arguments['coverageClover'])) {
-                $codeCoverageReports++;
-            }
+        if (isset($arguments['coverageClover'])) {
+            $codeCoverageReports++;
+        }
 
-            if (isset($arguments['reportDirectory'])) {
-                $codeCoverageReports++;
-            }
+        if (isset($arguments['coverageCrap4J'])) {
+            $codeCoverageReports++;
+        }
 
-            if (isset($arguments['coveragePHP'])) {
-                $codeCoverageReports++;
-            }
+        if (isset($arguments['coverageHtml'])) {
+            $codeCoverageReports++;
+        }
 
-            if (isset($arguments['coverageText'])) {
-                $codeCoverageReports++;
+        if (isset($arguments['coveragePHP'])) {
+            $codeCoverageReports++;
+        }
+
+        if (isset($arguments['coverageText'])) {
+            $codeCoverageReports++;
+        }
+
+        if (isset($arguments['coverageXml'])) {
+            $codeCoverageReports++;
+        }
+
+        if ($codeCoverageReports > 0 && (!extension_loaded('tokenizer') || !$this->canCollectCodeCoverage)) {
+            if (!extension_loaded('tokenizer')) {
+                $this->showExtensionNotLoadedMessage(
+                    'tokenizer', 'No code coverage will be generated.'
+                );
+            } elseif (!extension_loaded('Xdebug')) {
+                $this->showExtensionNotLoadedMessage(
+                    'Xdebug', 'No code coverage will be generated.'
+                );
             }
+
+            $codeCoverageReports = 0;
         }
 
         if ($codeCoverageReports > 0) {
             $codeCoverage = new PHP_CodeCoverage(
-              NULL, $this->codeCoverageFilter
+              null, $this->codeCoverageFilter
             );
 
             $codeCoverage->setAddUncoveredFilesFromWhitelist(
               $arguments['addUncoveredFilesFromWhitelist']
             );
 
+            $codeCoverage->setCheckForUnintentionallyCoveredCode(
+              $arguments['strictCoverage']
+            );
+
             $codeCoverage->setProcessUncoveredFilesFromWhitelist(
               $arguments['processUncoveredFilesFromWhitelist']
             );
@@ -324,29 +412,18 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
             );
         }
 
-        if ($arguments['strict']) {
-            $result->strictMode(TRUE);
-
-            $result->setTimeoutForSmallTests(
-              $arguments['timeoutForSmallTests']
-            );
-
-            $result->setTimeoutForMediumTests(
-              $arguments['timeoutForMediumTests']
-            );
+        $result->beStrictAboutTestsThatDoNotTestAnything($arguments['reportUselessTests']);
+        $result->beStrictAboutOutputDuringTests($arguments['disallowTestOutput']);
+        $result->beStrictAboutTestSize($arguments['enforceTimeLimit']);
+        $result->setTimeoutForSmallTests($arguments['timeoutForSmallTests']);
+        $result->setTimeoutForMediumTests($arguments['timeoutForMediumTests']);
+        $result->setTimeoutForLargeTests($arguments['timeoutForLargeTests']);
 
-            $result->setTimeoutForLargeTests(
-              $arguments['timeoutForLargeTests']
-            );
+        if ($suite instanceof PHPUnit_Framework_TestSuite) {
+            $suite->setRunTestInSeparateProcess($arguments['processIsolation']);
         }
 
-        $suite->run(
-          $result,
-          $arguments['filter'],
-          $arguments['groups'],
-          $arguments['excludeGroups'],
-          $arguments['processIsolation']
-        );
+        $suite->run($result);
 
         unset($suite);
         $result->flushListeners();
@@ -368,14 +445,24 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
                 unset($writer);
             }
 
-            if (isset($arguments['reportDirectory'])) {
+            if (isset($arguments['coverageCrap4J'])) {
+                $this->printer->write(
+                  "\nGenerating Crap4J report XML file ..."
+                );
+
+                $writer = new PHP_CodeCoverage_Report_Crap4j;
+                $writer->process($codeCoverage, $arguments['coverageCrap4J']);
+
+                $this->printer->write(" done\n");
+                unset($writer);
+            }
+
+            if (isset($arguments['coverageHtml'])) {
                 $this->printer->write(
                   "\nGenerating code coverage report in HTML format ..."
                 );
 
                 $writer = new PHP_CodeCoverage_Report_HTML(
-                  $arguments['reportCharset'],
-                  $arguments['reportHighlight'],
                   $arguments['reportLowUpperBound'],
                   $arguments['reportHighLowerBound'],
                   sprintf(
@@ -384,7 +471,7 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
                   )
                 );
 
-                $writer->process($codeCoverage, $arguments['reportDirectory']);
+                $writer->process($codeCoverage, $arguments['coverageHtml']);
 
                 $this->printer->write(" done\n");
                 unset($writer);
@@ -405,20 +492,34 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
             if (isset($arguments['coverageText'])) {
                 if ($arguments['coverageText'] == 'php://stdout') {
                     $outputStream = $this->printer;
-                    $colors       = (bool)$arguments['colors'];
+                    $colors       = (bool) $arguments['colors'];
                 } else {
                     $outputStream = new PHPUnit_Util_Printer($arguments['coverageText']);
-                    $colors       = FALSE;
+                    $colors       = false;
                 }
 
-                $writer = new PHP_CodeCoverage_Report_Text(
-                  $outputStream,
+                $processor = new PHP_CodeCoverage_Report_Text(
                   $arguments['reportLowUpperBound'],
                   $arguments['reportHighLowerBound'],
-                  $arguments['coverageTextShowUncoveredFiles']
+                  $arguments['coverageTextShowUncoveredFiles'],
+                  $arguments['coverageTextShowOnlySummary']
                 );
 
-                $writer->process($codeCoverage, $colors);
+                $outputStream->write(
+                  $processor->process($codeCoverage, $colors)
+                );
+            }
+
+            if (isset($arguments['coverageXml'])) {
+                $this->printer->write(
+                  "\nGenerating code coverage report in PHPUnit XML format ..."
+                );
+
+                $writer = new PHP_CodeCoverage_Report_XML;
+                $writer->process($codeCoverage, $arguments['coverageXml']);
+
+                $this->printer->write(" done\n");
+                unset($writer);
             }
         }
 
@@ -426,7 +527,7 @@ public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array())
     }
 
     /**
-     * @param  PHPUnit_TextUI_ResultPrinter $resultPrinter
+     * @param PHPUnit_TextUI_ResultPrinter $resultPrinter
      */
     public function setPrinter(PHPUnit_TextUI_ResultPrinter $resultPrinter)
     {
@@ -437,7 +538,7 @@ public function setPrinter(PHPUnit_TextUI_ResultPrinter $resultPrinter)
      * Override to define how to handle a failed loading of
      * a test suite.
      *
-     * @param  string  $message
+     * @param string $message
      */
     protected function runFailed($message)
     {
@@ -447,7 +548,7 @@ protected function runFailed($message)
     }
 
     /**
-     * @param  string $buffer
+     * @param string $buffer
      * @since  Method available since Release 3.1.0
      */
     protected static function write($buffer)
@@ -467,7 +568,7 @@ protected static function write($buffer)
      */
     public function getLoader()
     {
-        if ($this->loader === NULL) {
+        if ($this->loader === null) {
             $this->loader = new PHPUnit_Runner_StandardTestSuiteLoader;
         }
 
@@ -490,12 +591,12 @@ public static function printVersionString()
     {
         if (!self::$versionStringPrinted) {
             self::write(PHPUnit_Runner_Version::getVersionString() . "\n\n");
-            self::$versionStringPrinted = TRUE;
+            self::$versionStringPrinted = true;
         }
     }
 
     /**
-     * @param  array $arguments
+     * @param array $arguments
      * @since  Method available since Release 3.2.1
      */
     protected function handleConfiguration(array &$arguments)
@@ -507,8 +608,8 @@ protected function handleConfiguration(array &$arguments)
             );
         }
 
-        $arguments['debug']     = isset($arguments['debug'])     ? $arguments['debug']     : FALSE;
-        $arguments['filter']    = isset($arguments['filter'])    ? $arguments['filter']    : FALSE;
+        $arguments['debug']     = isset($arguments['debug'])     ? $arguments['debug']     : false;
+        $arguments['filter']    = isset($arguments['filter'])    ? $arguments['filter']    : false;
         $arguments['listeners'] = isset($arguments['listeners']) ? $arguments['listeners'] : array();
 
         if (isset($arguments['configuration'])) {
@@ -581,9 +682,24 @@ protected function handleConfiguration(array &$arguments)
                 $arguments['timeoutForLargeTests'] = $phpunitConfiguration['timeoutForLargeTests'];
             }
 
-            if (isset($phpunitConfiguration['strict']) &&
-                !isset($arguments['strict'])) {
-                $arguments['strict'] = $phpunitConfiguration['strict'];
+            if (isset($phpunitConfiguration['reportUselessTests']) &&
+                !isset($arguments['reportUselessTests'])) {
+                $arguments['reportUselessTests'] = $phpunitConfiguration['reportUselessTests'];
+            }
+
+            if (isset($phpunitConfiguration['strictCoverage']) &&
+                !isset($arguments['strictCoverage'])) {
+                $arguments['strictCoverage'] = $phpunitConfiguration['strictCoverage'];
+            }
+
+            if (isset($phpunitConfiguration['disallowTestOutput']) &&
+                !isset($arguments['disallowTestOutput'])) {
+                $arguments['disallowTestOutput'] = $phpunitConfiguration['disallowTestOutput'];
+            }
+
+            if (isset($phpunitConfiguration['enforceTimeLimit']) &&
+                !isset($arguments['enforceTimeLimit'])) {
+                $arguments['enforceTimeLimit'] = $phpunitConfiguration['enforceTimeLimit'];
             }
 
             if (isset($phpunitConfiguration['verbose']) &&
@@ -619,7 +735,7 @@ protected function handleConfiguration(array &$arguments)
             }
 
             foreach ($arguments['configuration']->getListenerConfiguration() as $listener) {
-                if (!class_exists($listener['class'], FALSE) &&
+                if (!class_exists($listener['class'], false) &&
                     $listener['file'] !== '') {
                     require_once $listener['file'];
                 }
@@ -644,18 +760,18 @@ protected function handleConfiguration(array &$arguments)
 
             $loggingConfiguration = $arguments['configuration']->getLoggingConfiguration();
 
-            if (isset($loggingConfiguration['coverage-html']) &&
-                !isset($arguments['reportDirectory'])) {
-                if (isset($loggingConfiguration['charset']) &&
-                    !isset($arguments['reportCharset'])) {
-                    $arguments['reportCharset'] = $loggingConfiguration['charset'];
-                }
+            if (isset($loggingConfiguration['coverage-clover']) &&
+                !isset($arguments['coverageClover'])) {
+                $arguments['coverageClover'] = $loggingConfiguration['coverage-clover'];
+            }
 
-                if (isset($loggingConfiguration['highlight']) &&
-                    !isset($arguments['reportHighlight'])) {
-                    $arguments['reportHighlight'] = $loggingConfiguration['highlight'];
-                }
+            if (isset($loggingConfiguration['coverage-crap4j']) &&
+                !isset($arguments['coverageCrap4J'])) {
+                $arguments['coverageCrap4J'] = $loggingConfiguration['coverage-crap4j'];
+            }
 
+            if (isset($loggingConfiguration['coverage-html']) &&
+                !isset($arguments['coverageHtml'])) {
                 if (isset($loggingConfiguration['lowUpperBound']) &&
                     !isset($arguments['reportLowUpperBound'])) {
                     $arguments['reportLowUpperBound'] = $loggingConfiguration['lowUpperBound'];
@@ -666,12 +782,7 @@ protected function handleConfiguration(array &$arguments)
                     $arguments['reportHighLowerBound'] = $loggingConfiguration['highLowerBound'];
                 }
 
-                $arguments['reportDirectory'] = $loggingConfiguration['coverage-html'];
-            }
-
-            if (isset($loggingConfiguration['coverage-clover']) &&
-                !isset($arguments['coverageClover'])) {
-                $arguments['coverageClover'] = $loggingConfiguration['coverage-clover'];
+                $arguments['coverageHtml'] = $loggingConfiguration['coverage-html'];
             }
 
             if (isset($loggingConfiguration['coverage-php']) &&
@@ -685,8 +796,18 @@ protected function handleConfiguration(array &$arguments)
                 if (isset($loggingConfiguration['coverageTextShowUncoveredFiles'])) {
                     $arguments['coverageTextShowUncoveredFiles'] = $loggingConfiguration['coverageTextShowUncoveredFiles'];
                 } else {
-                    $arguments['coverageTextShowUncoveredFiles'] = FALSE;
+                    $arguments['coverageTextShowUncoveredFiles'] = false;
                 }
+                if (isset($loggingConfiguration['coverageTextShowOnlySummary'])) {
+                    $arguments['coverageTextShowOnlySummary'] = $loggingConfiguration['coverageTextShowOnlySummary'];
+                } else {
+                    $arguments['coverageTextShowOnlySummary'] = false;
+                }
+            }
+
+            if (isset($loggingConfiguration['coverage-xml']) &&
+                !isset($arguments['coverageXml'])) {
+                $arguments['coverageXml'] = $loggingConfiguration['coverage-xml'];
             }
 
             if (isset($loggingConfiguration['json']) &&
@@ -696,7 +817,7 @@ protected function handleConfiguration(array &$arguments)
 
             if (isset($loggingConfiguration['plain'])) {
                 $arguments['listeners'][] = new PHPUnit_TextUI_ResultPrinter(
-                  $loggingConfiguration['plain'], TRUE
+                  $loggingConfiguration['plain'], true
                 );
             }
 
@@ -726,33 +847,47 @@ protected function handleConfiguration(array &$arguments)
             }
 
             if ((isset($arguments['coverageClover']) ||
-                isset($arguments['reportDirectory']) ||
-                isset($arguments['coveragePHP']) ||
-                isset($arguments['coverageText'])) &&
-                extension_loaded('xdebug')) {
+                isset($arguments['coverageCrap4J']) ||
+                isset($arguments['coverageHtml']) ||
+                isset($arguments['coveragePHP'])) ||
+                isset($arguments['coverageText']) &&
+                $this->canCollectCodeCoverage) {
 
                 $filterConfiguration = $arguments['configuration']->getFilterConfiguration();
                 $arguments['addUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['addUncoveredFilesFromWhitelist'];
                 $arguments['processUncoveredFilesFromWhitelist'] = $filterConfiguration['whitelist']['processUncoveredFilesFromWhitelist'];
 
-                foreach ($filterConfiguration['blacklist']['include']['directory'] as $dir) {
-                    $this->codeCoverageFilter->addDirectoryToBlacklist(
-                      $dir['path'], $dir['suffix'], $dir['prefix'], $dir['group']
-                    );
-                }
+                if (empty($filterConfiguration['whitelist']['include']['directory']) &&
+                    empty($filterConfiguration['whitelist']['include']['file'])) {
+                    if (defined('__PHPUNIT_PHAR__')) {
+                        $this->codeCoverageFilter->addFileToBlacklist(__PHPUNIT_PHAR__);
+                    }
 
-                foreach ($filterConfiguration['blacklist']['include']['file'] as $file) {
-                    $this->codeCoverageFilter->addFileToBlacklist($file);
-                }
+                    $blacklist = new PHPUnit_Util_Blacklist;
 
-                foreach ($filterConfiguration['blacklist']['exclude']['directory'] as $dir) {
-                    $this->codeCoverageFilter->removeDirectoryFromBlacklist(
-                      $dir['path'], $dir['suffix'], $dir['prefix'], $dir['group']
-                    );
-                }
+                    foreach ($blacklist->getBlacklistedDirectories() as $directory) {
+                        $this->codeCoverageFilter->addDirectoryToBlacklist($directory);
+                    }
+
+                    foreach ($filterConfiguration['blacklist']['include']['directory'] as $dir) {
+                        $this->codeCoverageFilter->addDirectoryToBlacklist(
+                            $dir['path'], $dir['suffix'], $dir['prefix'], $dir['group']
+                        );
+                    }
+
+                    foreach ($filterConfiguration['blacklist']['include']['file'] as $file) {
+                        $this->codeCoverageFilter->addFileToBlacklist($file);
+                    }
+
+                    foreach ($filterConfiguration['blacklist']['exclude']['directory'] as $dir) {
+                        $this->codeCoverageFilter->removeDirectoryFromBlacklist(
+                            $dir['path'], $dir['suffix'], $dir['prefix'], $dir['group']
+                        );
+                    }
 
-                foreach ($filterConfiguration['blacklist']['exclude']['file'] as $file) {
-                    $this->codeCoverageFilter->removeFileFromBlacklist($file);
+                    foreach ($filterConfiguration['blacklist']['exclude']['file'] as $file) {
+                        $this->codeCoverageFilter->removeFileFromBlacklist($file);
+                    }
                 }
 
                 foreach ($filterConfiguration['whitelist']['include']['directory'] as $dir) {
@@ -777,41 +912,72 @@ protected function handleConfiguration(array &$arguments)
             }
         }
 
-        $arguments['addUncoveredFilesFromWhitelist']     = isset($arguments['addUncoveredFilesFromWhitelist'])     ? $arguments['addUncoveredFilesFromWhitelist']     : TRUE;
-        $arguments['processUncoveredFilesFromWhitelist'] = isset($arguments['processUncoveredFilesFromWhitelist']) ? $arguments['processUncoveredFilesFromWhitelist'] : FALSE;
-        $arguments['backupGlobals']                      = isset($arguments['backupGlobals'])                      ? $arguments['backupGlobals']                      : NULL;
-        $arguments['backupStaticAttributes']             = isset($arguments['backupStaticAttributes'])             ? $arguments['backupStaticAttributes']             : NULL;
-        $arguments['cacheTokens']                        = isset($arguments['cacheTokens'])                        ? $arguments['cacheTokens']                        : FALSE;
-        $arguments['colors']                             = isset($arguments['colors'])                             ? $arguments['colors']                             : FALSE;
-        $arguments['convertErrorsToExceptions']          = isset($arguments['convertErrorsToExceptions'])          ? $arguments['convertErrorsToExceptions']          : TRUE;
-        $arguments['convertNoticesToExceptions']         = isset($arguments['convertNoticesToExceptions'])         ? $arguments['convertNoticesToExceptions']         : TRUE;
-        $arguments['convertWarningsToExceptions']        = isset($arguments['convertWarningsToExceptions'])        ? $arguments['convertWarningsToExceptions']        : TRUE;
+        $arguments['addUncoveredFilesFromWhitelist']     = isset($arguments['addUncoveredFilesFromWhitelist'])     ? $arguments['addUncoveredFilesFromWhitelist']     : true;
+        $arguments['processUncoveredFilesFromWhitelist'] = isset($arguments['processUncoveredFilesFromWhitelist']) ? $arguments['processUncoveredFilesFromWhitelist'] : false;
+        $arguments['backupGlobals']                      = isset($arguments['backupGlobals'])                      ? $arguments['backupGlobals']                      : null;
+        $arguments['backupStaticAttributes']             = isset($arguments['backupStaticAttributes'])             ? $arguments['backupStaticAttributes']             : null;
+        $arguments['cacheTokens']                        = isset($arguments['cacheTokens'])                        ? $arguments['cacheTokens']                        : false;
+        $arguments['colors']                             = isset($arguments['colors'])                             ? $arguments['colors']                             : false;
+        $arguments['convertErrorsToExceptions']          = isset($arguments['convertErrorsToExceptions'])          ? $arguments['convertErrorsToExceptions']          : true;
+        $arguments['convertNoticesToExceptions']         = isset($arguments['convertNoticesToExceptions'])         ? $arguments['convertNoticesToExceptions']         : true;
+        $arguments['convertWarningsToExceptions']        = isset($arguments['convertWarningsToExceptions'])        ? $arguments['convertWarningsToExceptions']        : true;
         $arguments['excludeGroups']                      = isset($arguments['excludeGroups'])                      ? $arguments['excludeGroups']                      : array();
         $arguments['groups']                             = isset($arguments['groups'])                             ? $arguments['groups']                             : array();
-        $arguments['logIncompleteSkipped']               = isset($arguments['logIncompleteSkipped'])               ? $arguments['logIncompleteSkipped']               : FALSE;
-        $arguments['processIsolation']                   = isset($arguments['processIsolation'])                   ? $arguments['processIsolation']                   : FALSE;
-        $arguments['repeat']                             = isset($arguments['repeat'])                             ? $arguments['repeat']                             : FALSE;
-        $arguments['reportCharset']                      = isset($arguments['reportCharset'])                      ? $arguments['reportCharset']                      : 'UTF-8';
-        $arguments['reportHighlight']                    = isset($arguments['reportHighlight'])                    ? $arguments['reportHighlight']                    : FALSE;
-        $arguments['reportHighLowerBound']               = isset($arguments['reportHighLowerBound'])               ? $arguments['reportHighLowerBound']               : 70;
-        $arguments['reportLowUpperBound']                = isset($arguments['reportLowUpperBound'])                ? $arguments['reportLowUpperBound']                : 35;
-        $arguments['stopOnError']                        = isset($arguments['stopOnError'])                        ? $arguments['stopOnError']                        : FALSE;
-        $arguments['stopOnFailure']                      = isset($arguments['stopOnFailure'])                      ? $arguments['stopOnFailure']                      : FALSE;
-        $arguments['stopOnIncomplete']                   = isset($arguments['stopOnIncomplete'])                   ? $arguments['stopOnIncomplete']                   : FALSE;
-        $arguments['stopOnSkipped']                      = isset($arguments['stopOnSkipped'])                      ? $arguments['stopOnSkipped']                      : FALSE;
+        $arguments['logIncompleteSkipped']               = isset($arguments['logIncompleteSkipped'])               ? $arguments['logIncompleteSkipped']               : false;
+        $arguments['processIsolation']                   = isset($arguments['processIsolation'])                   ? $arguments['processIsolation']                   : false;
+        $arguments['repeat']                             = isset($arguments['repeat'])                             ? $arguments['repeat']                             : false;
+        $arguments['reportHighLowerBound']               = isset($arguments['reportHighLowerBound'])               ? $arguments['reportHighLowerBound']               : 90;
+        $arguments['reportLowUpperBound']                = isset($arguments['reportLowUpperBound'])                ? $arguments['reportLowUpperBound']                : 50;
+        $arguments['stopOnError']                        = isset($arguments['stopOnError'])                        ? $arguments['stopOnError']                        : false;
+        $arguments['stopOnFailure']                      = isset($arguments['stopOnFailure'])                      ? $arguments['stopOnFailure']                      : false;
+        $arguments['stopOnIncomplete']                   = isset($arguments['stopOnIncomplete'])                   ? $arguments['stopOnIncomplete']                   : false;
+        $arguments['stopOnRisky']                        = isset($arguments['stopOnRisky'])                        ? $arguments['stopOnRisky']                        : false;
+        $arguments['stopOnSkipped']                      = isset($arguments['stopOnSkipped'])                      ? $arguments['stopOnSkipped']                      : false;
         $arguments['timeoutForSmallTests']               = isset($arguments['timeoutForSmallTests'])               ? $arguments['timeoutForSmallTests']               : 1;
         $arguments['timeoutForMediumTests']              = isset($arguments['timeoutForMediumTests'])              ? $arguments['timeoutForMediumTests']              : 10;
         $arguments['timeoutForLargeTests']               = isset($arguments['timeoutForLargeTests'])               ? $arguments['timeoutForLargeTests']               : 60;
-        $arguments['strict']                             = isset($arguments['strict'])                             ? $arguments['strict']                             : FALSE;
-        $arguments['verbose']                            = isset($arguments['verbose'])                            ? $arguments['verbose']                            : FALSE;
-
-        if ($arguments['filter'] !== FALSE &&
-            preg_match('/^[a-zA-Z0-9_]/', $arguments['filter'])) {
-            // Escape delimiters in regular expression. Do NOT use preg_quote,
-            // to keep magic characters.
-            $arguments['filter'] = '/' . str_replace(
-              '/', '\\/', $arguments['filter']
-            ) . '/';
+        $arguments['reportUselessTests']                 = isset($arguments['reportUselessTests'])                 ? $arguments['reportUselessTests']                 : false;
+        $arguments['strictCoverage']                     = isset($arguments['strictCoverage'])                     ? $arguments['strictCoverage']                     : false;
+        $arguments['disallowTestOutput']                 = isset($arguments['disallowTestOutput'])                 ? $arguments['disallowTestOutput']                 : false;
+        $arguments['enforceTimeLimit']                   = isset($arguments['enforceTimeLimit'])                   ? $arguments['enforceTimeLimit']                   : false;
+        $arguments['verbose']                            = isset($arguments['verbose'])                            ? $arguments['verbose']                            : false;
+    }
+
+    /**
+     * @param string $message
+     * @since Method available since Release 4.0.0
+     */
+    private function showExtensionNotLoadedMessage($extension, $message = '')
+    {
+        if (isset($this->missingExtensions[$extension])) {
+            return;
+        }
+
+        if (!empty($message)) {
+            $message = ' ' . $message;
+        }
+
+        $this->showMessage(
+          'The ' . $extension . ' extension is not loaded.' . $message . "\n"
+        );
+
+        $this->missingExtensions[$extension] = true;
+    }
+
+    /**
+     * Shows a message.
+     *
+     * @param string  $message
+     * @param boolean $exit
+     * @since Method available since Release 4.0.0
+     */
+    private function showMessage($message, $exit = false)
+    {
+        $this->printVersionString();
+        $this->write($message . "\n");
+
+        if ($exit) {
+            exit(self::EXCEPTION_EXIT);
         }
     }
 }
diff --git a/core/vendor/phpunit/phpunit/src/Util/Blacklist.php b/core/vendor/phpunit/phpunit/src/Util/Blacklist.php
new file mode 100644
index 0000000000000000000000000000000000000000..40f978812e692291cd1b003e8a3ee0eaf46e6224
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Util/Blacklist.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ * Utility class for blacklisting PHPUnit's own source code files.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class PHPUnit_Util_Blacklist
+{
+    /**
+     * @var array
+     */
+    public static $blacklistedClassNames = array(
+        'File_Iterator' => 1,
+        'PHP_CodeCoverage' => 1,
+        'PHP_Invoker' => 1,
+        'PHP_Timer' => 1,
+        'PHP_Token' => 1,
+        'PHPUnit_Framework_TestCase' => 2,
+        'PHPUnit_Extensions_Database_TestCase' => 2,
+        'PHPUnit_Framework_MockObject_Generator' => 2,
+        'PHPUnit_Extensions_SeleniumTestCase' => 2,
+        'PHPUnit_Extensions_Story_TestCase' => 2,
+        'Text_Template' => 1,
+        'Symfony\Component\Yaml\Yaml' => 1,
+        'SebastianBergmann\Diff\Diff' => 1,
+        'SebastianBergmann\Environment\Runtime' => 1,
+        'SebastianBergmann\Comparator\Comparator' => 1,
+        'SebastianBergmann\Exporter\Exporter' => 1,
+        'SebastianBergmann\Version' => 1,
+        'Composer\Autoload\ClassLoader' => 1
+    );
+
+    /**
+     * @var array
+     */
+    private static $directories;
+
+    /**
+     * @return array
+     * @since  Method available since Release 4.1.0
+     */
+    public function getBlacklistedDirectories()
+    {
+        $this->initialize();
+
+        return self::$directories;
+    }
+
+    /**
+     * @param  string  $file
+     * @return boolean
+     */
+    public function isBlacklisted($file)
+    {
+        if (defined('PHPUNIT_TESTSUITE')) {
+            return false;
+        }
+
+        $this->initialize();
+
+        foreach (self::$directories as $directory) {
+            if (strpos($file, $directory) === 0) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private function initialize()
+    {
+        if (self::$directories === null) {
+            self::$directories = array();
+
+            foreach (self::$blacklistedClassNames as $className => $parent) {
+                if (!class_exists($className)) {
+                    continue;
+                }
+
+                $reflector = new ReflectionClass($className);
+                $directory = $reflector->getFileName();
+
+                for ($i = 0; $i < $parent; $i++) {
+                    $directory = dirname($directory);
+                }
+
+                self::$directories[] = $directory;
+            }
+       }
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Configuration.php b/core/vendor/phpunit/phpunit/src/Util/Configuration.php
similarity index 75%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Configuration.php
rename to core/vendor/phpunit/phpunit/src/Util/Configuration.php
index 8b52e3abfbf92e9bdc17d7e3908c3d843623d34b..5c037d33b74f9f7f590c5ffdf2dda8316be8a58d 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Configuration.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Configuration.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.2.0
@@ -55,6 +55,7 @@
  *          bootstrap="/path/to/bootstrap.php"
  *          cacheTokens="false"
  *          colors="false"
+ *          stderr="false"
  *          convertErrorsToExceptions="true"
  *          convertNoticesToExceptions="true"
  *          convertWarningsToExceptions="true"
@@ -65,12 +66,16 @@
  *          stopOnError="false"
  *          stopOnFailure="false"
  *          stopOnIncomplete="false"
+ *          stopOnRisky="false"
  *          stopOnSkipped="false"
  *          testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
  *          timeoutForSmallTests="1"
  *          timeoutForMediumTests="10"
  *          timeoutForLargeTests="60"
- *          strict="false"
+ *          beStrictAboutTestsThatDoNotTestAnything="false"
+ *          beStrictAboutOutputDuringTests="false"
+ *          beStrictAboutTestSize="false"
+ *          checkForUnintentionallyCoveredCode="false"
  *          verbose="false">
  *   <testsuites>
  *     <testsuite name="My Test Suite">
@@ -129,9 +134,7 @@
  *   </listeners>
  *
  *   <logging>
- *     <log type="coverage-html" target="/tmp/report"
-            charset="UTF-8" highlight="false"
- *          lowUpperBound="35" highLowerBound="70"/>
+ *     <log type="coverage-html" target="/tmp/report" lowUpperBound="50" highLowerBound="90"/>
  *     <log type="coverage-clover" target="/tmp/clover.xml"/>
  *     <log type="json" target="/tmp/logfile.json"/>
  *     <log type="plain" target="/tmp/logfile.txt"/>
@@ -139,6 +142,7 @@
  *     <log type="junit" target="/tmp/logfile.xml" logIncompleteSkipped="false"/>
  *     <log type="testdox-html" target="/tmp/testdox.html"/>
  *     <log type="testdox-text" target="/tmp/testdox.txt"/>
+ *     <log type="coverage-crap4j" target="/tmp/crap.xml"/>
  *   </logging>
  *
  *   <php>
@@ -168,7 +172,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.2.0
@@ -184,26 +188,26 @@ class PHPUnit_Util_Configuration
     /**
      * Loads a PHPUnit configuration file.
      *
-     * @param  string $filename
+     * @param string $filename
      */
     protected function __construct($filename)
     {
         $this->filename = $filename;
-        $this->document = PHPUnit_Util_XML::loadFile($filename, FALSE, TRUE);
+        $this->document = PHPUnit_Util_XML::loadFile($filename, false, true);
         $this->xpath    = new DOMXPath($this->document);
     }
 
     /**
      * @since  Method available since Release 3.4.0
      */
-    private final function __clone()
+    final private function __clone()
     {
     }
 
     /**
      * Returns a PHPUnit configuration object.
      *
-     * @param  string $filename
+     * @param  string                     $filename
      * @return PHPUnit_Util_Configuration
      * @since  Method available since Release 3.4.0
      */
@@ -211,7 +215,7 @@ public static function getInstance($filename)
     {
         $realpath = realpath($filename);
 
-        if ($realpath === FALSE) {
+        if ($realpath === false) {
             throw new PHPUnit_Framework_Exception(
               sprintf(
                 'Could not read "%s".',
@@ -246,27 +250,27 @@ public function getFilename()
      */
     public function getFilterConfiguration()
     {
-        $addUncoveredFilesFromWhitelist     = TRUE;
-        $processUncoveredFilesFromWhitelist = FALSE;
+        $addUncoveredFilesFromWhitelist     = true;
+        $processUncoveredFilesFromWhitelist = false;
 
         $tmp = $this->xpath->query('filter/whitelist');
 
         if ($tmp->length == 1) {
             if ($tmp->item(0)->hasAttribute('addUncoveredFilesFromWhitelist')) {
                 $addUncoveredFilesFromWhitelist = $this->getBoolean(
-                  (string)$tmp->item(0)->getAttribute(
+                  (string) $tmp->item(0)->getAttribute(
                     'addUncoveredFilesFromWhitelist'
                   ),
-                  TRUE
+                  true
                 );
             }
 
             if ($tmp->item(0)->hasAttribute('processUncoveredFilesFromWhitelist')) {
                 $processUncoveredFilesFromWhitelist = $this->getBoolean(
-                  (string)$tmp->item(0)->getAttribute(
+                  (string) $tmp->item(0)->getAttribute(
                     'processUncoveredFilesFromWhitelist'
                   ),
-                  FALSE
+                  false
                 );
             }
         }
@@ -327,11 +331,11 @@ public function getGroupConfiguration()
         );
 
         foreach ($this->xpath->query('groups/include/group') as $group) {
-            $groups['include'][] = (string)$group->nodeValue;
+            $groups['include'][] = (string) $group->nodeValue;
         }
 
         foreach ($this->xpath->query('groups/exclude/group') as $group) {
-            $groups['exclude'][] = (string)$group->nodeValue;
+            $groups['exclude'][] = (string) $group->nodeValue;
         }
 
         return $groups;
@@ -348,13 +352,13 @@ public function getListenerConfiguration()
         $result = array();
 
         foreach ($this->xpath->query('listeners/listener') as $listener) {
-            $class     = (string)$listener->getAttribute('class');
+            $class     = (string) $listener->getAttribute('class');
             $file      = '';
             $arguments = array();
 
             if ($listener->hasAttribute('file')) {
                 $file = $this->toAbsolutePath(
-                  (string)$listener->getAttribute('file'), TRUE
+                  (string) $listener->getAttribute('file'), true
                 );
             }
 
@@ -364,7 +368,7 @@ public function getListenerConfiguration()
                     if ($argument instanceof DOMElement) {
                         if ($argument->tagName == 'file' ||
                             $argument->tagName == 'directory') {
-                            $arguments[] = $this->toAbsolutePath((string)$argument->nodeValue);
+                            $arguments[] = $this->toAbsolutePath((string) $argument->nodeValue);
                         } else {
                             $arguments[] = PHPUnit_Util_XML::xmlToVariable($argument);
                         }
@@ -393,51 +397,38 @@ public function getLoggingConfiguration()
         $result = array();
 
         foreach ($this->xpath->query('logging/log') as $log) {
-            $type = (string)$log->getAttribute('type');
+            $type = (string) $log->getAttribute('type');
 
             $target = $this->toAbsolutePath(
-              (string)$log->getAttribute('target')
+              (string) $log->getAttribute('target')
             );
 
             if ($type == 'coverage-html') {
-                if ($log->hasAttribute('title')) {
-                    $result['title'] = (string)$log->getAttribute('title');
-                }
-
-                if ($log->hasAttribute('charset')) {
-                    $result['charset'] = (string)$log->getAttribute('charset');
-                }
-
                 if ($log->hasAttribute('lowUpperBound')) {
-                    $result['lowUpperBound'] = (string)$log->getAttribute('lowUpperBound');
+                    $result['lowUpperBound'] = (string) $log->getAttribute('lowUpperBound');
                 }
 
                 if ($log->hasAttribute('highLowerBound')) {
-                    $result['highLowerBound'] = (string)$log->getAttribute('highLowerBound');
+                    $result['highLowerBound'] = (string) $log->getAttribute('highLowerBound');
                 }
-
-                if ($log->hasAttribute('highlight')) {
-                    $result['highlight'] = $this->getBoolean(
-                      (string)$log->getAttribute('highlight'),
-                      FALSE
-                    );
-                }
-            }
-
-            else if ($type == 'junit') {
+            } elseif ($type == 'junit') {
                 if ($log->hasAttribute('logIncompleteSkipped')) {
                     $result['logIncompleteSkipped'] = $this->getBoolean(
-                      (string)$log->getAttribute('logIncompleteSkipped'),
-                      FALSE
+                      (string) $log->getAttribute('logIncompleteSkipped'),
+                      false
                     );
                 }
-            }
-
-            else if ($type == 'coverage-text') {
+            } elseif ($type == 'coverage-text') {
                 if ($log->hasAttribute('showUncoveredFiles')) {
                     $result['coverageTextShowUncoveredFiles'] = $this->getBoolean(
-                      (string)$log->getAttribute('showUncoveredFiles'),
-                      FALSE
+                      (string) $log->getAttribute('showUncoveredFiles'),
+                      false
+                    );
+                }
+                if ($log->hasAttribute('showOnlySummary')) {
+                    $result['coverageTextShowOnlySummary'] = $this->getBoolean(
+                      (string) $log->getAttribute('showOnlySummary'),
+                      false
                     );
                 }
             }
@@ -471,29 +462,29 @@ public function getPHPConfiguration()
         );
 
         foreach ($this->xpath->query('php/includePath') as $includePath) {
-            $path = (string)$includePath->nodeValue;
+            $path = (string) $includePath->nodeValue;
 
             $result['include_path'][] = $this->toAbsolutePath($path);
         }
 
         foreach ($this->xpath->query('php/ini') as $ini) {
-            $name  = (string)$ini->getAttribute('name');
-            $value = (string)$ini->getAttribute('value');
+            $name  = (string) $ini->getAttribute('name');
+            $value = (string) $ini->getAttribute('value');
 
             $result['ini'][$name] = $value;
         }
 
         foreach ($this->xpath->query('php/const') as $const) {
-            $name  = (string)$const->getAttribute('name');
-            $value = (string)$const->getAttribute('value');
+            $name  = (string) $const->getAttribute('name');
+            $value = (string) $const->getAttribute('value');
 
             $result['const'][$name] = $this->getBoolean($value, $value);
         }
 
         foreach (array('var', 'env', 'post', 'get', 'cookie', 'server', 'files', 'request') as $array) {
             foreach ($this->xpath->query('php/' . $array) as $var) {
-                $name  = (string)$var->getAttribute('name');
-                $value = (string)$var->getAttribute('value');
+                $name  = (string) $var->getAttribute('name');
+                $value = (string) $var->getAttribute('value');
 
                 $result[$array][$name] = $this->getBoolean($value, $value);
             }
@@ -534,17 +525,13 @@ public function handlePHPConfiguration()
             }
         }
 
-        foreach (array('var', 'env', 'post', 'get', 'cookie', 'server', 'files', 'request') as $array) {
+        foreach (array('var', 'post', 'get', 'cookie', 'server', 'files', 'request') as $array) {
             // See https://github.com/sebastianbergmann/phpunit/issues/277
             switch ($array) {
                 case 'var':
                     $target = &$GLOBALS;
                     break;
 
-                case 'env':
-                    $target = &$_ENV;
-                    break;
-
                 case 'server':
                     $target = &$_SERVER;
                     break;
@@ -560,7 +547,12 @@ public function handlePHPConfiguration()
         }
 
         foreach ($configuration['env'] as $name => $value) {
-            putenv("$name=$value");
+            if (false === getenv($name)) {
+                putenv("{$name}={$value}");
+            }
+            if (!isset($_ENV[$name])) {
+                $_ENV[$name] = $value;
+            }
         }
     }
 
@@ -577,146 +569,190 @@ public function getPHPUnitConfiguration()
 
         if ($root->hasAttribute('cacheTokens')) {
             $result['cacheTokens'] = $this->getBoolean(
-              (string)$root->getAttribute('cacheTokens'), FALSE
+              (string) $root->getAttribute('cacheTokens'), false
             );
         }
 
         if ($root->hasAttribute('colors')) {
             $result['colors'] = $this->getBoolean(
-              (string)$root->getAttribute('colors'), FALSE
+              (string) $root->getAttribute('colors'), false
+            );
+        }
+
+        /**
+         * Issue #657
+         */
+        if ($root->hasAttribute('stderr')) {
+            $result['stderr'] = $this->getBoolean(
+              (string)$root->getAttribute('stderr'), FALSE
             );
         }
 
         if ($root->hasAttribute('backupGlobals')) {
             $result['backupGlobals'] = $this->getBoolean(
-              (string)$root->getAttribute('backupGlobals'), TRUE
+              (string) $root->getAttribute('backupGlobals'), true
             );
         }
 
         if ($root->hasAttribute('backupStaticAttributes')) {
             $result['backupStaticAttributes'] = $this->getBoolean(
-              (string)$root->getAttribute('backupStaticAttributes'), FALSE
+              (string) $root->getAttribute('backupStaticAttributes'), false
             );
         }
 
         if ($root->hasAttribute('bootstrap')) {
             $result['bootstrap'] = $this->toAbsolutePath(
-              (string)$root->getAttribute('bootstrap')
+              (string) $root->getAttribute('bootstrap')
             );
         }
 
         if ($root->hasAttribute('convertErrorsToExceptions')) {
             $result['convertErrorsToExceptions'] = $this->getBoolean(
-              (string)$root->getAttribute('convertErrorsToExceptions'), TRUE
+              (string) $root->getAttribute('convertErrorsToExceptions'), true
             );
         }
 
         if ($root->hasAttribute('convertNoticesToExceptions')) {
             $result['convertNoticesToExceptions'] = $this->getBoolean(
-              (string)$root->getAttribute('convertNoticesToExceptions'), TRUE
+              (string) $root->getAttribute('convertNoticesToExceptions'), true
             );
         }
 
         if ($root->hasAttribute('convertWarningsToExceptions')) {
             $result['convertWarningsToExceptions'] = $this->getBoolean(
-              (string)$root->getAttribute('convertWarningsToExceptions'), TRUE
+              (string) $root->getAttribute('convertWarningsToExceptions'), true
             );
         }
 
         if ($root->hasAttribute('forceCoversAnnotation')) {
             $result['forceCoversAnnotation'] = $this->getBoolean(
-              (string)$root->getAttribute('forceCoversAnnotation'), FALSE
+              (string) $root->getAttribute('forceCoversAnnotation'), false
             );
         }
 
         if ($root->hasAttribute('mapTestClassNameToCoveredClassName')) {
             $result['mapTestClassNameToCoveredClassName'] = $this->getBoolean(
-              (string)$root->getAttribute('mapTestClassNameToCoveredClassName'),
-              FALSE
+              (string) $root->getAttribute('mapTestClassNameToCoveredClassName'),
+              false
             );
         }
 
         if ($root->hasAttribute('processIsolation')) {
             $result['processIsolation'] = $this->getBoolean(
-              (string)$root->getAttribute('processIsolation'), FALSE
+              (string) $root->getAttribute('processIsolation'), false
             );
         }
 
         if ($root->hasAttribute('stopOnError')) {
             $result['stopOnError'] = $this->getBoolean(
-              (string)$root->getAttribute('stopOnError'), FALSE
+              (string) $root->getAttribute('stopOnError'), false
             );
         }
 
         if ($root->hasAttribute('stopOnFailure')) {
             $result['stopOnFailure'] = $this->getBoolean(
-              (string)$root->getAttribute('stopOnFailure'), FALSE
+              (string) $root->getAttribute('stopOnFailure'), false
             );
         }
 
         if ($root->hasAttribute('stopOnIncomplete')) {
             $result['stopOnIncomplete'] = $this->getBoolean(
-              (string)$root->getAttribute('stopOnIncomplete'), FALSE
+              (string) $root->getAttribute('stopOnIncomplete'), false
+            );
+        }
+
+        if ($root->hasAttribute('stopOnRisky')) {
+            $result['stopOnRisky'] = $this->getBoolean(
+              (string) $root->getAttribute('stopOnRisky'), false
             );
         }
 
         if ($root->hasAttribute('stopOnSkipped')) {
             $result['stopOnSkipped'] = $this->getBoolean(
-              (string)$root->getAttribute('stopOnSkipped'), FALSE
+              (string) $root->getAttribute('stopOnSkipped'), false
             );
         }
 
         if ($root->hasAttribute('testSuiteLoaderClass')) {
-            $result['testSuiteLoaderClass'] = (string)$root->getAttribute(
+            $result['testSuiteLoaderClass'] = (string) $root->getAttribute(
               'testSuiteLoaderClass'
             );
         }
 
         if ($root->hasAttribute('testSuiteLoaderFile')) {
-            $result['testSuiteLoaderFile'] = (string)$root->getAttribute(
-              'testSuiteLoaderFile'
+            $result['testSuiteLoaderFile'] = $this->toAbsolutePath(
+              (string) $root->getAttribute('testSuiteLoaderFile')
             );
         }
 
         if ($root->hasAttribute('printerClass')) {
-            $result['printerClass'] = (string)$root->getAttribute(
+            $result['printerClass'] = (string) $root->getAttribute(
               'printerClass'
             );
         }
 
         if ($root->hasAttribute('printerFile')) {
-            $result['printerFile'] = (string)$root->getAttribute(
-              'printerFile'
+            $result['printerFile'] = $this->toAbsolutePath(
+              (string) $root->getAttribute('printerFile')
             );
         }
 
         if ($root->hasAttribute('timeoutForSmallTests')) {
             $result['timeoutForSmallTests'] = $this->getInteger(
-              (string)$root->getAttribute('timeoutForSmallTests'), 1
+              (string) $root->getAttribute('timeoutForSmallTests'), 1
             );
         }
 
         if ($root->hasAttribute('timeoutForMediumTests')) {
             $result['timeoutForMediumTests'] = $this->getInteger(
-              (string)$root->getAttribute('timeoutForMediumTests'), 10
+              (string) $root->getAttribute('timeoutForMediumTests'), 10
             );
         }
 
         if ($root->hasAttribute('timeoutForLargeTests')) {
             $result['timeoutForLargeTests'] = $this->getInteger(
-              (string)$root->getAttribute('timeoutForLargeTests'), 60
+              (string) $root->getAttribute('timeoutForLargeTests'), 60
+            );
+        }
+
+        if ($root->hasAttribute('beStrictAboutTestsThatDoNotTestAnything')) {
+            $result['reportUselessTests'] = $this->getBoolean(
+                (string) $root->getAttribute('beStrictAboutTestsThatDoNotTestAnything'), false
+            );
+        }
+
+        if ($root->hasAttribute('checkForUnintentionallyCoveredCode')) {
+            $result['strictCoverage'] = $this->getBoolean(
+                (string) $root->getAttribute('checkForUnintentionallyCoveredCode'), false
+            );
+        }
+
+        if ($root->hasAttribute('beStrictAboutOutputDuringTests')) {
+            $result['disallowTestOutput'] = $this->getBoolean(
+                (string) $root->getAttribute('beStrictAboutOutputDuringTests'), false
+            );
+        }
+
+        if ($root->hasAttribute('beStrictAboutTestSize')) {
+            $result['enforceTimeLimit'] = $this->getBoolean(
+                (string) $root->getAttribute('beStrictAboutTestSize'), false
             );
         }
 
         if ($root->hasAttribute('strict')) {
-            $result['strict'] = $this->getBoolean(
-              (string)$root->getAttribute('strict'), FALSE
+            $flag = $this->getBoolean(
+                (string) $root->getAttribute('strict'), false
             );
+
+            $result['reportUselessTests'] = $flag;
+            $result['strictCoverage']     = $flag;
+            $result['disallowTestOutput'] = $flag;
+            $result['enforceTimeLimit']   = $flag;
         }
 
         if ($root->hasAttribute('verbose')) {
             $result['verbose'] = $this->getBoolean(
-              (string)$root->getAttribute('verbose'), FALSE
+              (string) $root->getAttribute('verbose'), false
             );
         }
 
@@ -734,18 +770,18 @@ public function getSeleniumBrowserConfiguration()
         $result = array();
 
         foreach ($this->xpath->query('selenium/browser') as $config) {
-            $name    = (string)$config->getAttribute('name');
-            $browser = (string)$config->getAttribute('browser');
+            $name    = (string) $config->getAttribute('name');
+            $browser = (string) $config->getAttribute('browser');
 
             if ($config->hasAttribute('host')) {
-                $host = (string)$config->getAttribute('host');
+                $host = (string) $config->getAttribute('host');
             } else {
                 $host = 'localhost';
             }
 
             if ($config->hasAttribute('port')) {
                 $port = $this->getInteger(
-                  (string)$config->getAttribute('port'), 4444
+                  (string) $config->getAttribute('port'), 4444
                 );
             } else {
                 $port = 4444;
@@ -753,7 +789,7 @@ public function getSeleniumBrowserConfiguration()
 
             if ($config->hasAttribute('timeout')) {
                 $timeout = $this->getInteger(
-                  (string)$config->getAttribute('timeout'), 30000
+                  (string) $config->getAttribute('timeout'), 30000
                 );
             } else {
                 $timeout = 30000;
@@ -803,7 +839,7 @@ public function getTestSuiteConfiguration($testSuiteFilter=null)
     }
 
     /**
-     * @param  DOMElement $testSuiteNode
+     * @param  DOMElement                  $testSuiteNode
      * @return PHPUnit_Framework_TestSuite
      * @since  Method available since Release 3.4.0
      */
@@ -811,7 +847,7 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null
     {
         if ($testSuiteNode->hasAttribute('name')) {
             $suite = new PHPUnit_Framework_TestSuite(
-              (string)$testSuiteNode->getAttribute('name')
+              (string) $testSuiteNode->getAttribute('name')
             );
         } else {
             $suite = new PHPUnit_Framework_TestSuite;
@@ -820,7 +856,9 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null
         $exclude = array();
 
         foreach ($testSuiteNode->getElementsByTagName('exclude') as $excludeNode) {
-            $exclude[] = (string)$excludeNode->nodeValue;
+            $exclude[] = $this->toAbsolutePath(
+              (string) $excludeNode->nodeValue
+            );
         }
 
         $fileIteratorFacade = new File_Iterator_Facade;
@@ -830,20 +868,20 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null
                 continue;
             }
 
-            $directory = (string)$directoryNode->nodeValue;
+            $directory = (string) $directoryNode->nodeValue;
 
             if (empty($directory)) {
                 continue;
             }
 
             if ($directoryNode->hasAttribute('phpVersion')) {
-                $phpVersion = (string)$directoryNode->getAttribute('phpVersion');
+                $phpVersion = (string) $directoryNode->getAttribute('phpVersion');
             } else {
                 $phpVersion = PHP_VERSION;
             }
 
             if ($directoryNode->hasAttribute('phpVersionOperator')) {
-                $phpVersionOperator = (string)$directoryNode->getAttribute('phpVersionOperator');
+                $phpVersionOperator = (string) $directoryNode->getAttribute('phpVersionOperator');
             } else {
                 $phpVersionOperator = '>=';
             }
@@ -853,13 +891,13 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null
             }
 
             if ($directoryNode->hasAttribute('prefix')) {
-                $prefix = (string)$directoryNode->getAttribute('prefix');
+                $prefix = (string) $directoryNode->getAttribute('prefix');
             } else {
                 $prefix = '';
             }
 
             if ($directoryNode->hasAttribute('suffix')) {
-                $suffix = (string)$directoryNode->getAttribute('suffix');
+                $suffix = (string) $directoryNode->getAttribute('suffix');
             } else {
                 $suffix = 'Test.php';
             }
@@ -878,14 +916,16 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null
                 continue;
             }
 
-            $file = (string)$fileNode->nodeValue;
+            $file = (string) $fileNode->nodeValue;
 
             if (empty($file)) {
                 continue;
             }
 
             // Get the absolute path to the file
-            $file = $fileIteratorFacade->getFilesAsArray($file);
+            $file = $fileIteratorFacade->getFilesAsArray(
+              $this->toAbsolutePath($file)
+            );
 
             if (!isset($file[0])) {
                 continue;
@@ -894,13 +934,13 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null
             $file = $file[0];
 
             if ($fileNode->hasAttribute('phpVersion')) {
-                $phpVersion = (string)$fileNode->getAttribute('phpVersion');
+                $phpVersion = (string) $fileNode->getAttribute('phpVersion');
             } else {
                 $phpVersion = PHP_VERSION;
             }
 
             if ($fileNode->hasAttribute('phpVersionOperator')) {
-                $phpVersionOperator = (string)$fileNode->getAttribute('phpVersionOperator');
+                $phpVersionOperator = (string) $fileNode->getAttribute('phpVersionOperator');
             } else {
                 $phpVersionOperator = '>=';
             }
@@ -924,11 +964,9 @@ protected function getTestSuite(DOMElement $testSuiteNode, $testSuiteFilter=null
     protected function getBoolean($value, $default)
     {
         if (strtolower($value) == 'false') {
-            return FALSE;
-        }
-
-        else if (strtolower($value) == 'true') {
-            return TRUE;
+            return false;
+        } elseif (strtolower($value) == 'true') {
+            return true;
         }
 
         return $default;
@@ -943,7 +981,7 @@ protected function getBoolean($value, $default)
     protected function getInteger($value, $default)
     {
         if (is_numeric($value)) {
-            return (int)$value;
+            return (int) $value;
         }
 
         return $default;
@@ -960,25 +998,25 @@ protected function readFilterDirectories($query)
 
         foreach ($this->xpath->query($query) as $directory) {
             if ($directory->hasAttribute('prefix')) {
-                $prefix = (string)$directory->getAttribute('prefix');
+                $prefix = (string) $directory->getAttribute('prefix');
             } else {
                 $prefix = '';
             }
 
             if ($directory->hasAttribute('suffix')) {
-                $suffix = (string)$directory->getAttribute('suffix');
+                $suffix = (string) $directory->getAttribute('suffix');
             } else {
                 $suffix = '.php';
             }
 
             if ($directory->hasAttribute('group')) {
-                $group = (string)$directory->getAttribute('group');
+                $group = (string) $directory->getAttribute('group');
             } else {
                 $group = 'DEFAULT';
             }
 
             $directories[] = array(
-              'path'   => $this->toAbsolutePath((string)$directory->nodeValue),
+              'path'   => $this->toAbsolutePath((string) $directory->nodeValue),
               'prefix' => $prefix,
               'suffix' => $suffix,
               'group'  => $group
@@ -998,7 +1036,7 @@ protected function readFilterFiles($query)
         $files = array();
 
         foreach ($this->xpath->query($query) as $file) {
-            $files[] = $this->toAbsolutePath((string)$file->nodeValue);
+            $files[] = $this->toAbsolutePath((string) $file->nodeValue);
         }
 
         return $files;
@@ -1010,17 +1048,28 @@ protected function readFilterFiles($query)
      * @return string
      * @since  Method available since Release 3.5.0
      */
-    protected function toAbsolutePath($path, $useIncludePath = FALSE)
+    protected function toAbsolutePath($path, $useIncludePath = false)
     {
-        // Check whether the path is already absolute.
-        if ($path[0] === '/' || $path[0] === '\\' ||
-            (strlen($path) > 3 && ctype_alpha($path[0]) &&
-             $path[1] === ':' && ($path[2] === '\\' || $path[2] === '/'))) {
+        if ($path[0] === '/') {
+            return $path;
+        }
+
+        // Matches the following on Windows:
+        //  - \\NetworkComputer\Path
+        //  - \\.\D:
+        //  - \\.\c:
+        //  - C:\Windows
+        //  - C:\windows
+        //  - C:/windows
+        //  - c:/windows
+        if (defined('PHP_WINDOWS_VERSION_BUILD') &&
+            ($path[0] === '\\' ||
+            (strlen($path) >= 3 && preg_match('#^[A-Z]\:[/\\\]#i', substr($path, 0, 3))))) {
             return $path;
         }
 
-        // Check whether a stream is used.
-        if (strpos($path, '://') !== FALSE) {
+        // Stream
+        if (strpos($path, '://') !== false) {
             return $path;
         }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature.php b/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php
similarity index 80%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature.php
rename to core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php
index ee3f0329d328cb25b1404838d6946ee3a5fd26ad..637feb3a3a95c7b69d368599360f191bdf10cd4a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature.php
+++ b/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2002-2010, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework
  * @author     Ralph Schindler <ralph.schindler@zend.com>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2010 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.5.7
@@ -51,7 +51,7 @@
  * @subpackage Framework
  * @author     Ralph Schindler <ralph.schindler@zend.com>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2010 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Interface available since Release 3.5.7
@@ -66,11 +66,11 @@ class PHPUnit_Util_DeprecatedFeature
     /**
      * @var string
      */
-    protected $message = NULL;
+    protected $message = null;
 
     /**
-     * @param  string $message
-     * @param  array  $traceInfo
+     * @param string $message
+     * @param array  $traceInfo
      */
     public function __construct($message, array $traceInfo = array())
     {
@@ -79,24 +79,30 @@ public function __construct($message, array $traceInfo = array())
     }
 
     /**
-     * Build a string representation of the deprecated feature that was raised
-     *
      * @return string
+     * @since  Method available since Release 4.0.0
      */
-    public function __toString()
+    public function getMessage()
     {
-        $string = '';
+        return $this->message;
+    }
+
+    /**
+     * @return string
+     * @since  Method available since Release 4.0.0
+     */
+    public function getSource()
+    {
+        $source = '';
 
         if (isset($this->traceInfo['file'])) {
-            $string .= $this->traceInfo['file'];
+            $source .= $this->traceInfo['file'];
 
             if (isset($this->traceInfo['line'])) {
-                $string .= ':' . $this->traceInfo['line'] . ' - ';
+                $source .= ':' . $this->traceInfo['line'];
             }
         }
 
-        $string .= $this->message;
-
-        return $string;
+        return $source;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature/Logger.php b/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature/Logger.php
rename to core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php
index 721bdffec67c2be0f997d8c67e018f14f16eae8d..d77a87a5410488476ff93bcc04138f5257ab3f0c 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/DeprecatedFeature/Logger.php
+++ b/core/vendor/phpunit/phpunit/src/Util/DeprecatedFeature/Logger.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2002-2010, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @subpackage Framework
  * @author     Ralph Schindler <ralph.schindler@zend.com>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2010 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.5.7
@@ -51,7 +51,7 @@
  * @subpackage Framework
  * @author     Ralph Schindler <ralph.schindler@zend.com>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2010 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.5.7
@@ -61,23 +61,23 @@ class PHPUnit_Util_DeprecatedFeature_Logger implements PHPUnit_Framework_TestLis
     /**
      * @var PHPUnit_Framework_TestCase
      */
-    protected static $currentTest = NULL;
+    protected static $currentTest = null;
 
     /**
-     * This is the publically accessible API for notifying the system that a
+     * This is the publicly accessible API for notifying the system that a
      * deprecated feature has been used.
      *
      * If it is run via a TestRunner and the test extends
      * PHPUnit_Framework_TestCase, then this will inject the result into the
      * test runner for display, if not, it will throw the notice to STDERR.
      *
-     * @param string $message
+     * @param string   $message
      * @param int|bool $backtraceDepth
      */
     public static function log($message, $backtraceDepth = 2)
     {
-        if ($backtraceDepth !== FALSE) {
-            $trace = debug_backtrace(FALSE);
+        if ($backtraceDepth !== false) {
+            $trace = debug_backtrace(false);
 
             if (is_int($backtraceDepth)) {
                 $traceItem = $trace[$backtraceDepth];
@@ -96,8 +96,7 @@ public static function log($message, $backtraceDepth = 2)
                 }
 
                 $method = $reflectionClass->getMethod($traceItem['function']);
-                $traceItem['line'] = '(between ' . $method->getStartLine() .
-                                     ' and ' . $method->getEndLine() . ')';
+                $traceItem['line'] = $method->getStartLine() . '-' . $method->getEndLine();
             }
         }
 
@@ -116,9 +115,9 @@ public static function log($message, $backtraceDepth = 2)
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
@@ -127,9 +126,9 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
@@ -138,20 +137,32 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
     }
 
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+    }
+
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      * @since  Method available since Release 3.0.0
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
@@ -161,7 +172,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time
     /**
      * A test suite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -171,7 +182,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test suite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -181,7 +192,7 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test)
     {
@@ -191,11 +202,11 @@ public function startTest(PHPUnit_Framework_Test $test)
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
-        self::$currentTest = NULL;
+        self::$currentTest = null;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/ErrorHandler.php b/core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
similarity index 81%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/ErrorHandler.php
rename to core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
index 2b419a6e3fbdc92ebd481a7917ce2d0b0937ff89..c97ad095be8ce49949111d655bff4f5fba3d31ec 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/ErrorHandler.php
+++ b/core/vendor/phpunit/phpunit/src/Util/ErrorHandler.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -56,7 +56,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
@@ -76,54 +76,48 @@ public static function getErrorStack()
     }
 
     /**
-     * @param  integer $errno
-     * @param  string  $errstr
-     * @param  string  $errfile
-     * @param  integer $errline
+     * @param  integer                 $errno
+     * @param  string                  $errstr
+     * @param  string                  $errfile
+     * @param  integer                 $errline
      * @throws PHPUnit_Framework_Error
      */
     public static function handleError($errno, $errstr, $errfile, $errline)
     {
         if (!($errno & error_reporting())) {
-            return FALSE;
+            return false;
         }
 
         self::$errorStack[] = array($errno, $errstr, $errfile, $errline);
 
-        $trace = debug_backtrace(FALSE);
+        $trace = debug_backtrace(false);
         array_shift($trace);
 
         foreach ($trace as $frame) {
             if ($frame['function'] == '__toString') {
-                return FALSE;
+                return false;
             }
         }
 
         if ($errno == E_NOTICE || $errno == E_USER_NOTICE || $errno == E_STRICT) {
-            if (PHPUnit_Framework_Error_Notice::$enabled !== TRUE) {
-                return FALSE;
+            if (PHPUnit_Framework_Error_Notice::$enabled !== true) {
+                return false;
             }
 
             $exception = 'PHPUnit_Framework_Error_Notice';
-        }
-
-        else if ($errno == E_WARNING || $errno == E_USER_WARNING) {
-            if (PHPUnit_Framework_Error_Warning::$enabled !== TRUE) {
-                return FALSE;
+        } elseif ($errno == E_WARNING || $errno == E_USER_WARNING) {
+            if (PHPUnit_Framework_Error_Warning::$enabled !== true) {
+                return false;
             }
 
             $exception = 'PHPUnit_Framework_Error_Warning';
-        }
-
-        else if ($errno == E_DEPRECATED || $errno == E_USER_DEPRECATED) {
-            if (PHPUnit_Framework_Error_Deprecated::$enabled !== TRUE) {
-                return FALSE;
+        } elseif ($errno == E_DEPRECATED || $errno == E_USER_DEPRECATED) {
+            if (PHPUnit_Framework_Error_Deprecated::$enabled !== true) {
+                return false;
             }
 
             $exception = 'PHPUnit_Framework_Error_Deprecated';
-        }
-
-        else {
+        } else {
             $exception = 'PHPUnit_Framework_Error';
         }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Fileloader.php b/core/vendor/phpunit/phpunit/src/Util/Fileloader.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Fileloader.php
rename to core/vendor/phpunit/phpunit/src/Util/Fileloader.php
index 0c5d21614483fd72921a256def1bd9c78fb227a4..e2dcb52e16749bbc5aec986aec32ba186715fad1 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Fileloader.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Fileloader.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.3.0
@@ -60,7 +60,8 @@ class PHPUnit_Util_Fileloader
      * Checks if a PHP sourcefile is readable.
      * The sourcefile is loaded through the load() method.
      *
-     * @param  string $filename
+     * @param  string                      $filename
+     * @return string
      * @throws PHPUnit_Framework_Exception
      */
     public static function checkAndLoad($filename)
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Filesystem.php b/core/vendor/phpunit/phpunit/src/Util/Filesystem.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Filesystem.php
rename to core/vendor/phpunit/phpunit/src/Util/Filesystem.php
index 63b60457b95924f11bde2d91a45a6f2880e20062..d5f8feefaf68b30797d688dcf01eb0f5abd71eb8 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Filesystem.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Filesystem.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Filter.php b/core/vendor/phpunit/phpunit/src/Util/Filter.php
similarity index 82%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Filter.php
rename to core/vendor/phpunit/phpunit/src/Util/Filter.php
index f6dd7e4949798195acd8b30d411211f14a4439c9..b36ce7d75e7fe7edfebb5db2c8b8e10927b281e7 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Filter.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Filter.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -63,22 +63,16 @@ class PHPUnit_Util_Filter
      * @param  boolean   $asString
      * @return string
      */
-    public static function getFilteredStacktrace(Exception $e, $asString = TRUE)
+    public static function getFilteredStacktrace(Exception $e, $asString = true)
     {
-        $prefix = FALSE;
+        $prefix = false;
         $script = realpath($GLOBALS['_SERVER']['SCRIPT_NAME']);
 
-        if (defined('__PHPUNIT_PHAR__')) {
-            $prefix = 'phar://' . __PHPUNIT_PHAR__ . '/';
+        if (defined('__PHPUNIT_PHAR_ROOT__')) {
+            $prefix = __PHPUNIT_PHAR_ROOT__;
         }
 
-        if (!defined('PHPUNIT_TESTSUITE')) {
-            $blacklist = PHPUnit_Util_GlobalState::phpunitFiles();
-        } else {
-            $blacklist = array();
-        }
-
-        if ($asString === TRUE) {
+        if ($asString === true) {
             $filteredStacktrace = '';
         } else {
             $filteredStacktrace = array();
@@ -104,12 +98,14 @@ public static function getFilteredStacktrace(Exception $e, $asString = TRUE)
             );
         }
 
+        $blacklist = new PHPUnit_Util_Blacklist;
+
         foreach ($eTrace as $frame) {
             if (isset($frame['file']) && is_file($frame['file']) &&
-                !isset($blacklist[$frame['file']]) &&
-                strpos($frame['file'], $prefix) !== 0 &&
+                !$blacklist->isBlacklisted($frame['file']) &&
+                ($prefix === false || strpos($frame['file'], $prefix) !== 0) &&
                 $frame['file'] !== $script) {
-                if ($asString === TRUE) {
+                if ($asString === true) {
                     $filteredStacktrace .= sprintf(
                       "%s:%s\n",
 
@@ -126,21 +122,21 @@ public static function getFilteredStacktrace(Exception $e, $asString = TRUE)
     }
 
     /**
-     * @param  array  $trace
-     * @param  string $file
-     * @param  int    $line
+     * @param  array   $trace
+     * @param  string  $file
+     * @param  int     $line
      * @return boolean
      * @since  Method available since Release 3.3.2
      */
-    public static function frameExists(array $trace, $file, $line)
+    private static function frameExists(array $trace, $file, $line)
     {
         foreach ($trace as $frame) {
             if (isset($frame['file']) && $frame['file'] == $file &&
                 isset($frame['line']) && $frame['line'] == $line) {
-                return TRUE;
+                return true;
             }
         }
 
-        return FALSE;
+        return false;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Getopt.php b/core/vendor/phpunit/phpunit/src/Util/Getopt.php
similarity index 90%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Getopt.php
rename to core/vendor/phpunit/phpunit/src/Util/Getopt.php
index be8682308e33840920a0c9a8e276b4734f2b400c..0606406cb2b7230cb8ca41a0f9e31e82e8796ed7 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Getopt.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Getopt.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -50,14 +50,14 @@
  * @subpackage Util
  * @author     Andrei Zmievski <andrei@php.net>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
  */
 class PHPUnit_Util_Getopt
 {
-    public static function getopt(array $args, $short_options, $long_options = NULL)
+    public static function getopt(array $args, $short_options, $long_options = null)
     {
         if (empty($args)) {
             return array(array(), array());
@@ -91,15 +91,11 @@ public static function getopt(array $args, $short_options, $long_options = NULL)
                 (strlen($arg) > 1 && $arg[1] == '-' && !$long_options)) {
                 $non_opts = array_merge($non_opts, array_slice($args, $i));
                 break;
-            }
-
-            elseif (strlen($arg) > 1 && $arg[1] == '-') {
+            } elseif (strlen($arg) > 1 && $arg[1] == '-') {
                 self::parseLongOption(
                   substr($arg, 2), $long_options, $opts, $args
                 );
-            }
-
-            else {
+            } else {
                 self::parseShortOption(
                   substr($arg, 1), $short_options, $opts, $args
                 );
@@ -115,9 +111,9 @@ protected static function parseShortOption($arg, $short_options, &$opts, &$args)
 
         for ($i = 0; $i < $argLen; $i++) {
             $opt     = $arg[$i];
-            $opt_arg = NULL;
+            $opt_arg = null;
 
-            if (($spec = strstr($short_options, $opt)) === FALSE ||
+            if (($spec = strstr($short_options, $opt)) === false ||
                 $arg[$i] == ':') {
                 throw new PHPUnit_Framework_Exception(
                   "unrecognized option -- $opt"
@@ -134,12 +130,8 @@ protected static function parseShortOption($arg, $short_options, &$opts, &$args)
                     if ($i + 1 < $argLen) {
                         $opts[] = array($opt, substr($arg, $i + 1));
                         break;
-                    }
-
-                    else if (list(, $opt_arg) = each($args)) {
-                    }
-
-                    else {
+                    } elseif (list(, $opt_arg) = each($args)) {
+                    } else {
                         throw new PHPUnit_Framework_Exception(
                           "option requires an argument -- $opt"
                         );
@@ -156,7 +148,7 @@ protected static function parseLongOption($arg, $long_options, &$opts, &$args)
         $count   = count($long_options);
         $list    = explode('=', $arg);
         $opt     = $list[0];
-        $opt_arg = NULL;
+        $opt_arg = null;
 
         if (count($list) > 1) {
             $opt_arg = $list[1];
@@ -190,15 +182,14 @@ protected static function parseLongOption($arg, $long_options, &$opts, &$args)
                         );
                     }
                 }
-            }
-
-            else if ($opt_arg) {
+            } elseif ($opt_arg) {
                 throw new PHPUnit_Framework_Exception(
                   "option --$opt doesn't allow an argument"
                 );
             }
 
             $opts[] = array('--' . $opt, $opt_arg);
+
             return;
         }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/GlobalState.php b/core/vendor/phpunit/phpunit/src/Util/GlobalState.php
similarity index 78%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/GlobalState.php
rename to core/vendor/phpunit/phpunit/src/Util/GlobalState.php
index 2737985ad0701d160ce75c33f2677c61b282de0f..ab7b72b34f425d85fd9e9f0814dda2e60c403bfc 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/GlobalState.php
+++ b/core/vendor/phpunit/phpunit/src/Util/GlobalState.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.4.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.4.0
@@ -91,11 +91,6 @@ class PHPUnit_Util_GlobalState
       'HTTP_POST_FILES'
     );
 
-    /**
-     * @var array
-     */
-    protected static $phpunitFiles;
-
     public static function backupGlobals(array $blacklist)
     {
         self::$globals     = array();
@@ -189,9 +184,9 @@ protected static function restoreSuperGlobalArray($superGlobalArray)
 
     public static function getIncludedFilesAsString()
     {
-        $blacklist = self::phpunitFiles();
+        $blacklist = new PHPUnit_Util_Blacklist;
         $files     = get_included_files();
-        $prefix    = FALSE;
+        $prefix    = false;
         $result    = '';
 
         if (defined('__PHPUNIT_PHAR__')) {
@@ -201,11 +196,11 @@ public static function getIncludedFilesAsString()
         for ($i = count($files) - 1; $i > 0; $i--) {
             $file = $files[$i];
 
-            if ($prefix !== FALSE) {
-                $file = str_replace($prefix, '', $file);
+            if ($prefix !== false && strpos($file, $prefix) === 0) {
+                continue;
             }
 
-            if (!isset($blacklist[$file]) && is_file($file)) {
+            if (!$blacklist->isBlacklisted($file) && is_file($file)) {
                 $result = 'require_once \'' . $file . "';\n" . $result;
             }
         }
@@ -213,9 +208,25 @@ public static function getIncludedFilesAsString()
         return $result;
     }
 
+    public static function getIniSettingsAsString()
+    {
+        $result      = '';
+        $iniSettings = ini_get_all(null, false);
+
+        foreach ($iniSettings as $key => $value) {
+            $result .= sprintf(
+              '@ini_set(%s, %s);' . "\n",
+              self::exportVariable($key),
+              self::exportVariable($value)
+            );
+        }
+
+        return $result;
+    }
+
     public static function getConstantsAsString()
     {
-        $constants = get_defined_constants(TRUE);
+        $constants = get_defined_constants(true);
         $result    = '';
 
         if (isset($constants['user'])) {
@@ -257,7 +268,6 @@ public static function getGlobalsAsString()
 
         $blacklist   = $superGlobalArrays;
         $blacklist[] = 'GLOBALS';
-        $blacklist[] = '_PEAR_Config_instance';
 
         foreach (array_keys($GLOBALS) as $key) {
             if (!in_array($key, $blacklist) && !$GLOBALS[$key] instanceof Closure) {
@@ -295,12 +305,15 @@ public static function backupStaticAttributes(array $blacklist)
                 strpos($declaredClasses[$i], 'PHP_CodeCoverage') !== 0 &&
                 strpos($declaredClasses[$i], 'PHP_Invoker') !== 0 &&
                 strpos($declaredClasses[$i], 'PHP_Timer') !== 0 &&
-                strpos($declaredClasses[$i], 'PHP_TokenStream') !== 0 &&
+                strpos($declaredClasses[$i], 'PHP_Token_Stream') !== 0 &&
                 strpos($declaredClasses[$i], 'Symfony') !== 0 &&
-                strpos($declaredClasses[$i], 'Text_Template') !== 0 &&
-                !$declaredClasses[$i] instanceof PHPUnit_Framework_Test) {
+                strpos($declaredClasses[$i], 'Text_Template') !== 0) {
                 $class = new ReflectionClass($declaredClasses[$i]);
 
+                if ($class->isSubclassOf('PHPUnit_Framework_Test')) {
+                    continue;
+                }
+
                 if (!$class->isUserDefined()) {
                     break;
                 }
@@ -313,7 +326,7 @@ public static function backupStaticAttributes(array $blacklist)
 
                         if (!isset($blacklist[$declaredClasses[$i]]) ||
                            !in_array($name, $blacklist[$declaredClasses[$i]])) {
-                            $attribute->setAccessible(TRUE);
+                            $attribute->setAccessible(true);
                             $value = $attribute->getValue();
 
                             if (!$value instanceof Closure) {
@@ -335,7 +348,7 @@ public static function restoreStaticAttributes()
         foreach (self::$staticAttributes as $className => $staticAttributes) {
             foreach ($staticAttributes as $name => $value) {
                 $reflector = new ReflectionProperty($className, $name);
-                $reflector->setAccessible(TRUE);
+                $reflector->setAccessible(true);
                 $reflector->setValue(unserialize($value));
             }
         }
@@ -347,7 +360,7 @@ protected static function exportVariable($variable)
     {
         if (is_scalar($variable) || is_null($variable) ||
            (is_array($variable) && self::arrayOnlyContainsScalars($variable))) {
-            return var_export($variable, TRUE);
+            return var_export($variable, true);
         }
 
         return 'unserialize(\'' .
@@ -357,70 +370,20 @@ protected static function exportVariable($variable)
 
     protected static function arrayOnlyContainsScalars(array $array)
     {
-        $result = TRUE;
+        $result = true;
 
         foreach ($array as $element) {
             if (is_array($element)) {
                 $result = self::arrayOnlyContainsScalars($element);
+            } elseif (!is_scalar($element) && !is_null($element)) {
+                $result = false;
             }
 
-            else if (!is_scalar($element) && !is_null($element)) {
-                $result = FALSE;
-            }
-
-            if ($result === FALSE) {
+            if ($result === false) {
                 break;
             }
         }
 
         return $result;
     }
-
-    /**
-     * @return array
-     * @since  Method available since Release 3.6.0
-     */
-    public static function phpunitFiles()
-    {
-        if (self::$phpunitFiles === NULL) {
-            self::addDirectoryContainingClassToPHPUnitFilesList('File_Iterator');
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHP_CodeCoverage');
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHP_Invoker');
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHP_Timer');
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHP_Token');
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHPUnit_Framework_TestCase', 2);
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHPUnit_Extensions_Database_TestCase', 2);
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHPUnit_Framework_MockObject_Generator', 2);
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHPUnit_Extensions_SeleniumTestCase', 2);
-            self::addDirectoryContainingClassToPHPUnitFilesList('PHPUnit_Extensions_Story_TestCase', 2);
-            self::addDirectoryContainingClassToPHPUnitFilesList('Text_Template');
-        }
-
-        return self::$phpunitFiles;
-    }
-
-    /**
-     * @param string  $className
-     * @param integer $parent
-     * @since Method available since Release 3.7.2
-     */
-    protected static function addDirectoryContainingClassToPHPUnitFilesList($className, $parent = 1)
-    {
-        if (!class_exists($className)) {
-            return;
-        }
-
-        $reflector = new ReflectionClass($className);
-        $directory = $reflector->getFileName();
-
-        for ($i = 0; $i < $parent; $i++) {
-            $directory = dirname($directory);
-        }
-
-        $facade = new File_Iterator_Facade;
-
-        foreach ($facade->getFilesAsArray($directory, '.php') as $file) {
-            self::$phpunitFiles[$file] = TRUE;
-        }
-    }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/InvalidArgumentHelper.php b/core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
similarity index 81%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/InvalidArgumentHelper.php
rename to core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
index 7848b82510b6872bb64d5a3a1682e5604edaaf2a..94f3cf4913cf845cb791d35b9e5cfb5fca0208df 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/InvalidArgumentHelper.php
+++ b/core/vendor/phpunit/phpunit/src/Util/InvalidArgumentHelper.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.4.0
@@ -50,7 +50,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.4.0
@@ -58,19 +58,20 @@
 class PHPUnit_Util_InvalidArgumentHelper
 {
     /**
-     * @param integer $argument
-     * @param string  $type
-     * @param mixed   $value
+     * @param  integer                     $argument
+     * @param  string                      $type
+     * @param  mixed                       $value
+     * @return PHPUnit_Framework_Exception
      */
-    public static function factory($argument, $type, $value = NULL)
+    public static function factory($argument, $type, $value = null)
     {
-        $stack = debug_backtrace(FALSE);
+        $stack = debug_backtrace(false);
 
         return new PHPUnit_Framework_Exception(
           sprintf(
             'Argument #%d%sof %s::%s() must be a %s',
             $argument,
-            $value !== NULL ? ' (' . $value . ')' : ' ',
+            $value !== null ? ' (' . gettype($value) . '#' . $value . ')' : ' (No Value) ',
             $stack[1]['class'],
             $stack[1]['function'],
             $type
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Log/JSON.php b/core/vendor/phpunit/phpunit/src/Util/Log/JSON.php
similarity index 68%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Log/JSON.php
rename to core/vendor/phpunit/phpunit/src/Util/Log/JSON.php
index 67f627093c22c314a8300aa0a26c153323e73d66..dfb3163db7b1c618d56b474f1a2e9e92a762476f 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Log/JSON.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Log/JSON.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,19 +37,23 @@
  * @package    PHPUnit
  * @subpackage Util_Log
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
  */
 
+if (!defined('JSON_PRETTY_PRINT')) {
+    define('JSON_PRETTY_PRINT', 128);
+}
+
 /**
  * A TestListener that generates JSON messages.
  *
  * @package    PHPUnit
  * @subpackage Util_Log
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -70,92 +74,113 @@ class PHPUnit_Util_Log_JSON extends PHPUnit_Util_Printer implements PHPUnit_Fram
      * @var     boolean
      * @access  private
      */
-    protected $currentTestPass = TRUE;
+    protected $currentTestPass = true;
 
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
         $this->writeCase(
           'error',
           $time,
-          PHPUnit_Util_Filter::getFilteredStacktrace($e, FALSE),
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
           $e->getMessage(),
           $test
         );
 
-        $this->currentTestPass = FALSE;
+        $this->currentTestPass = false;
     }
 
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
         $this->writeCase(
           'fail',
           $time,
-          PHPUnit_Util_Filter::getFilteredStacktrace($e, FALSE),
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
           $e->getMessage(),
           $test
         );
 
-        $this->currentTestPass = FALSE;
+        $this->currentTestPass = false;
     }
 
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
         $this->writeCase(
           'error',
           $time,
-          PHPUnit_Util_Filter::getFilteredStacktrace($e, FALSE),
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
           'Incomplete Test: ' . $e->getMessage(),
           $test
         );
 
-        $this->currentTestPass = FALSE;
+        $this->currentTestPass = false;
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->writeCase(
+          'error',
+          $time,
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
+          'Risky Test: ' . $e->getMessage(),
+          $test
+        );
+
+        $this->currentTestPass = false;
     }
 
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
         $this->writeCase(
           'error',
           $time,
-          PHPUnit_Util_Filter::getFilteredStacktrace($e, FALSE),
+          PHPUnit_Util_Filter::getFilteredStacktrace($e, false),
           'Skipped Test: ' . $e->getMessage(),
           $test
         );
 
-        $this->currentTestPass = FALSE;
+        $this->currentTestPass = false;
     }
 
     /**
      * A testsuite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     {
@@ -174,7 +199,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A testsuite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     {
@@ -185,12 +210,12 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test)
     {
         $this->currentTestName = PHPUnit_Util_Test::describe($test);
-        $this->currentTestPass = TRUE;
+        $this->currentTestPass = true;
 
         $this->write(
           array(
@@ -204,8 +229,8 @@ public function startTest(PHPUnit_Framework_Test $test)
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
@@ -220,10 +245,11 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
      * @param array  $trace
      * @param string $message
      */
-    protected function writeCase($status, $time, array $trace = array(), $message = '', $test = NULL)
+    protected function writeCase($status, $time, array $trace = array(), $message = '', $test = null)
     {
         $output = '';
-        if ($test !== NULL && $test->hasOutput()) {
+        // take care of TestSuite producing error (e.g. by running into exception) as TestSuite doesn't have hasOutput
+        if ($test !== null && method_exists($test, 'hasOutput') && $test->hasOutput()) {
             $output = $test->getActualOutput();
         }
         $this->write(
@@ -245,10 +271,12 @@ protected function writeCase($status, $time, array $trace = array(), $message =
      */
     public function write($buffer)
     {
-        if (defined('JSON_PRETTY_PRINT')) {
-            parent::write(json_encode($buffer, JSON_PRETTY_PRINT));
-        } else {
-            parent::write(json_encode($buffer));
-        }
+        array_walk_recursive($buffer, function (&$input) {
+            if (is_string($input)) {
+                $input = PHPUnit_Util_String::convertToUtf8($input);
+            }
+        });
+
+        parent::write(json_encode($buffer, JSON_PRETTY_PRINT));
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Log/JUnit.php b/core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
similarity index 80%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Log/JUnit.php
rename to core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
index 54085e2da46ac65fad2c52cc9e5c4a7d098142da..13fe0ec487e658059f61252008dab66024bf4de5 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Log/JUnit.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Log/JUnit.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util_Log
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -51,7 +51,7 @@
  * @package    PHPUnit
  * @subpackage Util_Log
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.1.0
@@ -71,12 +71,12 @@ class PHPUnit_Util_Log_JUnit extends PHPUnit_Util_Printer implements PHPUnit_Fra
     /**
      * @var    boolean
      */
-    protected $logIncompleteSkipped = FALSE;
+    protected $logIncompleteSkipped = false;
 
     /**
      * @var    boolean
      */
-    protected $writeDocument = TRUE;
+    protected $writeDocument = true;
 
     /**
      * @var    DOMElement[]
@@ -116,23 +116,23 @@ class PHPUnit_Util_Log_JUnit extends PHPUnit_Util_Printer implements PHPUnit_Fra
     /**
      * @var    DOMElement
      */
-    protected $currentTestCase = NULL;
+    protected $currentTestCase = null;
 
     /**
      * @var    boolean
      */
-    protected $attachCurrentTestCase = TRUE;
+    protected $attachCurrentTestCase = true;
 
     /**
      * Constructor.
      *
-     * @param  mixed   $out
-     * @param  boolean $logIncompleteSkipped
+     * @param mixed   $out
+     * @param boolean $logIncompleteSkipped
      */
-    public function __construct($out = NULL, $logIncompleteSkipped = FALSE)
+    public function __construct($out = null, $logIncompleteSkipped = false)
     {
         $this->document = new DOMDocument('1.0', 'UTF-8');
-        $this->document->formatOutput = TRUE;
+        $this->document->formatOutput = true;
 
         $this->root = $this->document->createElement('testsuites');
         $this->document->appendChild($this->root);
@@ -148,7 +148,7 @@ public function __construct($out = NULL, $logIncompleteSkipped = FALSE)
      */
     public function flush()
     {
-        if ($this->writeDocument === TRUE) {
+        if ($this->writeDocument === true) {
             $this->write($this->getXML());
         }
 
@@ -158,13 +158,13 @@ public function flush()
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
-        if ($this->currentTestCase !== NULL) {
+        if ($this->currentTestCase !== null) {
             if ($test instanceof PHPUnit_Framework_SelfDescribing) {
                 $buffer = $test->toString() . "\n";
             } else {
@@ -190,13 +190,13 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
-        if ($this->currentTestCase !== NULL) {
+        if ($this->currentTestCase !== null) {
             if (!$test instanceof PHPUnit_Framework_Warning) {
                 if ($test instanceof PHPUnit_Framework_SelfDescribing) {
                     $buffer = $test->toString() . "\n";
@@ -224,13 +224,13 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
-        if ($this->logIncompleteSkipped && $this->currentTestCase !== NULL) {
+        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
             $error = $this->document->createElement(
               'error',
               PHPUnit_Util_XML::prepareString(
@@ -245,21 +245,50 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t
 
             $this->testSuiteErrors[$this->testSuiteLevel]++;
         } else {
-            $this->attachCurrentTestCase = FALSE;
+            $this->attachCurrentTestCase = false;
+        }
+    }
+
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
+            $error = $this->document->createElement(
+              'error',
+              PHPUnit_Util_XML::prepareString(
+                "Risky Test\n" .
+                PHPUnit_Util_Filter::getFilteredStacktrace($e)
+              )
+            );
+
+            $error->setAttribute('type', get_class($e));
+
+            $this->currentTestCase->appendChild($error);
+
+            $this->testSuiteErrors[$this->testSuiteLevel]++;
+        } else {
+            $this->attachCurrentTestCase = false;
         }
     }
 
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      * @since  Method available since Release 3.0.0
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
-        if ($this->logIncompleteSkipped && $this->currentTestCase !== NULL) {
+        if ($this->logIncompleteSkipped && $this->currentTestCase !== null) {
             $error = $this->document->createElement(
               'error',
               PHPUnit_Util_XML::prepareString(
@@ -274,14 +303,14 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time
 
             $this->testSuiteErrors[$this->testSuiteLevel]++;
         } else {
-            $this->attachCurrentTestCase = FALSE;
+            $this->attachCurrentTestCase = false;
         }
     }
 
     /**
      * A testsuite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -289,48 +318,12 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
         $testSuite = $this->document->createElement('testsuite');
         $testSuite->setAttribute('name', $suite->getName());
 
-        if (class_exists($suite->getName(), FALSE)) {
+        if (class_exists($suite->getName(), false)) {
             try {
                 $class = new ReflectionClass($suite->getName());
 
                 $testSuite->setAttribute('file', $class->getFileName());
-
-                $packageInformation = PHPUnit_Util_Class::getPackageInformation(
-                  $suite->getName(), $class->getDocComment()
-                );
-
-                if (!empty($packageInformation['namespace'])) {
-                    $testSuite->setAttribute(
-                      'namespace', $packageInformation['namespace']
-                    );
-                }
-
-                if (!empty($packageInformation['fullPackage'])) {
-                    $testSuite->setAttribute(
-                      'fullPackage', $packageInformation['fullPackage']
-                    );
-                }
-
-                if (!empty($packageInformation['category'])) {
-                    $testSuite->setAttribute(
-                      'category', $packageInformation['category']
-                    );
-                }
-
-                if (!empty($packageInformation['package'])) {
-                    $testSuite->setAttribute(
-                      'package', $packageInformation['package']
-                    );
-                }
-
-                if (!empty($packageInformation['subpackage'])) {
-                    $testSuite->setAttribute(
-                      'subpackage', $packageInformation['subpackage']
-                    );
-                }
-            }
-
-            catch (ReflectionException $e) {
+            } catch (ReflectionException $e) {
             }
         }
 
@@ -352,7 +345,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A testsuite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -391,7 +384,7 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test)
     {
@@ -419,8 +412,8 @@ public function startTest(PHPUnit_Framework_Test $test)
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
@@ -445,11 +438,19 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
 
                 $this->testSuiteTests[$this->testSuiteLevel]++;
                 $this->testSuiteTimes[$this->testSuiteLevel] += $time;
+
+                if (method_exists($test, 'hasOutput') && $test->hasOutput()) {
+                    $systemOut = $this->document->createElement('system-out');
+                    $systemOut->appendChild(
+                      $this->document->createTextNode($test->getActualOutput())
+                    );
+                    $this->currentTestCase->appendChild($systemOut);
+                }
             }
         }
 
-        $this->attachCurrentTestCase = TRUE;
-        $this->currentTestCase       = NULL;
+        $this->attachCurrentTestCase = true;
+        $this->currentTestCase       = null;
     }
 
     /**
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Log/TAP.php b/core/vendor/phpunit/phpunit/src/Util/Log/TAP.php
similarity index 74%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Log/TAP.php
rename to core/vendor/phpunit/phpunit/src/Util/Log/TAP.php
index b2050cda5353732263862c498953ed4516bb6b16..8fc924ca6f1c44d285cffc01b0c2420975924eb2 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Log/TAP.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Log/TAP.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util_Log
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
@@ -50,7 +50,7 @@
  * @package    PHPUnit
  * @subpackage Util_Log
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -70,16 +70,16 @@ class PHPUnit_Util_Log_TAP extends PHPUnit_Util_Printer implements PHPUnit_Frame
     /**
      * @var    boolean
      */
-    protected $testSuccessful = TRUE;
+    protected $testSuccessful = true;
 
     /**
      * Constructor.
      *
-     * @param  mixed $out
+     * @param  mixed                       $out
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.3.4
      */
-    public function __construct($out = NULL)
+    public function __construct($out = null)
     {
         parent::__construct($out);
         $this->write("TAP version 13\n");
@@ -88,9 +88,9 @@ public function __construct($out = NULL)
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
@@ -100,9 +100,9 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
@@ -120,7 +120,7 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
         if ($e instanceof PHPUnit_Framework_ExpectationFailedException) {
             $cf = $e->getComparisonFailure();
 
-            if ($cf !== NULL) {
+            if ($cf !== null) {
                 $diagnostic['data'] = array(
                   'got'      => $cf->getActual(),
                   'expected' => $cf->getExpected()
@@ -141,21 +141,43 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
         $this->writeNotOk($test, '', 'TODO Incomplete Test');
     }
 
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->write(
+          sprintf(
+            "ok %d - # RISKY%s\n",
+
+            $this->testNumber,
+            $e->getMessage() != '' ? ' ' . $e->getMessage() : ''
+          )
+        );
+
+        $this->testSuccessful = false;
+    }
+
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      * @since  Method available since Release 3.0.0
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
@@ -169,13 +191,13 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time
           )
         );
 
-        $this->testSuccessful = FALSE;
+        $this->testSuccessful = false;
     }
 
     /**
      * A testsuite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     {
@@ -185,7 +207,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A testsuite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     {
@@ -199,23 +221,23 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test)
     {
         $this->testNumber++;
-        $this->testSuccessful = TRUE;
+        $this->testSuccessful = true;
     }
 
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
-        if ($this->testSuccessful === TRUE) {
+        if ($this->testSuccessful === true) {
             $this->write(
               sprintf(
                 "ok %d - %s\n",
@@ -228,9 +250,9 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
     }
 
     /**
-     * @param  PHPUnit_Framework_Test $test
-     * @param  string                 $prefix
-     * @param  string                 $directive
+     * @param PHPUnit_Framework_Test $test
+     * @param string                 $prefix
+     * @param string                 $directive
      */
     protected function writeNotOk(PHPUnit_Framework_Test $test, $prefix = '', $directive = '')
     {
@@ -245,6 +267,6 @@ protected function writeNotOk(PHPUnit_Framework_Test $test, $prefix = '', $direc
           )
         );
 
-        $this->testSuccessful = FALSE;
+        $this->testSuccessful = false;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/PHP.php b/core/vendor/phpunit/phpunit/src/Util/PHP.php
similarity index 54%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/PHP.php
rename to core/vendor/phpunit/phpunit/src/Util/PHP.php
index 3f40b8c7ecc93e505444884018dcc037b7994cd7..95399c0b403917a7af250906992fdaecd500b8b6 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/PHP.php
+++ b/core/vendor/phpunit/phpunit/src/Util/PHP.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.4.0
@@ -49,91 +49,13 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.4.0
  */
 abstract class PHPUnit_Util_PHP
 {
-    /**
-     * @var string $phpBinary
-     */
-    protected $phpBinary;
-
-    /**
-     * Returns the path to a PHP interpreter.
-     *
-     * PHPUnit_Util_PHP::$phpBinary contains the path to the PHP
-     * interpreter.
-     *
-     * When not set, the following assumptions will be made:
-     *
-     *   1. When PHPUnit is run using the CLI SAPI and the $_SERVER['_']
-     *      variable does not contain the string "PHPUnit", $_SERVER['_']
-     *      is assumed to contain the path to the current PHP interpreter
-     *      and that will be used.
-     *
-     *   2. When PHPUnit is run using the CLI SAPI and the $_SERVER['_']
-     *      variable contains the string "PHPUnit", the file that $_SERVER['_']
-     *      points to is assumed to be the PHPUnit TextUI CLI wrapper script
-     *      "phpunit" and the binary set up using #! on that file's first
-     *      line of code is assumed to contain the path to the current PHP
-     *      interpreter and that will be used.
-     *
-     *   3. When the PHP CLI/CGI binary configured with the PEAR Installer
-     *      (php_bin configuration value) is readable, it will be used.
-     *
-     *   4. The current PHP interpreter is assumed to be in the $PATH and
-     *      to be invokable through "php".
-     *
-     * @return string
-     */
-    protected function getPhpBinary()
-    {
-        if ($this->phpBinary === NULL) {
-            if (defined("PHP_BINARY")) {
-                $this->phpBinary = PHP_BINARY;
-            } else if (PHP_SAPI == 'cli' && isset($_SERVER['_'])) {
-                if (strpos($_SERVER['_'], 'phpunit') !== FALSE) {
-                    $file = file($_SERVER['_']);
-
-                    if (strpos($file[0], ' ') !== FALSE) {
-                        $tmp = explode(' ', $file[0]);
-                        $this->phpBinary = trim($tmp[1]);
-                    } else {
-                        $this->phpBinary = ltrim(trim($file[0]), '#!');
-                    }
-                } else if (strpos(basename($_SERVER['_']), 'php') !== FALSE) {
-                    $this->phpBinary = $_SERVER['_'];
-                }
-            }
-
-            if ($this->phpBinary === NULL) {
-                $possibleBinaryLocations = array(
-                    PHP_BINDIR . '/php',
-                    PHP_BINDIR . '/php-cli.exe',
-                    PHP_BINDIR . '/php.exe',
-                    '@php_bin@',
-                );
-                foreach ($possibleBinaryLocations as $binary) {
-                    if (is_readable($binary)) {
-                        $this->phpBinary = $binary;
-                        break;
-                    }
-                }
-            }
-
-            if (!is_readable($this->phpBinary)) {
-                $this->phpBinary = 'php';
-            } else {
-                $this->phpBinary = escapeshellarg($this->phpBinary);
-            }
-        }
-
-        return $this->phpBinary;
-    }
-
     /**
      * @return PHPUnit_Util_PHP
      * @since  Method available since Release 3.5.12
@@ -148,79 +70,60 @@ public static function factory()
     }
 
     /**
-     * Runs a single job (PHP code) using a separate PHP process.
+     * Runs a single test in a separate PHP process.
      *
      * @param  string                       $job
-     * @param  PHPUnit_Framework_TestCase   $test
+     * @param  PHPUnit_Framework_Test       $test
      * @param  PHPUnit_Framework_TestResult $result
-     * @return array|null
      * @throws PHPUnit_Framework_Exception
      */
-    public function runJob($job, PHPUnit_Framework_Test $test = NULL, PHPUnit_Framework_TestResult $result = NULL)
+    public function runTestJob($job, PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result)
     {
-        $process = proc_open(
-          $this->getPhpBinary(),
-          array(
-            0 => array('pipe', 'r'),
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w')
-          ),
-          $pipes
-        );
+        $result->startTest($test);
 
-        if (!is_resource($process)) {
-            throw new PHPUnit_Framework_Exception(
-              'Unable to create process for process isolation.'
-            );
-        }
-
-        if ($result !== NULL) {
-            $result->startTest($test);
-        }
-
-        $this->process($pipes[0], $job);
-        fclose($pipes[0]);
-
-        $stdout = stream_get_contents($pipes[1]);
-        fclose($pipes[1]);
-
-        $stderr = stream_get_contents($pipes[2]);
-        fclose($pipes[2]);
+        $_result = $this->runJob($job);
 
-        proc_close($process);
-        $this->cleanup();
-
-        if ($result !== NULL) {
-            $this->processChildResult($test, $result, $stdout, $stderr);
-        } else {
-            return array('stdout' => $stdout, 'stderr' => $stderr);
-        }
+        $this->processChildResult(
+          $test, $result, $_result['stdout'], $_result['stderr']
+        );
     }
 
     /**
-     * @param resource $pipe
-     * @param string   $job
-     * @since Method available since Release 3.5.12
+     * Runs a single job (PHP code) using a separate PHP process.
+     *
+     * @param  string                      $job
+     * @param  array                       $settings
+     * @return array
+     * @throws PHPUnit_Framework_Exception
      */
-    abstract protected function process($pipe, $job);
+    abstract public function runJob($job, array $settings = array());
 
     /**
-     * @since Method available since Release 3.5.12
+     * @param  array  $settings
+     * @return string
+     * @since Method available since Release 4.0.0
      */
-    protected function cleanup()
+    protected function settingsToParameters(array $settings)
     {
+        $buffer = '';
+
+        foreach ($settings as $setting) {
+            $buffer .= ' -d ' . $setting;
+        }
+
+        return $buffer;
     }
 
     /**
      * Processes the TestResult object from an isolated process.
      *
-     * @param PHPUnit_Framework_TestCase   $test
+     * @param PHPUnit_Framework_Test       $test
      * @param PHPUnit_Framework_TestResult $result
      * @param string                       $stdout
      * @param string                       $stderr
      * @since Method available since Release 3.5.0
      */
-    protected function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result, $stdout, $stderr)
+    private function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Framework_TestResult $result, $stdout, $stderr)
     {
         $time = 0;
 
@@ -230,22 +133,26 @@ protected function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Fram
               new PHPUnit_Framework_Exception(trim($stderr)), $time
             );
         } else {
-            set_error_handler(function($errno, $errstr, $errfile, $errline) {
+            set_error_handler(function ($errno, $errstr, $errfile, $errline) {
                 throw new ErrorException($errstr, $errno, $errno, $errfile, $errline);
             });
             try {
-                $childResult = unserialize($stdout);
+                if (strpos($stdout, "#!/usr/bin/env php\n") === 0) {
+                    $stdout = substr($stdout, 19);
+                }
+
+                $childResult = unserialize(str_replace("#!/usr/bin/env php\n", '', $stdout));
                 restore_error_handler();
             } catch (ErrorException $e) {
                 restore_error_handler();
-                $childResult = FALSE;
+                $childResult = false;
 
                 $result->addError(
                   $test, new PHPUnit_Framework_Exception(trim($stdout), 0, $e), $time
                 );
             }
 
-            if ($childResult !== FALSE) {
+            if ($childResult !== false) {
                 if (!empty($childResult['output'])) {
                     print $childResult['output'];
                 }
@@ -263,6 +170,7 @@ protected function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Fram
 
                 $time           = $childResult->time();
                 $notImplemented = $childResult->notImplemented();
+                $risky          = $childResult->risky();
                 $skipped        = $childResult->skipped();
                 $errors         = $childResult->errors();
                 $failures       = $childResult->failures();
@@ -271,21 +179,19 @@ protected function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Fram
                     $result->addError(
                       $test, $this->getException($notImplemented[0]), $time
                     );
-                }
-
-                else if (!empty($skipped)) {
+                } elseif (!empty($risky)) {
+                    $result->addError(
+                      $test, $this->getException($risky[0]), $time
+                    );
+                } elseif (!empty($skipped)) {
                     $result->addError(
                       $test, $this->getException($skipped[0]), $time
                     );
-                }
-
-                else if (!empty($errors)) {
+                } elseif (!empty($errors)) {
                     $result->addError(
                       $test, $this->getException($errors[0]), $time
                     );
-                }
-
-                else if (!empty($failures)) {
+                } elseif (!empty($failures)) {
                     $result->addFailure(
                       $test, $this->getException($failures[0]), $time
                     );
@@ -299,17 +205,18 @@ protected function processChildResult(PHPUnit_Framework_Test $test, PHPUnit_Fram
     /**
      * Gets the thrown exception from a PHPUnit_Framework_TestFailure.
      *
-     * @param PHPUnit_Framework_TestFailure $error
-     * @since Method available since Release 3.6.0
-     * @see   https://github.com/sebastianbergmann/phpunit/issues/74
+     * @param  PHPUnit_Framework_TestFailure $error
+     * @return Exception
+     * @since  Method available since Release 3.6.0
+     * @see    https://github.com/sebastianbergmann/phpunit/issues/74
      */
-    protected function getException(PHPUnit_Framework_TestFailure $error)
+    private function getException(PHPUnit_Framework_TestFailure $error)
     {
         $exception = $error->thrownException();
 
         if ($exception instanceof __PHP_Incomplete_Class) {
             $exceptionArray = array();
-            foreach ((array)$exception as $key => $value) {
+            foreach ((array) $exception as $key => $value) {
                 $key = substr($key, strrpos($key, "\0") + 1);
                 $exceptionArray[$key] = $value;
             }
diff --git a/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php b/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php
new file mode 100644
index 0000000000000000000000000000000000000000..af228fc5488606b8e75a33cbc1e1d8e7b6d6f82f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Util/PHP/Default.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.5.12
+ */
+
+use SebastianBergmann\Environment\Runtime;
+
+/**
+ * Default utility for PHP sub-processes.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.5.12
+ */
+class PHPUnit_Util_PHP_Default extends PHPUnit_Util_PHP
+{
+    /**
+     * Runs a single job (PHP code) using a separate PHP process.
+     *
+     * @param  string                      $job
+     * @param  array                       $settings
+     * @return array
+     * @throws PHPUnit_Framework_Exception
+     */
+    public function runJob($job, array $settings = array())
+    {
+        $runtime = new Runtime;
+
+        $process = proc_open(
+          $runtime->getBinary() . $this->settingsToParameters($settings),
+          array(
+            0 => array('pipe', 'r'),
+            1 => array('pipe', 'w'),
+            2 => array('pipe', 'w')
+          ),
+          $pipes
+        );
+
+        if (!is_resource($process)) {
+            throw new PHPUnit_Framework_Exception(
+              'Unable to spawn worker process'
+            );
+        }
+
+        $this->process($pipes[0], $job);
+        fclose($pipes[0]);
+
+        $stdout = stream_get_contents($pipes[1]);
+        fclose($pipes[1]);
+
+        $stderr = stream_get_contents($pipes[2]);
+        fclose($pipes[2]);
+
+        proc_close($process);
+        $this->cleanup();
+
+        return array('stdout' => $stdout, 'stderr' => $stderr);
+    }
+
+    /**
+     * @param  resource                    $pipe
+     * @param  string                      $job
+     * @throws PHPUnit_Framework_Exception
+     * @since Method available since Release 3.5.12
+     */
+    protected function process($pipe, $job)
+    {
+        fwrite($pipe, $job);
+    }
+
+    /**
+     * @since Method available since Release 3.5.12
+     */
+    protected function cleanup()
+    {
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Process/TestCaseMethod.tpl.dist b/core/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist
similarity index 70%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Process/TestCaseMethod.tpl.dist
rename to core/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist
index 65bb01a30188190ffe9df251d6d6da4608e922ff..8d714b52a3646b6edd62ee01ad6d629d78ba94be 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Process/TestCaseMethod.tpl.dist
+++ b/core/vendor/phpunit/phpunit/src/Util/PHP/Template/TestCaseMethod.tpl.dist
@@ -1,16 +1,20 @@
 <?php
+{iniSettings}
 ini_set('display_errors', 'stderr');
 set_include_path('{include_path}');
 
-if ({composerAutoload}) {
-    require_once {composerAutoload};
-    define('PHPUNIT_COMPOSER_INSTALL', {composerAutoload});
-} else {
-    require 'PHPUnit/Autoload.php';
-}
+$composerAutoload = {composerAutoload};
+$phar             = {phar};
 
 ob_start();
 
+if ($composerAutoload) {
+    require_once $composerAutoload;
+    define('PHPUNIT_COMPOSER_INSTALL', $composerAutoload);
+} else if ($phar) {
+    require $phar;
+}
+
 function __phpunit_run_isolated_test()
 {
     if (!class_exists('{className}')) {
@@ -23,7 +27,9 @@ function __phpunit_run_isolated_test()
         $result->setCodeCoverage(new PHP_CodeCoverage);
     }
 
-    $result->strictMode({strict});
+    $result->beStrictAboutTestsThatDoNotTestAnything({isStrictAboutTestsThatDoNotTestAnything});
+    $result->beStrictAboutOutputDuringTests({isStrictAboutOutputDuringTests});
+    $result->beStrictAboutTestSize({isStrictAboutTestSize});
 
     $test = new {className}('{methodName}', unserialize('{data}'), '{dataName}');
     $test->setDependencyInput(unserialize('{dependencyInput}'));
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Windows.php b/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
similarity index 80%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Windows.php
rename to core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
index 058f10d25f6ec162d877791c881ea44bd37ba548..17d97687563f4c742d875b8c51138b3f9713efcc 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/PHP/Windows.php
+++ b/core/vendor/phpunit/phpunit/src/Util/PHP/Windows.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.5.12
@@ -49,34 +49,36 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.5.12
  */
-class PHPUnit_Util_PHP_Windows extends PHPUnit_Util_PHP
+class PHPUnit_Util_PHP_Windows extends PHPUnit_Util_PHP_Default
 {
     /**
      * @var string
      */
-    protected $tempFile;
+    private $tempFile;
 
     /**
-     * @param resource $pipe
-     * @since Method available since Release 3.5.12
+     * @param  resource                    $pipe
+     * @param  string                      $job
+     * @throws PHPUnit_Framework_Exception
+     * @since  Method available since Release 3.5.12
      */
     protected function process($pipe, $job)
     {
         if (!($this->tempFile = tempnam(sys_get_temp_dir(), 'PHPUnit')) ||
-            file_put_contents($this->tempFile, $job) === FALSE) {
+            file_put_contents($this->tempFile, $job) === false) {
             throw new PHPUnit_Framework_Exception(
-              'Unable to write temporary files for process isolation.'
+              'Unable to write temporary file'
             );
         }
 
         fwrite(
           $pipe,
-          "<?php require_once " . var_export($this->tempFile, TRUE) .  "; ?>"
+          "<?php require_once " . var_export($this->tempFile, true) .  "; ?>"
         );
     }
 
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Printer.php b/core/vendor/phpunit/phpunit/src/Util/Printer.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Printer.php
rename to core/vendor/phpunit/phpunit/src/Util/Printer.php
index ec66afb929337769a4101d2cf352ef8937c65b7d..9d67ad30a23b572a9307af37920834118d80848a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Printer.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Printer.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
@@ -57,11 +57,11 @@
 class PHPUnit_Util_Printer
 {
     /**
-     * If TRUE, flush output after every write.
+     * If true, flush output after every write.
      *
      * @var boolean
      */
-    protected $autoFlush = FALSE;
+    protected $autoFlush = false;
 
     /**
      * @var    resource
@@ -76,17 +76,17 @@ class PHPUnit_Util_Printer
     /**
      * @var    boolean
      */
-    protected $printsHTML = FALSE;
+    protected $printsHTML = false;
 
     /**
      * Constructor.
      *
-     * @param  mixed $out
+     * @param  mixed                       $out
      * @throws PHPUnit_Framework_Exception
      */
-    public function __construct($out = NULL)
+    public function __construct($out = null)
     {
-        if ($out !== NULL) {
+        if ($out !== null) {
             if (is_string($out)) {
                 if (strpos($out, 'socket://') === 0) {
                     $out = explode(':', str_replace('socket://', '', $out));
@@ -97,9 +97,9 @@ public function __construct($out = NULL)
 
                     $this->out = fsockopen($out[0], $out[1]);
                 } else {
-                    if (strpos($out, 'php://') === FALSE &&
+                    if (strpos($out, 'php://') === false &&
                         !is_dir(dirname($out))) {
-                        mkdir(dirname($out), 0777, TRUE);
+                        mkdir(dirname($out), 0777, true);
                     }
 
                     $this->out = fopen($out, 'wt');
@@ -121,15 +121,15 @@ public function flush()
             fclose($this->out);
         }
 
-        if ($this->printsHTML === TRUE &&
-            $this->outTarget !== NULL &&
+        if ($this->printsHTML === true &&
+            $this->outTarget !== null &&
             strpos($this->outTarget, 'php://') !== 0 &&
             strpos($this->outTarget, 'socket://') !== 0 &&
             extension_loaded('tidy')) {
             file_put_contents(
               $this->outTarget,
               tidy_repair_file(
-                $this->outTarget, array('indent' => TRUE, 'wrap' => 0), 'utf8'
+                $this->outTarget, array('indent' => true, 'wrap' => 0), 'utf8'
               )
             );
         }
@@ -154,7 +154,7 @@ public function incrementalFlush()
     }
 
     /**
-     * @param  string $buffer
+     * @param string $buffer
      */
     public function write($buffer)
     {
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/String.php b/core/vendor/phpunit/phpunit/src/Util/String.php
similarity index 85%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/String.php
rename to core/vendor/phpunit/phpunit/src/Util/String.php
index 38d934aaf67aab5172174f36ccf0dc80ad74d8ef..a526bf4365fcae72b2a6761a21a3a82c4a61662b 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/String.php
+++ b/core/vendor/phpunit/phpunit/src/Util/String.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.0
@@ -78,7 +78,7 @@ public static function convertToUtf8($string)
     /**
      * Checks a string for UTF-8 encoding.
      *
-     * @param  string $string
+     * @param  string  $string
      * @return boolean
      */
     protected static function isUtf8($string)
@@ -88,31 +88,23 @@ protected static function isUtf8($string)
         for ($i = 0; $i < $length; $i++) {
             if (ord($string[$i]) < 0x80) {
                 $n = 0;
-            }
-
-            else if ((ord($string[$i]) & 0xE0) == 0xC0) {
+            } elseif ((ord($string[$i]) & 0xE0) == 0xC0) {
                 $n = 1;
-            }
-
-            else if ((ord($string[$i]) & 0xF0) == 0xE0) {
+            } elseif ((ord($string[$i]) & 0xF0) == 0xE0) {
                 $n = 2;
-            }
-
-            else if ((ord($string[$i]) & 0xF0) == 0xF0) {
+            } elseif ((ord($string[$i]) & 0xF0) == 0xF0) {
                 $n = 3;
-            }
-
-            else {
-                return FALSE;
+            } else {
+                return false;
             }
 
             for ($j = 0; $j < $n; $j++) {
                 if ((++$i == $length) || ((ord($string[$i]) & 0xC0) != 0x80)) {
-                    return FALSE;
+                    return false;
                 }
             }
         }
 
-        return TRUE;
+        return true;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Test.php b/core/vendor/phpunit/phpunit/src/Util/Test.php
similarity index 53%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Test.php
rename to core/vendor/phpunit/phpunit/src/Util/Test.php
index dc28e5ea8c711ce38ffbd592b4cf03b602e6d7a6..95c2298db11b8a44595952b8211dd46882c0453f 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Test.php
+++ b/core/vendor/phpunit/phpunit/src/Util/Test.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,19 +37,26 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
  */
 
+if (!function_exists('trait_exists')) {
+    function trait_exists($traitname, $autoload = true)
+    {
+        return false;
+    }
+}
+
 /**
  * Test helpers.
  *
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
@@ -59,7 +66,8 @@ class PHPUnit_Util_Test
     const REGEX_DATA_PROVIDER      = '/@dataProvider\s+([a-zA-Z0-9._:-\\\\x7f-\xff]+)/';
     const REGEX_EXPECTED_EXCEPTION = '(@expectedException\s+([:.\w\\\\x7f-\xff]+)(?:[\t ]+(\S*))?(?:[\t ]+(\S*))?\s*$)m';
     const REGEX_REQUIRES_VERSION   = '/@requires\s+(?P<name>PHP(?:Unit)?)\s+(?P<value>[\d\.-]+(dev|(RC|alpha|beta)[\d\.])?)[ \t]*\r?$/m';
-    const REGEX_REQUIRES           = '/@requires\s+(?P<name>function|extension)\s(?P<value>([^ ]+))\r?$/m';
+    const REGEX_REQUIRES_OS        = '/@requires\s+OS\s+(?P<value>.+?)[ \t]*\r?$/m';
+    const REGEX_REQUIRES           = '/@requires\s+(?P<name>function|extension)\s+(?P<value>([^ ]+?))[ \t]*\r?$/m';
 
     const SMALL  = 0;
     const MEDIUM = 1;
@@ -67,16 +75,18 @@ class PHPUnit_Util_Test
 
     private static $annotationCache = array();
 
-    protected static $templateMethods = array(
+    private static $templateMethods = array(
       'setUp', 'assertPreConditions', 'assertPostConditions', 'tearDown'
     );
 
+    private static $hookMethods = array();
+
     /**
      * @param  PHPUnit_Framework_Test $test
      * @param  boolean                $asString
      * @return mixed
      */
-    public static function describe(PHPUnit_Framework_Test $test, $asString = TRUE)
+    public static function describe(PHPUnit_Framework_Test $test, $asString = true)
     {
         if ($asString) {
             if ($test instanceof PHPUnit_Framework_SelfDescribing) {
@@ -89,16 +99,115 @@ public static function describe(PHPUnit_Framework_Test $test, $asString = TRUE)
                 return array(
                   get_class($test), $test->getName()
                 );
+            } elseif ($test instanceof PHPUnit_Framework_SelfDescribing) {
+                return array('', $test->toString());
+            } else {
+                return array('', get_class($test));
             }
+        }
+    }
 
-            else if ($test instanceof PHPUnit_Framework_SelfDescribing) {
-                return array('', $test->toString());
+    /**
+     * @param  string     $className
+     * @param  string     $methodName
+     * @return array|bool
+     * @throws PHPUnit_Framework_CodeCoverageException
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getLinesToBeCovered($className, $methodName)
+    {
+        $codeToCoverList = array();
+
+        $class = new ReflectionClass($className);
+
+        try {
+            $method = new ReflectionMethod($className, $methodName);
+        } catch (ReflectionException $e) {
+            return array();
+        }
+
+        $docComment = self::getDocCommentsOfTestClassAndTestMethodAndTemplateMethods($class, $method);
+
+        if (strpos($docComment, '@coversNothing') !== false) {
+            return false;
+        }
+
+        $classShortcut = preg_match_all(
+          '(@coversDefaultClass\s+(?P<coveredClass>[^\s]++)\s*$)m',
+          $class->getDocComment(),
+          $matches
+        );
+
+        if ($classShortcut) {
+            if ($classShortcut > 1) {
+                throw new PHPUnit_Framework_CodeCoverageException(
+                  sprintf(
+                    'More than one @coversClass annotation in class or interface "%s".',
+                    $className
+                  )
+                );
             }
 
-            else {
-                return array('', get_class($test));
+            $classShortcut = $matches['coveredClass'][0];
+        }
+
+        $match = preg_match_all(
+          '(@covers\s+(?P<coveredElement>[^\s()]++)[\s()]*$)m',
+          $docComment,
+          $matches
+        );
+
+        if ($match) {
+            foreach ($matches['coveredElement'] as $coveredElement) {
+                if ($classShortcut && strncmp($coveredElement, '::', 2) === 0) {
+                    $coveredElement = $classShortcut . $coveredElement;
+                }
+
+                $codeToCoverList = array_merge(
+                  $codeToCoverList,
+                  self::resolveElementToReflectionObjects($coveredElement)
+                );
             }
         }
+
+        return self::resolveReflectionObjectsToLines($codeToCoverList);
+    }
+
+    /**
+     * Returns lines of code specified with the @uses annotation.
+     *
+     * @param  string $className
+     * @param  string $methodName
+     * @return array
+     * @since  Method available since Release 4.0.0
+     */
+    public static function getLinesToBeUsed($className, $methodName)
+    {
+        $annotations = self::parseTestMethodAnnotations(
+          $className, $methodName
+        );
+
+        $uses = array();
+
+        if (isset($annotations['class']['uses'])) {
+            $uses = $annotations['class']['uses'];
+        }
+
+        if (isset($annotations['method']['uses'])) {
+            $uses = array_merge($uses, $annotations['method']['uses']);
+        }
+
+        $uses          = array_unique($uses);
+        $codeToUseList = array();
+
+        foreach (array_unique($uses) as $element) {
+            $codeToUseList = array_merge(
+              $codeToUseList,
+              self::resolveElementToReflectionObjects($element)
+            );
+        }
+
+        return self::resolveReflectionObjectsToLines($codeToUseList);
     }
 
     /**
@@ -117,11 +226,21 @@ public static function getRequirements($className, $methodName)
         $docComment .= "\n" . $reflector->getDocComment();
         $requires   = array();
 
+        if ($count = preg_match_all(self::REGEX_REQUIRES_OS, $docComment, $matches)) {
+            $requires['OS'] = sprintf(
+              '/%s/i',
+              addcslashes($matches['value'][$count - 1], '/')
+            );
+        }
         if ($count = preg_match_all(self::REGEX_REQUIRES_VERSION, $docComment, $matches)) {
             for ($i = 0; $i < $count; $i++) {
                 $requires[$matches['name'][$i]] = $matches['value'][$i];
             }
         }
+
+        // https://bugs.php.net/bug.php?id=63055
+        $matches = array();
+
         if ($count = preg_match_all(self::REGEX_REQUIRES, $docComment, $matches)) {
             for ($i = 0; $i < $count; $i++) {
                 $name = $matches['name'][$i] . 's';
@@ -155,35 +274,29 @@ public static function getExpectedException($className, $methodName)
             );
 
             $class   = $matches[1];
-            $code    = NULL;
+            $code    = null;
             $message = '';
 
             if (isset($matches[2])) {
                 $message = trim($matches[2]);
-            }
-
-            else if (isset($annotations['method']['expectedExceptionMessage'])) {
-                $message = self::_parseAnnotationContent(
+            } elseif (isset($annotations['method']['expectedExceptionMessage'])) {
+                $message = self::parseAnnotationContent(
                     $annotations['method']['expectedExceptionMessage'][0]
                 );
             }
 
             if (isset($matches[3])) {
                 $code = $matches[3];
-            }
-
-            else if (isset($annotations['method']['expectedExceptionCode'])) {
-                $code = self::_parseAnnotationContent(
+            } elseif (isset($annotations['method']['expectedExceptionCode'])) {
+                $code = self::parseAnnotationContent(
                     $annotations['method']['expectedExceptionCode'][0]
                 );
             }
 
             if (is_numeric($code)) {
-                $code = (int)$code;
-            }
-
-            else if (is_string($code) && defined($code)) {
-                $code = (int)constant($code);
+                $code = (int) $code;
+            } elseif (is_string($code) && defined($code)) {
+                $code = (int) constant($code);
             }
 
             return array(
@@ -191,7 +304,7 @@ public static function getExpectedException($className, $methodName)
             );
         }
 
-        return FALSE;
+        return false;
     }
 
     /**
@@ -204,32 +317,33 @@ public static function getExpectedException($className, $methodName)
      * @param  string $message
      * @return string
      */
-    protected static function _parseAnnotationContent($message)
+    private static function parseAnnotationContent($message)
     {
-        if (strpos($message, '::') !== FALSE && count(explode('::', $message) == 2)) {
+        if (strpos($message, '::') !== false && count(explode('::', $message) == 2)) {
             if (defined($message)) {
                 $message = constant($message);
             }
         }
+
         return $message;
     }
 
     /**
      * Returns the provided data for a method.
      *
-     * @param  string $className
-     * @param  string $methodName
-     * @param  string $docComment
-     * @return mixed  array|Iterator when a data provider is specified and exists
-     *                false          when a data provider is specified and does not exist
-     *                null           when no data provider is specified
+     * @param  string           $className
+     * @param  string           $methodName
+     * @return array|Iterator when a data provider is specified and exists
+     *         false          when a data provider is specified but does not exist
+     *         null           when no data provider is specified
+     * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.2.0
      */
     public static function getProvidedData($className, $methodName)
     {
         $reflector  = new ReflectionMethod($className, $methodName);
         $docComment = $reflector->getDocComment();
-        $data       = NULL;
+        $data       = null;
 
         if (preg_match(self::REGEX_DATA_PROVIDER, $docComment, $matches)) {
             $dataProviderMethodNameNamespace = explode('\\', $matches[1]);
@@ -254,7 +368,7 @@ public static function getProvidedData($className, $methodName)
             );
 
             if ($dataProviderMethod->isStatic()) {
-                $object = NULL;
+                $object = null;
             } else {
                 $object = $dataProviderClass->newInstance();
             }
@@ -266,7 +380,11 @@ public static function getProvidedData($className, $methodName)
             }
         }
 
-        if ($data !== NULL) {
+        if ($data !== null) {
+            if (is_object($data)) {
+                $data = iterator_to_array($data);
+            }
+
             foreach ($data as $key => $value) {
                 if (!is_array($value)) {
                     throw new PHPUnit_Framework_Exception(
@@ -283,8 +401,8 @@ public static function getProvidedData($className, $methodName)
     }
 
     /**
-     * @param  string $className
-     * @param  string $methodName
+     * @param  string              $className
+     * @param  string              $methodName
      * @return array
      * @throws ReflectionException
      * @since  Method available since Release 3.4.0
@@ -386,8 +504,8 @@ public static function getDependencies($className, $methodName)
     /**
      * Returns the error handler settings for a test.
      *
-     * @param  string $className
-     * @param  string $methodName
+     * @param  string  $className
+     * @param  string  $methodName
      * @return boolean
      * @since  Method available since Release 3.4.0
      */
@@ -416,9 +534,7 @@ public static function getGroups($className, $methodName = '')
 
         if (isset($annotations['method']['author'])) {
             $groups = $annotations['method']['author'];
-        }
-
-        else if (isset($annotations['class']['author'])) {
+        } elseif (isset($annotations['class']['author'])) {
             $groups = $annotations['class']['author'];
         }
 
@@ -441,9 +557,7 @@ public static function getGroups($className, $methodName = '')
         foreach (array('small', 'medium', 'large') as $size) {
             if (isset($annotations['method'][$size])) {
                 $groups[] = $size;
-            }
-
-            else if (isset($annotations['class'][$size])) {
+            } elseif (isset($annotations['class'][$size])) {
                 $groups[] = $size;
             }
         }
@@ -454,8 +568,8 @@ public static function getGroups($className, $methodName = '')
     /**
      * Returns the size of the test.
      *
-     * @param  string $className
-     * @param  string $methodName
+     * @param  string  $className
+     * @param  string  $methodName
      * @return integer
      * @since  Method available since Release 3.6.0
      */
@@ -465,18 +579,14 @@ public static function getSize($className, $methodName)
         $size   = self::SMALL;
         $class  = new ReflectionClass($className);
 
-        if ((class_exists('PHPUnit_Extensions_Database_TestCase', FALSE) &&
+        if ((class_exists('PHPUnit_Extensions_Database_TestCase', false) &&
              $class->isSubclassOf('PHPUnit_Extensions_Database_TestCase')) ||
-            (class_exists('PHPUnit_Extensions_SeleniumTestCase', FALSE) &&
+            (class_exists('PHPUnit_Extensions_SeleniumTestCase', false) &&
              $class->isSubclassOf('PHPUnit_Extensions_SeleniumTestCase'))) {
             $size = self::LARGE;
-        }
-
-        else if (isset($groups['medium'])) {
+        } elseif (isset($groups['medium'])) {
             $size = self::MEDIUM;
-        }
-
-        else if (isset($groups['large'])) {
+        } elseif (isset($groups['large'])) {
             $size = self::LARGE;
         }
 
@@ -510,26 +620,11 @@ public static function getTickets($className, $methodName)
         return array_unique($tickets);
     }
 
-    /**
-     * Returns the output buffering settings for a test.
-     *
-     * @param  string $className
-     * @param  string $methodName
-     * @return boolean
-     * @since  Method available since Release 3.4.0
-     */
-    public static function getOutputBufferingSettings($className, $methodName)
-    {
-        return self::getBooleanAnnotationSetting(
-          $className, $methodName, 'outputBuffering'
-        );
-    }
-
     /**
      * Returns the process isolation settings for a test.
      *
-     * @param  string $className
-     * @param  string $methodName
+     * @param  string  $className
+     * @param  string  $methodName
      * @return boolean
      * @since  Method available since Release 3.4.1
      */
@@ -541,17 +636,17 @@ public static function getProcessIsolationSettings($className, $methodName)
 
         if (isset($annotations['class']['runTestsInSeparateProcesses']) ||
             isset($annotations['method']['runInSeparateProcess'])) {
-            return TRUE;
+            return true;
         } else {
-            return FALSE;
+            return false;
         }
     }
 
     /**
      * Returns the preserve global state settings for a test.
      *
-     * @param  string $className
-     * @param  string $methodName
+     * @param  string  $className
+     * @param  string  $methodName
      * @return boolean
      * @since  Method available since Release 3.4.0
      */
@@ -564,8 +659,67 @@ public static function getPreserveGlobalStateSettings($className, $methodName)
 
     /**
      * @param  string $className
-     * @param  string $methodName
-     * @param  string $settingName
+     * @return array
+     * @since  Method available since Release 4.0.8
+     */
+    public static function getHookMethods($className)
+    {
+        if (!class_exists($className, false)) {
+            return self::emptyHookMethodsArray();
+        }
+
+        if (!isset(self::$hookMethods[$className])) {
+            self::$hookMethods[$className] = self::emptyHookMethodsArray();
+
+            try {
+                $class = new ReflectionClass($className);
+
+                foreach ($class->getMethods() as $method) {
+                    if ($method->getDeclaringClass()->getName() != $className) {
+                        continue;
+                    }
+
+                    if (self::isBeforeClassMethod($method)) {
+                        self::$hookMethods[$className]['beforeClass'][] = $method->getName();
+                    }
+
+                    if (self::isBeforeMethod($method)) {
+                        self::$hookMethods[$className]['before'][] = $method->getName();
+                    }
+
+                    if (self::isAfterMethod($method)) {
+                        self::$hookMethods[$className]['after'][] = $method->getName();
+                    }
+
+                    if (self::isAfterClassMethod($method)) {
+                        self::$hookMethods[$className]['afterClass'][] = $method->getName();
+                    }
+                }
+            } catch (ReflectionException $e) {
+            }
+        }
+
+        return self::$hookMethods[$className];
+    }
+
+    /**
+     * @return array
+     * @since  Method available since Release 4.0.9
+     */
+    private static function emptyHookMethodsArray()
+    {
+        return array(
+            'beforeClass' => array('setUpBeforeClass'),
+            'before' => array('setUp'),
+            'after' => array('tearDown'),
+            'afterClass' => array('tearDownAfterClass')
+        );
+    }
+
+    /**
+     * @param  string  $className
+     * @param  string  $methodName
+     * @param  string  $settingName
      * @return boolean
      * @since  Method available since Release 3.4.0
      */
@@ -575,28 +729,229 @@ private static function getBooleanAnnotationSetting($className, $methodName, $se
           $className, $methodName
         );
 
-        $result = NULL;
+        $result = null;
 
         if (isset($annotations['class'][$settingName])) {
             if ($annotations['class'][$settingName][0] == 'enabled') {
-                $result = TRUE;
-            }
-
-            else if ($annotations['class'][$settingName][0] == 'disabled') {
-                $result = FALSE;
+                $result = true;
+            } elseif ($annotations['class'][$settingName][0] == 'disabled') {
+                $result = false;
             }
         }
 
         if (isset($annotations['method'][$settingName])) {
             if ($annotations['method'][$settingName][0] == 'enabled') {
-                $result = TRUE;
+                $result = true;
+            } elseif ($annotations['method'][$settingName][0] == 'disabled') {
+                $result = false;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param  string $element
+     * @return array
+     * @throws PHPUnit_Framework_InvalidCoversTargetException
+     * @since  Method available since Release 4.0.0
+     */
+    private static function resolveElementToReflectionObjects($element)
+    {
+        $codeToCoverList = array();
+
+        if (strpos($element, '::') !== false) {
+            list($className, $methodName) = explode('::', $element);
+
+            if (isset($methodName[0]) && $methodName[0] == '<') {
+                $classes = array($className);
+
+                foreach ($classes as $className) {
+                    if (!class_exists($className) &&
+                        !interface_exists($className)) {
+                        throw new PHPUnit_Framework_InvalidCoversTargetException(
+                          sprintf(
+                            'Trying to @cover or @use not existing class or ' .
+                            'interface "%s".',
+                            $className
+                          )
+                        );
+                    }
+
+                    $class   = new ReflectionClass($className);
+                    $methods = $class->getMethods();
+                    $inverse = isset($methodName[1]) && $methodName[1] == '!';
+
+                    if (strpos($methodName, 'protected')) {
+                        $visibility = 'isProtected';
+                    } elseif (strpos($methodName, 'private')) {
+                        $visibility = 'isPrivate';
+                    } elseif (strpos($methodName, 'public')) {
+                        $visibility = 'isPublic';
+                    }
+
+                    foreach ($methods as $method) {
+                        if ($inverse && !$method->$visibility()) {
+                            $codeToCoverList[] = $method;
+                        } elseif (!$inverse && $method->$visibility()) {
+                            $codeToCoverList[] = $method;
+                        }
+                    }
+                }
+            } else {
+                $classes = array($className);
+
+                foreach ($classes as $className) {
+                    if ($className == '' && function_exists($methodName)) {
+                        $codeToCoverList[] = new ReflectionFunction(
+                          $methodName
+                        );
+                    } else {
+                        if (!((class_exists($className) ||
+                               interface_exists($className) ||
+                               trait_exists($className)) &&
+                              method_exists($className, $methodName))) {
+                            throw new PHPUnit_Framework_InvalidCoversTargetException(
+                              sprintf(
+                                'Trying to @cover or @use not existing method "%s::%s".',
+                                $className,
+                                $methodName
+                              )
+                            );
+                        }
+
+                        $codeToCoverList[] = new ReflectionMethod(
+                          $className, $methodName
+                        );
+                    }
+                }
+            }
+        } else {
+            $extended = false;
+
+            if (strpos($element, '<extended>') !== false) {
+                $element = str_replace(
+                  '<extended>', '', $element
+                );
+
+                $extended = true;
+            }
+
+            $classes = array($element);
+
+            if ($extended) {
+                $classes = array_merge(
+                  $classes,
+                  class_implements($element),
+                  class_parents($element)
+                );
+            }
+
+            foreach ($classes as $className) {
+                if (!class_exists($className) &&
+                    !interface_exists($className) &&
+                    !trait_exists($className)) {
+                    throw new PHPUnit_Framework_InvalidCoversTargetException(
+                      sprintf(
+                        'Trying to @cover or @use not existing class or ' .
+                        'interface "%s".',
+                        $className
+                      )
+                    );
+                }
+
+                $codeToCoverList[] = new ReflectionClass($className);
             }
+        }
+
+        return $codeToCoverList;
+    }
+
+    /**
+     * @param  array $reflectors
+     * @return array
+     */
+    private static function resolveReflectionObjectsToLines(array $reflectors)
+    {
+        $result = array();
+
+        foreach ($reflectors as $reflector) {
+            $filename = $reflector->getFileName();
 
-            else if ($annotations['method'][$settingName][0] == 'disabled') {
-                $result = FALSE;
+            if (!isset($result[$filename])) {
+                $result[$filename] = array();
             }
+
+            $result[$filename] = array_unique(
+              array_merge(
+                $result[$filename],
+                range(
+                  $reflector->getStartLine(), $reflector->getEndLine()
+                )
+              )
+            );
         }
 
         return $result;
     }
+
+    /**
+     * @param  ReflectionClass $class
+     * @param  ReflectionMethod $method
+     * @return string
+     */
+    private static function getDocCommentsOfTestClassAndTestMethodAndTemplateMethods(ReflectionClass $class, ReflectionMethod $method)
+    {
+        $buffer = substr($class->getDocComment(),  3, -2) . PHP_EOL .
+                  substr($method->getDocComment(), 3, -2);
+
+        foreach (self::$templateMethods as $templateMethod) {
+            if ($class->hasMethod($templateMethod)) {
+                $_method = $class->getMethod($templateMethod);
+                $buffer .= PHP_EOL . substr($_method->getDocComment(), 3, -2);
+            }
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     * @since  Method available since Release 4.0.8
+     */
+    private static function isBeforeClassMethod(ReflectionMethod $method)
+    {
+        return $method->isStatic() && strpos($method->getDocComment(), '@beforeClass') !== false;
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     * @since  Method available since Release 4.0.8
+     */
+    private static function isBeforeMethod(ReflectionMethod $method)
+    {
+        return preg_match('/@before\b/', $method->getDocComment());
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     * @since  Method available since Release 4.0.8
+     */
+    private static function isAfterClassMethod(ReflectionMethod $method)
+    {
+        return $method->isStatic() && strpos($method->getDocComment(), '@afterClass') !== false;
+    }
+
+    /**
+     * @param  ReflectionMethod $method
+     * @return boolean
+     * @since  Method available since Release 4.0.8
+     */
+    private static function isAfterMethod(ReflectionMethod $method)
+    {
+        return preg_match('/@after\b/', $method->getDocComment());
+    }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/NamePrettifier.php b/core/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
similarity index 87%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/NamePrettifier.php
rename to core/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
index 2be7934fbdcc74d62413a01baef1f488e84f35bc..8e599b4e711c82ce409bc6a80ff2d9b4129679e8 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/NamePrettifier.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util_TestDox
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util_TestDox
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.1.0
@@ -74,30 +74,34 @@ class PHPUnit_Util_TestDox_NamePrettifier
     /**
      * Prettifies the name of a test class.
      *
-     * @param  string  $name
+     * @param  string $name
      * @return string
      */
     public function prettifyTestClass($name)
     {
         $title = $name;
 
-        if ($this->suffix !== NULL &&
+        if ($this->suffix !== null &&
             $this->suffix == substr($name, -1 * strlen($this->suffix))) {
             $title = substr($title, 0, strripos($title, $this->suffix));
         }
 
-        if ($this->prefix !== NULL &&
+        if ($this->prefix !== null &&
             $this->prefix == substr($name, 0, strlen($this->prefix))) {
             $title = substr($title, strlen($this->prefix));
         }
 
+        if (substr($title, 0, 1) == '\\') {
+            $title = substr($title, 1);
+        }
+
         return $title;
     }
 
     /**
      * Prettifies the name of a test method.
      *
-     * @param  string  $name
+     * @param  string $name
      * @return string
      */
     public function prettifyTestMethod($name)
@@ -112,11 +116,11 @@ public function prettifyTestMethod($name)
 
         if (in_array($string, $this->strings)) {
             $name = $string;
-        } else if ($count == 0) {
+        } elseif ($count == 0) {
             $this->strings[] = $string;
         }
 
-        if (strpos($name, '_') !== FALSE) {
+        if (strpos($name, '_') !== false) {
             return str_replace('_', ' ', $name);
         }
 
@@ -129,7 +133,7 @@ public function prettifyTestMethod($name)
             $name[0] = strtoupper($name[0]);
         }
 
-        $wasNumeric = FALSE;
+        $wasNumeric = false;
 
         for ($i = $offset; $i < $max; $i++) {
             if ($i > $offset &&
@@ -141,11 +145,11 @@ public function prettifyTestMethod($name)
 
                 if (!$wasNumeric && $isNumeric) {
                     $buffer    .= ' ';
-                    $wasNumeric = TRUE;
+                    $wasNumeric = true;
                 }
 
                 if ($wasNumeric && !$isNumeric) {
-                    $wasNumeric = FALSE;
+                    $wasNumeric = false;
                 }
 
                 $buffer .= $name[$i];
@@ -158,7 +162,7 @@ public function prettifyTestMethod($name)
     /**
      * Sets the prefix of test names.
      *
-     * @param  string  $prefix
+     * @param string $prefix
      */
     public function setPrefix($prefix)
     {
@@ -168,7 +172,7 @@ public function setPrefix($prefix)
     /**
      * Sets the suffix of test names.
      *
-     * @param  string  $prefix
+     * @param string $suffix
      */
     public function setSuffix($suffix)
     {
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter.php b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
similarity index 80%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter.php
rename to core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
index 9e28b71e4abbeca1810841d9a1e5bc63f4679bf4..b227f24ff5dd8e31663f5c103b5e5e5760e8f298 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util_TestDox
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util_TestDox
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.1.0
@@ -69,7 +69,7 @@ abstract class PHPUnit_Util_TestDox_ResultPrinter extends PHPUnit_Util_Printer i
     /**
      * @var integer
      */
-    protected $testStatus = FALSE;
+    protected $testStatus = false;
 
     /**
      * @var array
@@ -86,6 +86,11 @@ abstract class PHPUnit_Util_TestDox_ResultPrinter extends PHPUnit_Util_Printer i
      */
     protected $failed = 0;
 
+    /**
+     * @var integer
+     */
+    protected $risky = 0;
+
     /**
      * @var integer
      */
@@ -114,9 +119,9 @@ abstract class PHPUnit_Util_TestDox_ResultPrinter extends PHPUnit_Util_Printer i
     /**
      * Constructor.
      *
-     * @param  resource  $out
+     * @param resource $out
      */
-    public function __construct($out = NULL)
+    public function __construct($out = null)
     {
         parent::__construct($out);
 
@@ -139,9 +144,9 @@ public function flush()
     /**
      * An error occurred.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
@@ -154,9 +159,9 @@ public function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
     /**
      * A failure occurred.
      *
-     * @param  PHPUnit_Framework_Test                 $test
-     * @param  PHPUnit_Framework_AssertionFailedError $e
-     * @param  float                                  $time
+     * @param PHPUnit_Framework_Test                 $test
+     * @param PHPUnit_Framework_AssertionFailedError $e
+     * @param float                                  $time
      */
     public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
     {
@@ -169,9 +174,9 @@ public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_Asser
     /**
      * Incomplete test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      */
     public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
@@ -181,12 +186,28 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t
         }
     }
 
+    /**
+     * Risky test.
+     *
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
+     * @since  Method available since Release 4.0.0
+     */
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        if ($test instanceof $this->testTypeOfInterest) {
+            $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_RISKY;
+            $this->risky++;
+        }
+    }
+
     /**
      * Skipped test.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  Exception              $e
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param Exception              $e
+     * @param float                  $time
      * @since  Method available since Release 3.0.0
      */
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
@@ -200,7 +221,7 @@ public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time
     /**
      * A testsuite started.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -210,7 +231,7 @@ public function startTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A testsuite ended.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      * @since  Method available since Release 2.2.0
      */
     public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
@@ -220,7 +241,7 @@ public function endTestSuite(PHPUnit_Framework_TestSuite $suite)
     /**
      * A test started.
      *
-     * @param  PHPUnit_Framework_Test $test
+     * @param PHPUnit_Framework_Test $test
      */
     public function startTest(PHPUnit_Framework_Test $test)
     {
@@ -239,7 +260,7 @@ public function startTest(PHPUnit_Framework_Test $test)
                 $this->tests     = array();
             }
 
-            $prettified = FALSE;
+            $prettified = false;
 
             if ($test instanceof PHPUnit_Framework_TestCase &&
                !$test instanceof PHPUnit_Framework_Warning) {
@@ -247,12 +268,12 @@ public function startTest(PHPUnit_Framework_Test $test)
 
                 if (isset($annotations['method']['testdox'][0])) {
                     $this->currentTestMethodPrettified = $annotations['method']['testdox'][0];
-                    $prettified                        = TRUE;
+                    $prettified                        = true;
                 }
             }
 
             if (!$prettified) {
-                $this->currentTestMethodPrettified = $this->prettifier->prettifyTestMethod($test->getName(FALSE));
+                $this->currentTestMethodPrettified = $this->prettifier->prettifyTestMethod($test->getName(false));
             }
 
             $this->testStatus = PHPUnit_Runner_BaseTestRunner::STATUS_PASSED;
@@ -262,8 +283,8 @@ public function startTest(PHPUnit_Framework_Test $test)
     /**
      * A test ended.
      *
-     * @param  PHPUnit_Framework_Test $test
-     * @param  float                  $time
+     * @param PHPUnit_Framework_Test $test
+     * @param float                  $time
      */
     public function endTest(PHPUnit_Framework_Test $test, $time)
     {
@@ -284,8 +305,8 @@ public function endTest(PHPUnit_Framework_Test $test, $time)
                 }
             }
 
-            $this->currentTestClassPrettified  = NULL;
-            $this->currentTestMethodPrettified = NULL;
+            $this->currentTestClassPrettified  = null;
+            $this->currentTestMethodPrettified = null;
         }
     }
 
@@ -312,7 +333,7 @@ protected function startRun()
     /**
      * Handler for 'start class' event.
      *
-     * @param  string $name
+     * @param string $name
      */
     protected function startClass($name)
     {
@@ -321,17 +342,17 @@ protected function startClass($name)
     /**
      * Handler for 'on test' event.
      *
-     * @param  string  $name
-     * @param  boolean $success
+     * @param string  $name
+     * @param boolean $success
      */
-    protected function onTest($name, $success = TRUE)
+    protected function onTest($name, $success = true)
     {
     }
 
     /**
      * Handler for 'end class' event.
      *
-     * @param  string $name
+     * @param string $name
      */
     protected function endClass($name)
     {
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/HTML.php b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/HTML.php
rename to core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
index 0325ae25a140e18fee46634ffb8399fe9c173264..c501dc723f10e9119bf1e5426b8e9d2ef7841c87 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/HTML.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util_TestDox
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util_TestDox
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.1.0
@@ -59,7 +59,7 @@ class PHPUnit_Util_TestDox_ResultPrinter_HTML extends PHPUnit_Util_TestDox_Resul
     /**
      * @var    boolean
      */
-    protected $printsHTML = TRUE;
+    protected $printsHTML = true;
 
     /**
      * Handler for 'start run' event.
@@ -73,7 +73,7 @@ protected function startRun()
     /**
      * Handler for 'start class' event.
      *
-     * @param  string $name
+     * @param string $name
      */
     protected function startClass($name)
     {
@@ -86,14 +86,14 @@ protected function startClass($name)
     /**
      * Handler for 'on test' event.
      *
-     * @param  string  $name
-     * @param  boolean $success
+     * @param string  $name
+     * @param boolean $success
      */
-    protected function onTest($name, $success = TRUE)
+    protected function onTest($name, $success = true)
     {
         if (!$success) {
-            $strikeOpen  = '<strike>';
-            $strikeClose = '</strike>';
+            $strikeOpen  = '<span style="text-decoration:line-through;">';
+            $strikeClose = '</span>';
         } else {
             $strikeOpen  = '';
             $strikeClose = '';
@@ -105,7 +105,7 @@ protected function onTest($name, $success = TRUE)
     /**
      * Handler for 'end class' event.
      *
-     * @param  string $name
+     * @param string $name
      */
     protected function endClass($name)
     {
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/Text.php b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/Text.php
rename to core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
index 56c60e8a5e1a4d0c0f2c626bd43be2f06f3458e2..6a76c314b32f2df98f798fde27a58b591b02fbc8 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestDox/ResultPrinter/Text.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util_TestDox
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util_TestDox
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.1.0
@@ -59,7 +59,7 @@ class PHPUnit_Util_TestDox_ResultPrinter_Text extends PHPUnit_Util_TestDox_Resul
     /**
      * Handler for 'start class' event.
      *
-     * @param  string $name
+     * @param string $name
      */
     protected function startClass($name)
     {
@@ -69,10 +69,10 @@ protected function startClass($name)
     /**
      * Handler for 'on test' event.
      *
-     * @param  string  $name
-     * @param  boolean $success
+     * @param string  $name
+     * @param boolean $success
      */
-    protected function onTest($name, $success = TRUE)
+    protected function onTest($name, $success = true)
     {
         if ($success) {
             $this->write(' [x] ');
@@ -86,7 +86,7 @@ protected function onTest($name, $success = TRUE)
     /**
      * Handler for 'end class' event.
      *
-     * @param  string $name
+     * @param string $name
      */
     protected function endClass($name)
     {
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestSuiteIterator.php b/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
similarity index 94%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/TestSuiteIterator.php
rename to core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
index 82cc74d09503177252aba028140ece0a7940372b..dc4979071b291609dd6cd5b6f7ad0ddaa73d588c 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/TestSuiteIterator.php
+++ b/core/vendor/phpunit/phpunit/src/Util/TestSuiteIterator.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.1.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.1.0
@@ -69,7 +69,7 @@ class PHPUnit_Util_TestSuiteIterator implements RecursiveIterator
     /**
      * Constructor.
      *
-     * @param  PHPUnit_Framework_TestSuite $suite
+     * @param PHPUnit_Framework_TestSuite $suite
      */
     public function __construct(PHPUnit_Framework_TestSuite $testSuite)
     {
@@ -112,7 +112,7 @@ public function key()
      */
     public function current()
     {
-        return $this->valid() ? $this->tests[$this->position] : NULL;
+        return $this->valid() ? $this->tests[$this->position] : null;
     }
 
     /**
diff --git a/core/vendor/phpunit/phpunit/src/Util/Type.php b/core/vendor/phpunit/phpunit/src/Util/Type.php
new file mode 100644
index 0000000000000000000000000000000000000000..d48d4c2b0c7884b9d833ccae4d4cd13bc5a0f1fd
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/src/Util/Type.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.0.0
+ */
+
+/**
+ * Utility class for textual type (and value) representation.
+ *
+ * @package    PHPUnit
+ * @subpackage Util
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.0.0
+ */
+class PHPUnit_Util_Type
+{
+    public static function isType($type)
+    {
+        return in_array(
+          $type,
+          array(
+            'numeric',
+            'integer',
+            'int',
+            'float',
+            'string',
+            'boolean',
+            'bool',
+            'null',
+            'array',
+            'object',
+            'resource',
+            'scalar'
+          )
+        );
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/XML.php b/core/vendor/phpunit/phpunit/src/Util/XML.php
similarity index 84%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/XML.php
rename to core/vendor/phpunit/phpunit/src/Util/XML.php
index 3016312e5275f8b54e9b56fd5e9d24ce23484026..e4ac534ddb1e365bdf53b373a98a6e2a7645177a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/XML.php
+++ b/core/vendor/phpunit/phpunit/src/Util/XML.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.2.0
@@ -49,7 +49,7 @@
  * @package    PHPUnit
  * @subpackage Util
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.2.0
@@ -57,6 +57,11 @@
 class PHPUnit_Util_XML
 {
     /**
+     * Escapes a string for the use in XML documents
+     * Any Unicode character is allowed, excluding the surrogate blocks, FFFE,
+     * and FFFF (not even as character reference).
+     * See http://www.w3.org/TR/xml/#charsets
+     *
      * @param  string $string
      * @return string
      * @author Kore Nordmann <mail@kore-nordmann.de>
@@ -64,14 +69,11 @@ class PHPUnit_Util_XML
      */
     public static function prepareString($string)
     {
-        return preg_replace_callback(
-          '/[\\x00-\\x04\\x0b\\x0c\\x0e-\\x1f\\x7f]/',
-          function ($matches)
-          {
-              return sprintf('&#x%02x;', ord($matches[0]));
-          },
+        return preg_replace(
+          '/[\\x00-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]/',
+          '',
           htmlspecialchars(
-            PHPUnit_Util_String::convertToUtf8($string), ENT_COMPAT, 'UTF-8'
+            PHPUnit_Util_String::convertToUtf8($string), ENT_QUOTES, 'UTF-8'
           )
         );
     }
@@ -79,19 +81,19 @@ function ($matches)
     /**
      * Loads an XML (or HTML) file into a DOMDocument object.
      *
-     * @param  string  $filename
-     * @param  boolean $isHtml
-     * @param  boolean $xinclude
+     * @param  string      $filename
+     * @param  boolean     $isHtml
+     * @param  boolean     $xinclude
      * @return DOMDocument
      * @since  Method available since Release 3.3.0
      */
-    public static function loadFile($filename, $isHtml = FALSE, $xinclude = FALSE)
+    public static function loadFile($filename, $isHtml = false, $xinclude = false)
     {
         $reporting = error_reporting(0);
         $contents  = file_get_contents($filename);
         error_reporting($reporting);
 
-        if ($contents === FALSE) {
+        if ($contents === false) {
             throw new PHPUnit_Framework_Exception(
               sprintf(
                 'Could not read "%s".',
@@ -117,17 +119,17 @@ public static function loadFile($filename, $isHtml = FALSE, $xinclude = FALSE)
      * not a string as it currently does.  To load a file into a
      * DOMDocument, use loadFile() instead.
      *
-     * @param  string|DOMDocument  $actual
-     * @param  boolean             $isHtml
-     * @param  string              $filename
-     * @param  boolean             $xinclude
+     * @param  string|DOMDocument $actual
+     * @param  boolean            $isHtml
+     * @param  string             $filename
+     * @param  boolean            $xinclude
      * @return DOMDocument
      * @since  Method available since Release 3.3.0
      * @author Mike Naberezny <mike@maintainable.com>
      * @author Derek DeVries <derek@maintainable.com>
      * @author Tobias Schlitt <toby@php.net>
      */
-    public static function load($actual, $isHtml = FALSE, $filename = '', $xinclude = FALSE)
+    public static function load($actual, $isHtml = false, $filename = '', $xinclude = false)
     {
         if ($actual instanceof DOMDocument) {
             return $actual;
@@ -135,7 +137,7 @@ public static function load($actual, $isHtml = FALSE, $filename = '', $xinclude
 
         $document  = new DOMDocument;
 
-        $internal  = libxml_use_internal_errors(TRUE);
+        $internal  = libxml_use_internal_errors(true);
         $message   = '';
         $reporting = error_reporting(0);
 
@@ -161,7 +163,7 @@ public static function load($actual, $isHtml = FALSE, $filename = '', $xinclude
         libxml_use_internal_errors($internal);
         error_reporting($reporting);
 
-        if ($loaded === FALSE) {
+        if ($loaded === false) {
             if ($filename != '') {
                 throw new PHPUnit_Framework_Exception(
                   sprintf(
@@ -204,7 +206,7 @@ public static function nodeToText(DOMNode $node)
     /**
      *
      *
-     * @param  DOMNode $node
+     * @param DOMNode $node
      * @since  Method available since Release 3.3.0
      * @author Mattis Stordalen Flister <mattis@xait.no>
      */
@@ -228,7 +230,7 @@ public static function removeCharacterDataNodes(DOMNode $node)
      */
     public static function xmlToVariable(DOMElement $element)
     {
-        $variable = NULL;
+        $variable = null;
 
         switch ($element->tagName) {
             case 'array': {
@@ -238,7 +240,7 @@ public static function xmlToVariable(DOMElement $element)
                     $value = self::xmlToVariable($element->childNodes->item(1));
 
                     if ($element->hasAttribute('key')) {
-                        $variable[(string)$element->getAttribute('key')] = $value;
+                        $variable[(string) $element->getAttribute('key')] = $value;
                     } else {
                         $variable[] = $value;
                     }
@@ -268,7 +270,7 @@ public static function xmlToVariable(DOMElement $element)
             break;
 
             case 'boolean': {
-                $variable = $element->nodeValue == 'true' ? TRUE : FALSE;
+                $variable = $element->nodeValue == 'true' ? true : false;
             }
             break;
 
@@ -288,8 +290,8 @@ public static function xmlToVariable(DOMElement $element)
     /**
      * Validate list of keys in the associative array.
      *
-     * @param  array $hash
-     * @param  array $validKeys
+     * @param  array                       $hash
+     * @param  array                       $validKeys
      * @return array
      * @throws PHPUnit_Framework_Exception
      * @since  Method available since Release 3.3.0
@@ -303,7 +305,7 @@ public static function assertValidKeys(array $hash, array $validKeys)
         // Normalize validation keys so that we can use both indexed and
         // associative arrays.
         foreach ($validKeys as $key => $val) {
-            is_int($key) ? $valids[$val] = NULL : $valids[$key] = $val;
+            is_int($key) ? $valids[$val] = null : $valids[$key] = $val;
         }
 
         $validKeys = array_keys($valids);
@@ -342,7 +344,7 @@ public static function assertValidKeys(array $hash, array $validKeys)
      * @author Mike Naberezny <mike@maintainable.com>
      * @author Derek DeVries <derek@maintainable.com>
      */
-    public static function convertSelectToTag($selector, $content = TRUE)
+    public static function convertSelectToTag($selector, $content = true)
     {
         $selector = trim(preg_replace("/\s+/", " ", $selector));
 
@@ -370,6 +372,12 @@ public static function convertSelectToTag($selector, $content = TRUE)
                 continue;
             }
 
+            // adjacent-sibling selector
+            if ($element == '+') {
+                $previousTag = array('adjacent-sibling' => $previousTag['descendant']);
+                continue;
+            }
+
             $tag = array();
 
             // match element tag
@@ -444,10 +452,11 @@ public static function convertSelectToTag($selector, $content = TRUE)
             // determine previous child/descendants
             if (!empty($previousTag['descendant'])) {
                 $tag['descendant'] = $previousTag['descendant'];
-            }
-
-            else if (!empty($previousTag['child'])) {
+            } elseif (!empty($previousTag['child'])) {
                 $tag['child'] = $previousTag['child'];
+            } elseif (!empty($previousTag['adjacent-sibling'])) {
+                $tag['adjacent-sibling'] = $previousTag['adjacent-sibling'];
+                unset($tag['content']);
             }
 
             $previousTag = array('descendant' => $tag);
@@ -459,26 +468,26 @@ public static function convertSelectToTag($selector, $content = TRUE)
     /**
      * Parse an $actual document and return an array of DOMNodes
      * matching the CSS $selector.  If an error occurs, it will
-     * return FALSE.
+     * return false.
      *
      * To only return nodes containing a certain content, give
      * the $content to match as a string.  Otherwise, setting
-     * $content to TRUE will return all nodes matching $selector.
+     * $content to true will return all nodes matching $selector.
      *
      * The $actual document may be a DOMDocument or a string
      * containing XML or HTML, identified by $isHtml.
      *
-     * @param  array   $selector
-     * @param  string  $content
-     * @param  mixed   $actual
-     * @param  boolean $isHtml
-     * @return false|array
+     * @param  array         $selector
+     * @param  string        $content
+     * @param  mixed         $actual
+     * @param  boolean       $isHtml
+     * @return boolean|array
      * @since  Method available since Release 3.3.0
      * @author Mike Naberezny <mike@maintainable.com>
      * @author Derek DeVries <derek@maintainable.com>
      * @author Tobias Schlitt <toby@php.net>
      */
-    public static function cssSelect($selector, $content, $actual, $isHtml = TRUE)
+    public static function cssSelect($selector, $content, $actual, $isHtml = true)
     {
         $matcher = self::convertSelectToTag($selector, $content);
         $dom     = self::load($actual, $isHtml);
@@ -499,11 +508,11 @@ public static function cssSelect($selector, $content, $actual, $isHtml = TRUE)
      * @author Derek DeVries <derek@maintainable.com>
      * @author Tobias Schlitt <toby@php.net>
      */
-    public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRUE)
+    public static function findNodes(DOMDocument $dom, array $options, $isHtml = true)
     {
         $valid = array(
           'id', 'class', 'tag', 'content', 'attributes', 'parent',
-          'child', 'ancestor', 'descendant', 'children'
+          'child', 'ancestor', 'descendant', 'children', 'adjacent-sibling'
         );
 
         $filtered = array();
@@ -533,7 +542,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
             }
 
             if (empty($nodes)) {
-                return FALSE;
+                return false;
             }
         }
 
@@ -550,7 +559,13 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
               'option', 'p', 'param', 'pre', 'q', 'samp', 'script', 'select',
               'small', 'span', 'strong', 'style', 'sub', 'sup', 'table',
               'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title',
-              'tr', 'tt', 'ul', 'var'
+              'tr', 'tt', 'ul', 'var',
+              // HTML5
+              'article', 'aside', 'audio', 'bdi', 'canvas', 'command',
+              'datalist', 'details', 'dialog', 'embed', 'figure', 'figcaption',
+              'footer', 'header', 'hgroup', 'keygen', 'mark', 'meter', 'nav',
+              'output', 'progress', 'ruby', 'rt', 'rp', 'track', 'section',
+              'source', 'summary', 'time', 'video', 'wbr'
             );
 
             foreach ($tags as $tag) {
@@ -568,20 +583,20 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
             }
 
             if (empty($nodes)) {
-                return FALSE;
+                return false;
             }
         }
 
         // filter by attributes
         if ($options['attributes']) {
             foreach ($nodes as $node) {
-                $invalid = FALSE;
+                $invalid = false;
 
                 foreach ($options['attributes'] as $name => $value) {
                     // match by regexp if like "regexp:/foo/i"
                     if (preg_match('/^regexp\s*:\s*(.*)/i', $value, $matches)) {
                         if (!preg_match($matches[1], $node->getAttribute($name))) {
-                            $invalid = TRUE;
+                            $invalid = true;
                         }
                     }
 
@@ -600,7 +615,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
                         // make sure each class given is in the actual node
                         foreach ($findClasses as $findClass) {
                             if (!in_array($findClass, $allClasses)) {
-                                $invalid = TRUE;
+                                $invalid = true;
                             }
                         }
                     }
@@ -608,7 +623,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
                     // match by exact string
                     else {
                         if ($node->getAttribute($name) != $value) {
-                            $invalid = TRUE;
+                            $invalid = true;
                         }
                     }
                 }
@@ -623,32 +638,32 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
             $filtered = array();
 
             if (empty($nodes)) {
-                return FALSE;
+                return false;
             }
         }
 
         // filter by content
-        if ($options['content'] !== NULL) {
+        if ($options['content'] !== null) {
             foreach ($nodes as $node) {
-                $invalid = FALSE;
+                $invalid = false;
 
                 // match by regexp if like "regexp:/foo/i"
                 if (preg_match('/^regexp\s*:\s*(.*)/i', $options['content'], $matches)) {
                     if (!preg_match($matches[1], self::getNodeText($node))) {
-                        $invalid = TRUE;
+                        $invalid = true;
                     }
                 }
 
                 // match empty string
                 else if ($options['content'] === '') {
                     if (self::getNodeText($node) !== '') {
-                        $invalid = TRUE;
+                        $invalid = true;
                     }
                 }
 
                 // match by exact string
-                else if (strstr(self::getNodeText($node), $options['content']) === FALSE) {
-                    $invalid = TRUE;
+                else if (strstr(self::getNodeText($node), $options['content']) === false) {
+                    $invalid = true;
                 }
 
                 if (!$invalid) {
@@ -660,14 +675,14 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
             $filtered = array();
 
             if (empty($nodes)) {
-                return FALSE;
+                return false;
             }
         }
 
         // filter by parent node
         if ($options['parent']) {
             $parentNodes = self::findNodes($dom, $options['parent'], $isHtml);
-            $parentNode  = isset($parentNodes[0]) ? $parentNodes[0] : NULL;
+            $parentNode  = isset($parentNodes[0]) ? $parentNodes[0] : null;
 
             foreach ($nodes as $node) {
                 if ($parentNode !== $node->parentNode) {
@@ -681,7 +696,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
             $filtered = array();
 
             if (empty($nodes)) {
-                return FALSE;
+                return false;
             }
         }
 
@@ -704,14 +719,46 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
             $filtered = array();
 
             if (empty($nodes)) {
-                return FALSE;
+                return false;
+            }
+        }
+
+        // filter by adjacent-sibling
+        if ($options['adjacent-sibling']) {
+            $adjacentSiblingNodes = self::findNodes($dom, $options['adjacent-sibling'], $isHtml);
+            $adjacentSiblingNodes = !empty($adjacentSiblingNodes) ? $adjacentSiblingNodes : array();
+
+            foreach ($nodes as $node) {
+                $sibling = $node;
+
+                while ($sibling = $sibling->nextSibling) {
+                    if ($sibling->nodeType !== XML_ELEMENT_NODE) {
+                        continue;
+                    }
+
+                    foreach ($adjacentSiblingNodes as $adjacentSiblingNode) {
+                        if ($sibling === $adjacentSiblingNode) {
+                            $filtered[] = $node;
+                            break;
+                        }
+                    }
+
+                    break;
+                }
+            }
+
+            $nodes    = $filtered;
+            $filtered = array();
+
+            if (empty($nodes)) {
+                return false;
             }
         }
 
         // filter by ancestor
         if ($options['ancestor']) {
             $ancestorNodes = self::findNodes($dom, $options['ancestor'], $isHtml);
-            $ancestorNode  = isset($ancestorNodes[0]) ? $ancestorNodes[0] : NULL;
+            $ancestorNode  = isset($ancestorNodes[0]) ? $ancestorNodes[0] : null;
 
             foreach ($nodes as $node) {
                 $parent = $node->parentNode;
@@ -729,7 +776,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
             $filtered = array();
 
             if (empty($nodes)) {
-                return FALSE;
+                return false;
             }
         }
 
@@ -752,7 +799,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
             $filtered = array();
 
             if (empty($nodes)) {
-                return FALSE;
+                return false;
             }
         }
 
@@ -776,15 +823,15 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
                 // we must have children to pass this filter
                 if (!empty($children)) {
                     // exact count of children
-                    if ($childOptions['count'] !== NULL) {
+                    if ($childOptions['count'] !== null) {
                         if (count($children) !== $childOptions['count']) {
                             break;
                         }
                     }
 
                     // range count of children
-                    else if ($childOptions['less_than']    !== NULL &&
-                            $childOptions['greater_than'] !== NULL) {
+                    else if ($childOptions['less_than']    !== null &&
+                            $childOptions['greater_than'] !== null) {
                         if (count($children) >= $childOptions['less_than'] ||
                             count($children) <= $childOptions['greater_than']) {
                             break;
@@ -792,14 +839,14 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
                     }
 
                     // less than a given count
-                    else if ($childOptions['less_than'] !== NULL) {
+                    else if ($childOptions['less_than'] !== null) {
                         if (count($children) >= $childOptions['less_than']) {
                             break;
                         }
                     }
 
                     // more than a given count
-                    else if ($childOptions['greater_than'] !== NULL) {
+                    else if ($childOptions['greater_than'] !== null) {
                         if (count($children) <= $childOptions['greater_than']) {
                             break;
                         }
@@ -813,16 +860,16 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
 
                         // try to match each child to one of the 'only' nodes
                         foreach ($children as $child) {
-                            $matched = FALSE;
+                            $matched = false;
 
                             foreach ($onlyNodes as $onlyNode) {
                                 if ($onlyNode === $child) {
-                                    $matched = TRUE;
+                                    $matched = true;
                                 }
                             }
 
                             if (!$matched) {
-                                break(2);
+                                break 2;
                             }
                         }
                     }
@@ -831,8 +878,7 @@ public static function findNodes(DOMDocument $dom, array $options, $isHtml = TRU
                 }
             }
 
-            $nodes    = $filtered;
-            $filtered = array();
+            $nodes = $filtered;
 
             if (empty($nodes)) {
                 return;
diff --git a/core/vendor/phpunit/phpunit/Tests/Extensions/RepeatedTestTest.php b/core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/Tests/Extensions/RepeatedTestTest.php
rename to core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php
index 2646f3dd2c4d07b1862156af530a5cd87b9bd17a..e934e9ba347a523912d968ec7f086935782f31d9 100644
--- a/core/vendor/phpunit/phpunit/Tests/Extensions/RepeatedTestTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Extensions/RepeatedTestTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,23 +36,22 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
  */
 
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Success.php';
-
 /**
  *
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Extensions_RepeatedTest
  */
 class Extensions_RepeatedTestTest extends PHPUnit_Framework_TestCase
 {
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/AssertTest.php b/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
similarity index 74%
rename from core/vendor/phpunit/phpunit/Tests/Framework/AssertTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
index a85818edf45d1a9483e35b9b9f50f3ab9b1100e4..1736520861a4e24227968c4eddc9cdda339c57ab 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/AssertTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/AssertTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,42 +37,30 @@
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
  */
 
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ClassWithNonPublicAttributes.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'SampleClass.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Struct.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'TestIterator.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Author.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Book.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ClassWithToString.php';
-
 /**
  *
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
  */
 class Framework_AssertTest extends PHPUnit_Framework_TestCase
 {
-    protected $filesDirectory;
+    private $filesDirectory;
 
     protected function setUp()
     {
         $this->filesDirectory = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR;
-
-        $this->html = file_get_contents(
-            $this->filesDirectory . 'SelectorAssertionsFixture.html'
-        );
     }
 
     /**
@@ -152,6 +140,25 @@ public function testAssertArrayContainsString()
 
         $this->fail();
     }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertContains
+     */
+    public function testAssertArrayContainsNonObject()
+    {
+        $this->assertContains('foo', array(true));
+
+        try {
+            $this->assertContains('foo', array(true), '', false, true, true);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
     /**
      * @covers PHPUnit_Framework_Assert::assertContainsOnlyInstancesOf
      */
@@ -179,9 +186,18 @@ public function testAssertContainsOnlyInstancesOf()
      * @covers            PHPUnit_Framework_Assert::assertArrayHasKey
      * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertArrayHasKeyThrowsException()
+    public function testAssertArrayHasKeyThrowsExceptionForInvalidFirstArgument()
+    {
+        $this->assertArrayHasKey(null, array());
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertArrayHasKey
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertArrayHasKeyThrowsExceptionForInvalidSecondArgument()
     {
-        $this->assertArrayHasKey(NULL, array());
+        $this->assertArrayHasKey(0, null);
     }
 
     /**
@@ -206,9 +222,18 @@ public function testAssertArrayHasIntegerKey()
      * @covers            PHPUnit_Framework_Assert::assertArrayNotHasKey
      * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertArrayNotHasKeyThrowsException()
+    public function testAssertArrayNotHasKeyThrowsExceptionForInvalidFirstArgument()
+    {
+        $this->assertArrayNotHasKey(null, array());
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertArrayNotHasKey
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertArrayNotHasKeyThrowsExceptionForInvalidSecondArgument()
     {
-        $this->assertArrayNotHasKey(NULL, array());
+        $this->assertArrayNotHasKey(0, null);
     }
 
     /**
@@ -268,7 +293,7 @@ public function testAssertArrayNotHasStringKey()
     /**
      * @covers PHPUnit_Framework_Assert::assertArrayHasKey
      */
-    public function testAssertArrayHasKeyAcceptsArrayAccessValue()
+    public function testAssertArrayHasKeyAcceptsArrayObjectValue()
     {
         $array = new ArrayObject();
         $array['foo'] = 'bar';
@@ -279,13 +304,34 @@ public function testAssertArrayHasKeyAcceptsArrayAccessValue()
      * @covers PHPUnit_Framework_Assert::assertArrayHasKey
      * @expectedException PHPUnit_Framework_AssertionFailedError
      */
-    public function testAssertArrayHasKeyProperlyFailsWithArrayAccessValue()
+    public function testAssertArrayHasKeyProperlyFailsWithArrayObjectValue()
     {
         $array = new ArrayObject();
         $array['bar'] = 'bar';
         $this->assertArrayHasKey('foo', $array);
     }
 
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayHasKey
+     */
+    public function testAssertArrayHasKeyAcceptsArrayAccessValue()
+    {
+        $array = new SampleArrayAccess();
+        $array['foo'] = 'bar';
+        $this->assertArrayHasKey('foo', $array);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertArrayHasKey
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertArrayHasKeyProperlyFailsWithArrayAccessValue()
+    {
+        $array = new SampleArrayAccess();
+        $array['bar'] = 'bar';
+        $this->assertArrayHasKey('foo', $array);
+    }
+
     /**
      * @covers PHPUnit_Framework_Assert::assertArrayNotHasKey
      */
@@ -313,7 +359,7 @@ public function testAssertArrayNotHasKeyPropertlyFailsWithArrayAccessValue()
      */
     public function testAssertContainsThrowsException()
     {
-        $this->assertContains(NULL, NULL);
+        $this->assertContains(null, null);
     }
 
     /**
@@ -378,7 +424,7 @@ public function testAssertStringContainsString()
      */
     public function testAssertNotContainsThrowsException()
     {
-        $this->assertNotContains(NULL, NULL);
+        $this->assertNotContains(null, null);
     }
 
     /**
@@ -443,6 +489,24 @@ public function testAssertArrayNotContainsString()
         $this->fail();
     }
 
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotContains
+     */
+    public function testAssertArrayNotContainsNonObject()
+    {
+        $this->assertNotContains('foo', array(true), '', false, true, true);
+
+        try {
+            $this->assertNotContains('foo', array(true));
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
     /**
      * @covers PHPUnit_Framework_Assert::assertNotContains
      */
@@ -467,7 +531,16 @@ public function testAssertStringNotContainsString()
      */
     public function testAssertContainsOnlyThrowsException()
     {
-        $this->assertContainsOnly(NULL, NULL);
+        $this->assertContainsOnly(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertNotContainsOnly
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotContainsOnlyThrowsException()
+    {
+        $this->assertNotContainsOnly(null, null);
     }
 
     /**
@@ -476,7 +549,7 @@ public function testAssertContainsOnlyThrowsException()
      */
     public function testAssertContainsOnlyInstancesOfThrowsException()
     {
-        $this->assertContainsOnlyInstancesOf(NULL, NULL);
+        $this->assertContainsOnlyInstancesOf(null, null);
     }
 
     /**
@@ -554,7 +627,7 @@ public function testAssertArrayNotContainsOnlyStdClass()
     protected function createDOMDocument($content)
     {
         $document = new DOMDocument;
-        $document->preserveWhiteSpace = FALSE;
+        $document->preserveWhiteSpace = false;
         $document->loadXML($content);
 
         return $document;
@@ -569,8 +642,8 @@ protected function sameValues()
         $resource = fopen($file, 'r');
 
         return array(
-            // NULL
-            array(NULL, NULL),
+            // null
+            array(null, null),
             // strings
             array('a', 'a'),
             // integers
@@ -582,7 +655,7 @@ protected function sameValues()
             // arrays
             array(array(), array()),
             array(array(0 => 1), array(0 => 1)),
-            array(array(0 => NULL), array(0 => NULL)),
+            array(array(0 => null), array(0 => null)),
             array(array('a', 'b' => array(1, 2)), array('a', 'b' => array(1, 2))),
             // objects
             array($object, $object),
@@ -622,6 +695,8 @@ protected function notEqualValues()
             // strings
             array('a', 'b'),
             array('a', 'A'),
+            // https://github.com/sebastianbergmann/phpunit/issues/1023
+            array('9E6666666','9E7777777'),
             // integers
             array(1, 2),
             array(2, 1),
@@ -637,7 +712,7 @@ protected function notEqualValues()
             // arrays
             array(array(), array(0 => 1)),
             array(array(0 => 1), array()),
-            array(array(0 => NULL), array()),
+            array(array(0 => null), array()),
             array(array(0 => 1, 1 => 2), array(0 => 1, 1 => 3)),
             array(array('a', 'b' => array(1, 2)), array('a', 'b' => array(2, 1))),
             // objects
@@ -670,16 +745,60 @@ protected function notEqualValues()
                 $this->createDOMDocument('<foo> bar </foo>'),
                 $this->createDOMDocument('<foo> bir </foo>'),
             ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York')),
+                3500
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 05:13:35', new DateTimeZone('America/New_York')),
+                3500
+            ),
+            array(
+                new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            ),
+            array(
+                new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+                43200
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+                3500
+            ),
+            array(
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-30', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-29T05:13:35-0600'),
+                new DateTime('2013-03-29T04:13:35-0600'),
+            ),
+            array(
+                new DateTime('2013-03-29T05:13:35-0600'),
+                new DateTime('2013-03-29T05:13:35-0500'),
+            ),
             // Exception
             //array(new Exception('Exception 1'), new Exception('Exception 2')),
             // different types
-            array(new SampleClass(4, 8, 15), FALSE),
-            array(FALSE, new SampleClass(4, 8, 15)),
-            array(array(0 => 1, 1 => 2), FALSE),
-            array(FALSE, array(0 => 1, 1 => 2)),
+            array(new SampleClass(4, 8, 15), false),
+            array(false, new SampleClass(4, 8, 15)),
+            array(array(0 => 1, 1 => 2), false),
+            array(false, array(0 => 1, 1 => 2)),
             array(array(), new stdClass),
             array(new stdClass, array()),
-            // PHP: 0 == 'Foobar' => TRUE!
+            // PHP: 0 == 'Foobar' => true!
             // We want these values to differ
             array(0, 'Foobar'),
             array('Foobar', 0),
@@ -707,11 +826,11 @@ protected function equalValues()
 
         return array(
             // strings
-            array('a', 'A', 0, FALSE, TRUE), // ignore case
+            array('a', 'A', 0, false, true), // ignore case
             // arrays
             array(array('a' => 1, 'b' => 2), array('b' => 2, 'a' => 1)),
             array(array(1), array('1')),
-            array(array(3, 2, 1), array(2, 3, 1), 0, TRUE), // canonicalized comparison
+            array(array(3, 2, 1), array(2, 3, 1), 0, true), // canonicalized comparison
             // floats
             array(2.3, 2.5, 0.5),
             array(array(2.3), array(2.5), 0.5),
@@ -742,6 +861,50 @@ protected function equalValues()
                 $this->createDOMDocument("<root>\n  <child/>\n</root>"),
                 $this->createDOMDocument('<root><child/></root>'),
             ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:13:25', new DateTimeZone('America/New_York')),
+                10
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 04:14:40', new DateTimeZone('America/New_York')),
+                65
+            ),
+            array(
+                new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 03:13:49', new DateTimeZone('America/Chicago')),
+                15
+            ),
+            array(
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+                new DateTime('2013-03-29 23:01:30', new DateTimeZone('America/Chicago')),
+                100
+            ),
+            array(
+                new DateTime('@1364616000'),
+                new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago')),
+            ),
+            array(
+                new DateTime('2013-03-29T05:13:35-0500'),
+                new DateTime('2013-03-29T04:13:35-0600'),
+            ),
             // Exception
             //array(new Exception('Exception 1'), new Exception('Exception 1')),
             // mixed types
@@ -783,7 +946,7 @@ public function notSameProvider()
      * @covers PHPUnit_Framework_Assert::assertEquals
      * @dataProvider equalProvider
      */
-    public function testAssertEqualsSucceeds($a, $b, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function testAssertEqualsSucceeds($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         $this->assertEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
     }
@@ -792,7 +955,7 @@ public function testAssertEqualsSucceeds($a, $b, $delta = 0, $canonicalize = FAL
      * @covers PHPUnit_Framework_Assert::assertEquals
      * @dataProvider notEqualProvider
      */
-    public function testAssertEqualsFails($a, $b, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function testAssertEqualsFails($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         try {
             $this->assertEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
@@ -809,7 +972,7 @@ public function testAssertEqualsFails($a, $b, $delta = 0, $canonicalize = FALSE,
      * @covers PHPUnit_Framework_Assert::assertNotEquals
      * @dataProvider notEqualProvider
      */
-    public function testAssertNotEqualsSucceeds($a, $b, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function testAssertNotEqualsSucceeds($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         $this->assertNotEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
     }
@@ -818,7 +981,7 @@ public function testAssertNotEqualsSucceeds($a, $b, $delta = 0, $canonicalize =
      * @covers PHPUnit_Framework_Assert::assertNotEquals
      * @dataProvider equalProvider
      */
-    public function testAssertNotEqualsFails($a, $b, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function testAssertNotEqualsFails($a, $b, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         try {
             $this->assertNotEquals($a, $b, '', $delta, 10, $canonicalize, $ignoreCase);
@@ -1027,7 +1190,7 @@ public function testXMLStructureIsSame()
         $actual->load($this->filesDirectory . 'structureExpected.xml');
 
         $this->assertEqualXMLStructure(
-          $expected->firstChild, $actual->firstChild, TRUE
+          $expected->firstChild, $actual->firstChild, true
         );
     }
 
@@ -1044,7 +1207,7 @@ public function testXMLStructureWrongNumberOfAttributes()
         $actual->load($this->filesDirectory . 'structureWrongNumberOfAttributes.xml');
 
         $this->assertEqualXMLStructure(
-          $expected->firstChild, $actual->firstChild, TRUE
+          $expected->firstChild, $actual->firstChild, true
         );
     }
 
@@ -1061,7 +1224,7 @@ public function testXMLStructureWrongNumberOfNodes()
         $actual->load($this->filesDirectory . 'structureWrongNumberOfNodes.xml');
 
         $this->assertEqualXMLStructure(
-          $expected->firstChild, $actual->firstChild, TRUE
+          $expected->firstChild, $actual->firstChild, true
         );
     }
 
@@ -1077,7 +1240,7 @@ public function testXMLStructureIsSameButDataIsNot()
         $actual->load($this->filesDirectory . 'structureIsSameButDataIsNot.xml');
 
         $this->assertEqualXMLStructure(
-          $expected->firstChild, $actual->firstChild, TRUE
+          $expected->firstChild, $actual->firstChild, true
         );
     }
 
@@ -1093,7 +1256,7 @@ public function testXMLStructureAttributesAreSameButValuesAreNot()
         $actual->load($this->filesDirectory . 'structureAttributesAreSameButValuesAreNot.xml');
 
         $this->assertEqualXMLStructure(
-          $expected->firstChild, $actual->firstChild, TRUE
+          $expected->firstChild, $actual->firstChild, true
         );
     }
 
@@ -1109,7 +1272,7 @@ public function testXMLStructureIgnoreTextNodes()
         $actual->load($this->filesDirectory . 'structureIgnoreTextNodes.xml');
 
         $this->assertEqualXMLStructure(
-          $expected->firstChild, $actual->firstChild, TRUE
+          $expected->firstChild, $actual->firstChild, true
         );
     }
 
@@ -1145,7 +1308,7 @@ public function testAssertStringEqualsNumeric2()
      */
     public function testAssertFileExistsThrowsException()
     {
-        $this->assertFileExists(NULL);
+        $this->assertFileExists(null);
     }
 
     /**
@@ -1172,7 +1335,7 @@ public function testAssertFileExists()
      */
     public function testAssertFileNotExistsThrowsException()
     {
-        $this->assertFileNotExists(NULL);
+        $this->assertFileNotExists(null);
     }
 
     /**
@@ -1238,7 +1401,7 @@ public function testAssertObjectNotHasAttribute()
      */
     public function testAssertNull()
     {
-        $this->assertNull(NULL);
+        $this->assertNull(null);
 
         try {
             $this->assertNull(new stdClass);
@@ -1259,7 +1422,7 @@ public function testAssertNotNull()
         $this->assertNotNull(new stdClass);
 
         try {
-            $this->assertNotNull(NULL);
+            $this->assertNotNull(null);
         }
 
         catch (PHPUnit_Framework_AssertionFailedError $e) {
@@ -1274,10 +1437,30 @@ public function testAssertNotNull()
      */
     public function testAssertTrue()
     {
-        $this->assertTrue(TRUE);
+        $this->assertTrue(true);
+
+        try {
+            $this->assertTrue(false);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotTrue
+     */
+    public function testAssertNotTrue()
+    {
+        $this->assertNotTrue(false);
+        $this->assertNotTrue(1);
+        $this->assertNotTrue("true");
 
         try {
-            $this->assertTrue(FALSE);
+            $this->assertNotTrue(true);
         }
 
         catch (PHPUnit_Framework_AssertionFailedError $e) {
@@ -1292,10 +1475,30 @@ public function testAssertTrue()
      */
     public function testAssertFalse()
     {
-        $this->assertFalse(FALSE);
+        $this->assertFalse(false);
+
+        try {
+            $this->assertFalse(true);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotFalse
+     */
+    public function testAssertNotFalse()
+    {
+        $this->assertNotFalse(true);
+        $this->assertNotFalse(0);
+        $this->assertNotFalse("");
 
         try {
-            $this->assertFalse(TRUE);
+            $this->assertNotFalse(false);
         }
 
         catch (PHPUnit_Framework_AssertionFailedError $e) {
@@ -1311,7 +1514,7 @@ public function testAssertFalse()
      */
     public function testAssertRegExpThrowsException()
     {
-        $this->assertRegExp(NULL, NULL);
+        $this->assertRegExp(null, null);
     }
 
     /**
@@ -1320,7 +1523,7 @@ public function testAssertRegExpThrowsException()
      */
     public function testAssertRegExpThrowsException2()
     {
-        $this->assertRegExp('', NULL);
+        $this->assertRegExp('', null);
     }
 
     /**
@@ -1329,7 +1532,7 @@ public function testAssertRegExpThrowsException2()
      */
     public function testAssertNotRegExpThrowsException()
     {
-        $this->assertNotRegExp(NULL, NULL);
+        $this->assertNotRegExp(null, null);
     }
 
     /**
@@ -1338,7 +1541,7 @@ public function testAssertNotRegExpThrowsException()
      */
     public function testAssertNotRegExpThrowsException2()
     {
-        $this->assertNotRegExp('', NULL);
+        $this->assertNotRegExp('', null);
     }
 
     /**
@@ -1405,11 +1608,11 @@ public function testAssertSame()
      */
     public function testAssertSame2()
     {
-        $this->assertSame(TRUE, TRUE);
-        $this->assertSame(FALSE, FALSE);
+        $this->assertSame(true, true);
+        $this->assertSame(false, false);
 
         try {
-            $this->assertSame(TRUE, FALSE);
+            $this->assertSame(true, false);
         }
 
         catch (PHPUnit_Framework_AssertionFailedError $e) {
@@ -1426,11 +1629,11 @@ public function testAssertNotSame()
     {
         $this->assertNotSame(
           new stdClass,
-          NULL
+          null
         );
 
         $this->assertNotSame(
-          NULL,
+          null,
           new stdClass
         );
 
@@ -1457,11 +1660,11 @@ public function testAssertNotSame()
      */
     public function testAssertNotSame2()
     {
-        $this->assertNotSame(TRUE, FALSE);
-        $this->assertNotSame(FALSE, TRUE);
+        $this->assertNotSame(true, false);
+        $this->assertNotSame(false, true);
 
         try {
-            $this->assertNotSame(TRUE, TRUE);
+            $this->assertNotSame(true, true);
         }
 
         catch (PHPUnit_Framework_AssertionFailedError $e) {
@@ -1477,7 +1680,7 @@ public function testAssertNotSame2()
     public function testAssertNotSameFailsNull()
     {
         try {
-            $this->assertNotSame(NULL, NULL);
+            $this->assertNotSame(null, null);
         }
 
         catch (PHPUnit_Framework_AssertionFailedError $e) {
@@ -1649,6 +1852,8 @@ public function testAttributeLessThanOrEqual()
 
     /**
      * @covers PHPUnit_Framework_Assert::readAttribute
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
      */
     public function testReadAttribute()
     {
@@ -1663,6 +1868,8 @@ public function testReadAttribute()
 
     /**
      * @covers PHPUnit_Framework_Assert::readAttribute
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
      */
     public function testReadAttribute2()
     {
@@ -1675,15 +1882,19 @@ public function testReadAttribute2()
 
     /**
      * @covers            PHPUnit_Framework_Assert::readAttribute
+     * @covers            PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::getObjectAttribute
      * @expectedException PHPUnit_Framework_Exception
      */
     public function testReadAttribute3()
     {
-        $this->readAttribute('StdClass', NULL);
+        $this->readAttribute('StdClass', null);
     }
 
     /**
      * @covers            PHPUnit_Framework_Assert::readAttribute
+     * @covers            PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::getObjectAttribute
      * @expectedException PHPUnit_Framework_Exception
      */
     public function testReadAttribute4()
@@ -1693,11 +1904,116 @@ public function testReadAttribute4()
 
     /**
      * @covers            PHPUnit_Framework_Assert::readAttribute
+     * @covers            PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::getObjectAttribute
      * @expectedException PHPUnit_Framework_Exception
      */
     public function testReadAttribute5()
     {
-        $this->readAttribute(NULL, 'foo');
+        $this->readAttribute(null, 'foo');
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::readAttribute
+     * @covers            PHPUnit_Framework_Assert::getStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testReadAttributeIfAttributeNameIsNotValid()
+    {
+        $this->readAttribute('StdClass', '2');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidFirstArgument()
+    {
+        $this->getStaticAttribute(null, 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidFirstArgument2()
+    {
+        $this->getStaticAttribute('NotExistingClass', 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidSecondArgument()
+    {
+        $this->getStaticAttribute('stdClass', null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidSecondArgument2()
+    {
+        $this->getStaticAttribute('stdClass', '0');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetStaticAttributeRaisesExceptionForInvalidSecondArgument3()
+    {
+        $this->getStaticAttribute('stdClass', 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetObjectAttributeRaisesExceptionForInvalidFirstArgument()
+    {
+        $this->getObjectAttribute(null, 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetObjectAttributeRaisesExceptionForInvalidSecondArgument()
+    {
+        $this->getObjectAttribute(new stdClass, null);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetObjectAttributeRaisesExceptionForInvalidSecondArgument2()
+    {
+        $this->getObjectAttribute(new stdClass, '0');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testGetObjectAttributeRaisesExceptionForInvalidSecondArgument3()
+    {
+        $this->getObjectAttribute(new stdClass, 'foo');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::getObjectAttribute
+     */
+    public function testGetObjectAttributeWorksForInheritedAttributes()
+    {
+        $this->assertEquals(
+          'bar',
+          $this->getObjectAttribute(new ClassWithNonPublicAttributes, 'privateParentAttribute')
+        );
     }
 
     /**
@@ -1860,6 +2176,46 @@ public function testAssertPrivateAttributeNotContains()
         $this->fail();
     }
 
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeContains
+     */
+    public function testAssertAttributeContainsNonObject()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeContains(true, 'privateArray', $obj);
+
+        try {
+            $this->assertAttributeContains(true, 'privateArray', $obj, '', false, true, true);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotContains
+     */
+    public function testAssertAttributeNotContainsNonObject()
+    {
+        $obj = new ClassWithNonPublicAttributes;
+
+        $this->assertAttributeNotContains(true, 'privateArray', $obj, '', false, true, true);
+
+        try {
+            $this->assertAttributeNotContains(true, 'privateArray', $obj);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
     /**
      * @covers PHPUnit_Framework_Assert::assertAttributeEquals
      */
@@ -2134,7 +2490,7 @@ public function testAssertPrivateStaticAttributeNotEquals()
      */
     public function testAssertClassHasAttributeThrowsException()
     {
-        $this->assertClassHasAttribute(NULL, NULL);
+        $this->assertClassHasAttribute(null, null);
     }
 
     /**
@@ -2143,7 +2499,16 @@ public function testAssertClassHasAttributeThrowsException()
      */
     public function testAssertClassHasAttributeThrowsException2()
     {
-        $this->assertClassHasAttribute('foo', NULL);
+        $this->assertClassHasAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertClassHasAttribute('1', 'ClassWithNonPublicAttributes');
     }
 
     /**
@@ -2152,7 +2517,7 @@ public function testAssertClassHasAttributeThrowsException2()
      */
     public function testAssertClassNotHasAttributeThrowsException()
     {
-        $this->assertClassNotHasAttribute(NULL, NULL);
+        $this->assertClassNotHasAttribute(null, null);
     }
 
     /**
@@ -2161,25 +2526,43 @@ public function testAssertClassNotHasAttributeThrowsException()
      */
     public function testAssertClassNotHasAttributeThrowsException2()
     {
-        $this->assertClassNotHasAttribute('foo', NULL);
+        $this->assertClassNotHasAttribute('foo', null);
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertClassHasStaticAttribute
+     * @covers            PHPUnit_Framework_Assert::assertClassNotHasAttribute
      * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertClassHasStaticAttributeThrowsException()
+    public function testAssertClassNotHasAttributeThrowsExceptionIfAttributeNameIsNotValid()
     {
-        $this->assertClassHasStaticAttribute(NULL, NULL);
+        $this->assertClassNotHasAttribute('1', 'ClassWithNonPublicAttributes');
     }
 
     /**
      * @covers            PHPUnit_Framework_Assert::assertClassHasStaticAttribute
      * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertClassHasStaticAttributeThrowsException2()
+    public function testAssertClassHasStaticAttributeThrowsException()
     {
-        $this->assertClassHasStaticAttribute('foo', NULL);
+        $this->assertClassHasStaticAttribute(null, null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasStaticAttributeThrowsException2()
+    {
+        $this->assertClassHasStaticAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassHasStaticAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertClassHasStaticAttribute('1', 'ClassWithNonPublicAttributes');
     }
 
     /**
@@ -2188,7 +2571,7 @@ public function testAssertClassHasStaticAttributeThrowsException2()
      */
     public function testAssertClassNotHasStaticAttributeThrowsException()
     {
-        $this->assertClassNotHasStaticAttribute(NULL, NULL);
+        $this->assertClassNotHasStaticAttribute(null, null);
     }
 
     /**
@@ -2197,7 +2580,16 @@ public function testAssertClassNotHasStaticAttributeThrowsException()
      */
     public function testAssertClassNotHasStaticAttributeThrowsException2()
     {
-        $this->assertClassNotHasStaticAttribute('foo', NULL);
+        $this->assertClassNotHasStaticAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertClassNotHasStaticAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertClassNotHasStaticAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertClassNotHasStaticAttribute('1', 'ClassWithNonPublicAttributes');
     }
 
     /**
@@ -2206,7 +2598,7 @@ public function testAssertClassNotHasStaticAttributeThrowsException2()
      */
     public function testAssertObjectHasAttributeThrowsException()
     {
-        $this->assertObjectHasAttribute(NULL, NULL);
+        $this->assertObjectHasAttribute(null, null);
     }
 
     /**
@@ -2215,7 +2607,16 @@ public function testAssertObjectHasAttributeThrowsException()
      */
     public function testAssertObjectHasAttributeThrowsException2()
     {
-        $this->assertObjectHasAttribute('foo', NULL);
+        $this->assertObjectHasAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertObjectHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertObjectHasAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertObjectHasAttribute('1', 'ClassWithNonPublicAttributes');
     }
 
     /**
@@ -2224,7 +2625,7 @@ public function testAssertObjectHasAttributeThrowsException2()
      */
     public function testAssertObjectNotHasAttributeThrowsException()
     {
-        $this->assertObjectNotHasAttribute(NULL, NULL);
+        $this->assertObjectNotHasAttribute(null, null);
     }
 
     /**
@@ -2233,7 +2634,16 @@ public function testAssertObjectNotHasAttributeThrowsException()
      */
     public function testAssertObjectNotHasAttributeThrowsException2()
     {
-        $this->assertObjectNotHasAttribute('foo', NULL);
+        $this->assertObjectNotHasAttribute('foo', null);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertObjectNotHasAttribute
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertObjectNotHasAttributeThrowsExceptionIfAttributeNameIsNotValid()
+    {
+        $this->assertObjectNotHasAttribute('1', 'ClassWithNonPublicAttributes');
     }
 
     /**
@@ -2691,6 +3101,15 @@ public function testAssertThatIsType()
         $this->assertThat('string', $this->isType('string'));
     }
 
+    /**
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::isEmpty
+     */
+    public function testAssertThatIsEmpty()
+    {
+        $this->assertThat(array(), $this->isEmpty());
+    }
+
     /**
      * @covers PHPUnit_Framework_Assert::assertThat
      * @covers PHPUnit_Framework_Assert::fileExists
@@ -2746,1122 +3165,336 @@ public function testAssertThatMatchesRegularExpression()
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::callback
      */
-    public function testAssertTagTypeTrue()
+    public function testAssertThatCallback()
     {
-        $matcher = array('tag' => 'html');
-        $this->assertTag($matcher, $this->html);
+        $this->assertThat(null, $this->callback(function ($other) { return true; }));
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers PHPUnit_Framework_Assert::assertThat
+     * @covers PHPUnit_Framework_Assert::countOf
      */
-    public function testAssertTagTypeFalse()
+    public function testAssertThatCountOf()
     {
-        $matcher = array('tag' => 'code');
-        $this->assertTag($matcher, $this->html);
+        $this->assertThat(array(1), $this->countOf(1));
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertFileEquals
      */
-    public function testAssertTagIdTrue()
+    public function testAssertFileEquals()
     {
-        $matcher = array('id' => 'test_text');
-        $this->assertTag($matcher, $this->html);
-    }
+        $this->assertFileEquals(
+          $this->filesDirectory . 'foo.xml',
+          $this->filesDirectory . 'foo.xml'
+        );
 
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertTagIdFalse()
-    {
-        $matcher = array('id' => 'test_text_doesnt_exist');
-        $this->assertTag($matcher, $this->html);
-    }
+        try {
+            $this->assertFileEquals(
+              $this->filesDirectory . 'foo.xml',
+              $this->filesDirectory . 'bar.xml'
+            );
+        }
 
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagStringContentTrue()
-    {
-        $matcher = array('id' => 'test_text',
-                         'content' => 'My test tag content');
-        $this->assertTag($matcher, $this->html);
-    }
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
 
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertTagStringContentFalse()
-    {
-        $matcher = array('id' => 'test_text',
-                         'content' => 'My non existent tag content');
-        $this->assertTag($matcher, $this->html);
+        $this->fail();
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertFileNotEquals
      */
-    public function testAssertTagRegexpContentTrue()
+    public function testAssertFileNotEquals()
     {
-        $matcher = array('id' => 'test_text',
-                         'content' => 'regexp:/test tag/');
-        $this->assertTag($matcher, $this->html);
-    }
+        $this->assertFileNotEquals(
+          $this->filesDirectory . 'foo.xml',
+          $this->filesDirectory . 'bar.xml'
+        );
 
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagRegexpModifierContentTrue()
-    {
-        $matcher = array('id' => 'test_text',
-                         'content' => 'regexp:/TEST TAG/i');
-        $this->assertTag($matcher, $this->html);
-    }
+        try {
+            $this->assertFileNotEquals(
+              $this->filesDirectory . 'foo.xml',
+              $this->filesDirectory . 'foo.xml'
+            );
+        }
 
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertTagRegexpContentFalse()
-    {
-        $matcher = array('id' => 'test_text',
-                         'content' => 'regexp:/asdf/');
-        $this->assertTag($matcher, $this->html);
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertStringEqualsFile
      */
-    public function testAssertTagCdataContentTrue()
+    public function testAssertStringEqualsFile()
     {
-        $matcher = array('tag' => 'script',
-                         'content' => 'alert(\'Hello, world!\');');
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringEqualsFile(
+          $this->filesDirectory . 'foo.xml',
+          file_get_contents($this->filesDirectory . 'foo.xml')
+        );
+
+        try {
+            $this->assertStringEqualsFile(
+              $this->filesDirectory . 'foo.xml',
+              file_get_contents($this->filesDirectory . 'bar.xml')
+            );
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers PHPUnit_Framework_Assert::assertStringNotEqualsFile
      */
-    public function testAssertTagCdataontentFalse()
+    public function testAssertStringNotEqualsFile()
     {
-        $matcher = array('tag' => 'script',
-                         'content' => 'asdf');
-        $this->assertTag($matcher, $this->html);
-    }
+        $this->assertStringNotEqualsFile(
+          $this->filesDirectory . 'foo.xml',
+          file_get_contents($this->filesDirectory . 'bar.xml')
+        );
 
+        try {
+            $this->assertStringNotEqualsFile(
+              $this->filesDirectory . 'foo.xml',
+              file_get_contents($this->filesDirectory . 'foo.xml')
+            );
+        }
 
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
 
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagAttributesTrueA()
-    {
-        $matcher = array('tag' => 'span',
-                         'attributes' => array('class' => 'test_class'));
-        $this->assertTag($matcher, $this->html);
+        $this->fail();
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers            PHPUnit_Framework_Assert::assertStringStartsWith
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagAttributesTrueB()
+    public function testAssertStringStartsWithThrowsException()
     {
-        $matcher = array('tag' => 'div',
-                         'attributes' => array('id' => 'test_child_id'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringStartsWith(null, null);
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers            PHPUnit_Framework_Assert::assertStringStartsWith
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagAttributesFalse()
+    public function testAssertStringStartsWithThrowsException2()
     {
-        $matcher = array('tag' => 'span',
-                         'attributes' => array('class' => 'test_missing_class'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringStartsWith('', null);
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers            PHPUnit_Framework_Assert::assertStringStartsNotWith
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagAttributesRegexpTrueA()
+    public function testAssertStringStartsNotWithThrowsException()
     {
-        $matcher = array('tag' => 'span',
-                         'attributes' => array('class' => 'regexp:/.+_class/'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringStartsNotWith(null, null);
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers            PHPUnit_Framework_Assert::assertStringStartsNotWith
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagAttributesRegexpTrueB()
+    public function testAssertStringStartsNotWithThrowsException2()
     {
-        $matcher = array('tag' => 'div',
-                         'attributes' => array('id' => 'regexp:/.+_child_.+/'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringStartsNotWith('', null);
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers            PHPUnit_Framework_Assert::assertStringEndsWith
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagAttributesRegexpModifierTrue()
+    public function testAssertStringEndsWithThrowsException()
     {
-        $matcher = array('tag' => 'div',
-                         'attributes' => array('id' => 'regexp:/.+_CHILD_.+/i'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringEndsWith(null, null);
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers            PHPUnit_Framework_Assert::assertStringEndsWith
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagAttributesRegexpModifierFalse()
+    public function testAssertStringEndsWithThrowsException2()
     {
-        $matcher = array('tag' => 'div',
-                         'attributes' => array('id' => 'regexp:/.+_CHILD_.+/'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringEndsWith('', null);
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers            PHPUnit_Framework_Assert::assertStringEndsNotWith
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagAttributesRegexpFalse()
+    public function testAssertStringEndsNotWithThrowsException()
     {
-        $matcher = array('tag' => 'span',
-                         'attributes' => array('class' => 'regexp:/.+_missing_.+/'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringEndsNotWith(null, null);
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers            PHPUnit_Framework_Assert::assertStringEndsNotWith
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagAttributesMultiPartClassTrueA()
+    public function testAssertStringEndsNotWithThrowsException2()
     {
-        $matcher = array('tag' => 'div',
-                         'id'  => 'test_multi_class',
-                         'attributes' => array('class' => 'multi class'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringEndsNotWith('', null);
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertStringStartsWith
      */
-    public function testAssertTagAttributesMultiPartClassTrueB()
+    public function testAssertStringStartsWith()
     {
-        $matcher = array('tag' => 'div',
-                         'id'  => 'test_multi_class',
-                         'attributes' => array('class' => 'multi'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringStartsWith('prefix', 'prefixfoo');
+
+        try {
+            $this->assertStringStartsWith('prefix', 'foo');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers PHPUnit_Framework_Assert::assertStringStartsNotWith
      */
-    public function testAssertTagAttributesMultiPartClassFalse()
+    public function testAssertStringStartsNotWith()
     {
-        $matcher = array('tag' => 'div',
-                         'id'  => 'test_multi_class',
-                         'attributes' => array('class' => 'mul'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringStartsNotWith('prefix', 'foo');
+
+        try {
+            $this->assertStringStartsNotWith('prefix', 'prefixfoo');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertStringEndsWith
      */
-    public function testAssertTagParentTrue()
+    public function testAssertStringEndsWith()
     {
-        $matcher = array('tag' => 'head',
-                         'parent' => array('tag' => 'html'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringEndsWith('suffix', 'foosuffix');
+
+        try {
+            $this->assertStringEndsWith('suffix', 'foo');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers PHPUnit_Framework_Assert::assertStringEndsNotWith
      */
-    public function testAssertTagParentFalse()
+    public function testAssertStringEndsNotWith()
     {
-        $matcher = array('tag' => 'head',
-                         'parent' => array('tag' => 'div'));
-        $this->assertTag($matcher, $this->html);
-    }
+        $this->assertStringEndsNotWith('suffix', 'foo');
 
-    /**
-    * @covers PHPUnit_Framework_Assert::assertTag
-    */
-    public function testAssertTagMultiplePossibleChildren()
-    {
-        $matcher = array(
-            'tag' => 'li',
-            'parent' => array(
-                'tag' => 'ul',
-                'id' => 'another_ul'
-            )
-        );
-        $this->assertTag($matcher, $this->html);
+        try {
+            $this->assertStringEndsNotWith('suffix', 'foosuffix');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagChildTrue()
+    public function testAssertStringMatchesFormatRaisesExceptionForInvalidFirstArgument()
     {
-        $matcher = array('tag' => 'html',
-                         'child' => array('tag' => 'head'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringMatchesFormat(null, '');
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagChildFalse()
+    public function testAssertStringMatchesFormatRaisesExceptionForInvalidSecondArgument()
     {
-        $matcher = array('tag' => 'html',
-                         'child' => array('tag' => 'div'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringMatchesFormat('', null);
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
      */
-    public function testAssertTagAncestorTrue()
+    public function testAssertStringMatchesFormat()
     {
-        $matcher = array('tag' => 'div',
-                         'ancestor' => array('tag' => 'html'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringMatchesFormat('*%s*', '***');
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
      * @expectedException PHPUnit_Framework_AssertionFailedError
      */
-    public function testAssertTagAncestorFalse()
+    public function testAssertStringMatchesFormatFailure()
     {
-        $matcher = array('tag' => 'html',
-                         'ancestor' => array('tag' => 'div'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringMatchesFormat('*%s*', '**');
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertStringNotMatchesFormat
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagDescendantTrue()
+    public function testAssertStringNotMatchesFormatRaisesExceptionForInvalidFirstArgument()
     {
-        $matcher = array('tag' => 'html',
-                         'descendant' => array('tag' => 'div'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringNotMatchesFormat(null, '');
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
+     * @covers PHPUnit_Framework_Assert::assertStringNotMatchesFormat
+     * @expectedException PHPUnit_Framework_Exception
      */
-    public function testAssertTagDescendantFalse()
+    public function testAssertStringNotMatchesFormatRaisesExceptionForInvalidSecondArgument()
     {
-        $matcher = array('tag' => 'div',
-                         'descendant' => array('tag' => 'html'));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringNotMatchesFormat('', null);
     }
 
     /**
-     * @covers PHPUnit_Framework_Assert::assertTag
+     * @covers PHPUnit_Framework_Assert::assertStringNotMatchesFormat
      */
-    public function testAssertTagChildrenCountTrue()
+    public function testAssertStringNotMatchesFormat()
     {
-        $matcher = array('tag' => 'ul',
-                         'children' => array('count' => 3));
-        $this->assertTag($matcher, $this->html);
+        $this->assertStringNotMatchesFormat('*%s*', '**');
+
+        try {
+            $this->assertStringMatchesFormat('*%s*', '**');
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
     }
 
     /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertTagChildrenCountFalse()
-    {
-        $matcher = array('tag' => 'ul',
-                         'children' => array('count' => 5));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagChildrenLessThanTrue()
-    {
-        $matcher = array('tag' => 'ul',
-                         'children' => array('less_than' => 10));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertTagChildrenLessThanFalse()
-    {
-        $matcher = array('tag' => 'ul',
-                         'children' => array('less_than' => 2));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagChildrenGreaterThanTrue()
-    {
-        $matcher = array('tag' => 'ul',
-                         'children' => array('greater_than' => 2));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertTagChildrenGreaterThanFalse()
-    {
-        $matcher = array('tag' => 'ul',
-                         'children' => array('greater_than' => 10));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagChildrenOnlyTrue()
-    {
-        $matcher = array('tag' => 'ul',
-                         'children' => array('only' => array('tag' =>'li')));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertTagChildrenOnlyFalse()
-    {
-        $matcher = array('tag' => 'ul',
-                         'children' => array('only' => array('tag' =>'div')));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagTypeIdTrueA()
-    {
-        $matcher = array('tag' => 'ul', 'id' => 'my_ul');
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagTypeIdTrueB()
-    {
-        $matcher = array('id' => 'my_ul', 'tag' => 'ul');
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagTypeIdTrueC()
-    {
-        $matcher = array('tag' => 'input', 'id'  => 'input_test_id');
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertTagTypeIdFalse()
-    {
-        $matcher = array('tag' => 'div', 'id'  => 'my_ul');
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertTagContentAttributes()
-    {
-        $matcher = array('tag' => 'div',
-                         'content'    => 'Test Id Text',
-                         'attributes' => array('id' => 'test_id',
-                                               'class' => 'my_test_class'));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertParentContentAttributes()
-    {
-        $matcher = array('tag'        => 'div',
-                         'content'    => 'Test Id Text',
-                         'attributes' => array('id'    => 'test_id',
-                                               'class' => 'my_test_class'),
-                         'parent'     => array('tag' => 'body'));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertChildContentAttributes()
-    {
-        $matcher = array('tag'        => 'div',
-                         'content'    => 'Test Id Text',
-                         'attributes' => array('id'    => 'test_id',
-                                               'class' => 'my_test_class'),
-                         'child'      => array('tag'        => 'div',
-                                               'attributes' => array('id' => 'test_child_id')));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertChildSubChildren()
-    {
-        $matcher = array('id' => 'test_id',
-                         'child' => array('id' => 'test_child_id',
-                                          'child' => array('id' => 'test_subchild_id')));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertAncestorContentAttributes()
-    {
-        $matcher = array('id'         => 'test_subchild_id',
-                         'content'    => 'My Subchild',
-                         'attributes' => array('id' => 'test_subchild_id'),
-                         'ancestor'   => array('tag'        => 'div',
-                                               'attributes' => array('id' => 'test_id')));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertDescendantContentAttributes()
-    {
-        $matcher = array('id'         => 'test_id',
-                         'content'    => 'Test Id Text',
-                         'attributes' => array('id'  => 'test_id'),
-                         'descendant' => array('tag'        => 'span',
-                                               'attributes' => array('id' => 'test_subchild_id')));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertTag
-     */
-    public function testAssertChildrenContentAttributes()
-    {
-        $matcher = array('id'         => 'test_children',
-                         'content'    => 'My Children',
-                         'attributes' => array('class'  => 'children'),
-
-                         'children' => array('less_than'    => '25',
-                                             'greater_than' => '2',
-                                             'only'         => array('tag' => 'div',
-                                                                     'attributes' => array('class' => 'my_child'))
-                                            ));
-        $this->assertTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertNotTag
-     */
-    public function testAssertNotTagTypeIdFalse()
-    {
-        $matcher = array('tag' => 'div', 'id'  => 'my_ul');
-        $this->assertNotTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertNotTag
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertNotTagContentAttributes()
-    {
-        $matcher = array('tag' => 'div',
-                         'content'    => 'Test Id Text',
-                         'attributes' => array('id' => 'test_id',
-                                               'class' => 'my_test_class'));
-        $this->assertNotTag($matcher, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountPresentTrue()
-    {
-        $selector = 'div#test_id';
-        $count    = TRUE;
-
-        $this->assertSelectCount($selector, $count, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectCountPresentFalse()
-    {
-        $selector = 'div#non_existent';
-        $count    = TRUE;
-
-        $this->assertSelectCount($selector, $count, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountNotPresentTrue()
-    {
-        $selector = 'div#non_existent';
-        $count    = FALSE;
-
-        $this->assertSelectCount($selector, $count, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectNotPresentFalse()
-    {
-        $selector = 'div#test_id';
-        $count    = FALSE;
-
-        $this->assertSelectCount($selector, $count, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountChildTrue()
-    {
-        $selector = '#my_ul > li';
-        $count    = 3;
-
-        $this->assertSelectCount($selector, $count, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectCountChildFalse()
-    {
-        $selector = '#my_ul > li';
-        $count    = 4;
-
-        $this->assertSelectCount($selector, $count, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountDescendantTrue()
-    {
-        $selector = '#my_ul li';
-        $count    = 3;
-
-        $this->assertSelectCount($selector, $count, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectCountDescendantFalse()
-    {
-        $selector = '#my_ul li';
-        $count    = 4;
-
-        $this->assertSelectCount($selector, $count, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountGreaterThanTrue()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('>' => 2);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectCountGreaterThanFalse()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('>' => 3);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountGreaterThanEqualToTrue()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('>=' => 3);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectCountGreaterThanEqualToFalse()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('>=' => 4);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountLessThanTrue()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('<' => 4);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectCountLessThanFalse()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('<' => 3);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountLessThanEqualToTrue()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('<=' => 3);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectCountLessThanEqualToFalse()
-    {
-        $selector = '#my_ul > li';
-        $range  = array('<=' => 2);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectCount
-     */
-    public function testAssertSelectCountRangeTrue()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('>' => 2, '<' => 4);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectCount
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectCountRangeFalse()
-    {
-        $selector = '#my_ul > li';
-        $range    = array('>' => 1, '<' => 3);
-
-        $this->assertSelectCount($selector, $range, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectEquals
-     */
-    public function testAssertSelectEqualsContentPresentTrue()
-    {
-        $selector = 'span.test_class';
-        $content  = 'Test Class Text';
-
-        $this->assertSelectEquals($selector, $content, TRUE, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectEquals
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectEqualsContentPresentFalse()
-    {
-        $selector = 'span.test_class';
-        $content  = 'Test Nonexistent';
-
-        $this->assertSelectEquals($selector, $content, TRUE, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectEquals
-     */
-    public function testAssertSelectEqualsContentNotPresentTrue()
-    {
-        $selector = 'span.test_class';
-        $content  = 'Test Nonexistent';
-
-        $this->assertSelectEquals($selector, $content, FALSE, $this->html);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertSelectEquals
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertSelectEqualsContentNotPresentFalse()
-    {
-        $selector = 'span.test_class';
-        $content  = 'Test Class Text';
-
-        $this->assertSelectEquals($selector, $content, FALSE, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectRegExp
-     */
-    public function testAssertSelectRegExpContentPresentTrue()
-    {
-        $selector = 'span.test_class';
-        $regexp   = '/Test.*Text/';
-
-        $this->assertSelectRegExp($selector, $regexp, TRUE, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertSelectRegExp
-     */
-    public function testAssertSelectRegExpContentPresentFalse()
-    {
-        $selector = 'span.test_class';
-        $regexp   = '/Nonexistant/';
-
-        $this->assertSelectRegExp($selector, $regexp, FALSE, $this->html);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertFileEquals
-     */
-    public function testAssertFileEquals()
-    {
-        $this->assertFileEquals(
-          $this->filesDirectory . 'foo.xml',
-          $this->filesDirectory . 'foo.xml'
-        );
-
-        try {
-            $this->assertFileEquals(
-              $this->filesDirectory . 'foo.xml',
-              $this->filesDirectory . 'bar.xml'
-            );
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertFileNotEquals
-     */
-    public function testAssertFileNotEquals()
-    {
-        $this->assertFileNotEquals(
-          $this->filesDirectory . 'foo.xml',
-          $this->filesDirectory . 'bar.xml'
-        );
-
-        try {
-            $this->assertFileNotEquals(
-              $this->filesDirectory . 'foo.xml',
-              $this->filesDirectory . 'foo.xml'
-            );
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringEqualsFile
-     */
-    public function testAssertStringEqualsFile()
-    {
-        $this->assertStringEqualsFile(
-          $this->filesDirectory . 'foo.xml',
-          file_get_contents($this->filesDirectory . 'foo.xml')
-        );
-
-        try {
-            $this->assertStringEqualsFile(
-              $this->filesDirectory . 'foo.xml',
-              file_get_contents($this->filesDirectory . 'bar.xml')
-            );
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringNotEqualsFile
-     */
-    public function testAssertStringNotEqualsFile()
-    {
-        $this->assertStringNotEqualsFile(
-          $this->filesDirectory . 'foo.xml',
-          file_get_contents($this->filesDirectory . 'bar.xml')
-        );
-
-        try {
-            $this->assertStringNotEqualsFile(
-              $this->filesDirectory . 'foo.xml',
-              file_get_contents($this->filesDirectory . 'foo.xml')
-            );
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertStringStartsWith
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testAssertStringStartsWithThrowsException()
-    {
-        $this->assertStringStartsWith(NULL, NULL);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertStringStartsWith
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testAssertStringStartsWithThrowsException2()
-    {
-        $this->assertStringStartsWith('', NULL);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertStringStartsNotWith
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testAssertStringStartsNotWithThrowsException()
-    {
-        $this->assertStringStartsNotWith(NULL, NULL);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertStringStartsNotWith
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testAssertStringStartsNotWithThrowsException2()
-    {
-        $this->assertStringStartsNotWith('', NULL);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertStringEndsWith
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testAssertStringEndsWithThrowsException()
-    {
-        $this->assertStringEndsWith(NULL, NULL);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertStringEndsWith
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testAssertStringEndsWithThrowsException2()
-    {
-        $this->assertStringEndsWith('', NULL);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertStringEndsNotWith
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testAssertStringEndsNotWithThrowsException()
-    {
-        $this->assertStringEndsNotWith(NULL, NULL);
-    }
-
-    /**
-     * @covers            PHPUnit_Framework_Assert::assertStringEndsNotWith
-     * @expectedException PHPUnit_Framework_Exception
-     */
-    public function testAssertStringEndsNotWithThrowsException2()
-    {
-        $this->assertStringEndsNotWith('', NULL);
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringStartsWith
-     */
-    public function testAssertStringStartsWith()
-    {
-        $this->assertStringStartsWith('prefix', 'prefixfoo');
-
-        try {
-            $this->assertStringStartsWith('prefix', 'foo');
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringStartsNotWith
-     */
-    public function testAssertStringStartsNotWith()
-    {
-        $this->assertStringStartsNotWith('prefix', 'foo');
-
-        try {
-            $this->assertStringStartsNotWith('prefix', 'prefixfoo');
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringEndsWith
-     */
-    public function testAssertStringEndsWith()
-    {
-        $this->assertStringEndsWith('suffix', 'foosuffix');
-
-        try {
-            $this->assertStringEndsWith('suffix', 'foo');
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringEndsNotWith
-     */
-    public function testAssertStringEndsNotWith()
-    {
-        $this->assertStringEndsNotWith('suffix', 'foo');
-
-        try {
-            $this->assertStringEndsNotWith('suffix', 'foosuffix');
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
-     */
-    public function testAssertStringMatchesFormat()
-    {
-        $this->assertStringMatchesFormat('*%s*', '***');
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringMatchesFormat
-     * @expectedException PHPUnit_Framework_AssertionFailedError
-     */
-    public function testAssertStringMatchesFormatFailure()
-    {
-        $this->assertStringMatchesFormat('*%s*', '**');
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertStringNotMatchesFormat
-     */
-    public function testAssertStringNotMatchesFormat()
-    {
-        $this->assertStringNotMatchesFormat('*%s*', '**');
-
-        try {
-            $this->assertStringMatchesFormat('*%s*', '**');
-        }
-
-        catch (PHPUnit_Framework_AssertionFailedError $e) {
-            return;
-        }
-
-        $this->fail();
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Assert::assertEmpty
+     * @covers PHPUnit_Framework_Assert::assertEmpty
      */
     public function testAssertEmpty()
     {
@@ -3999,13 +3632,12 @@ public function testAssertCount()
      */
     public function testAssertCountThrowsExceptionIfExpectedCountIsNoInteger()
     {
-
         try {
             $this->assertCount('a', array());
         }
 
         catch (PHPUnit_Framework_Exception $e) {
-            $this->assertEquals('Argument #1 of PHPUnit_Framework_Assert::assertCount() must be a integer', $e->getMessage());
+            $this->assertEquals('Argument #1 (No Value) of PHPUnit_Framework_Assert::assertCount() must be a integer', $e->getMessage());
 
             return;
         }
@@ -4013,7 +3645,6 @@ public function testAssertCountThrowsExceptionIfExpectedCountIsNoInteger()
         $this->fail();
     }
 
-
     /**
      * @covers PHPUnit_Framework_Assert::assertCount
      */
@@ -4025,14 +3656,72 @@ public function testAssertCountThrowsExceptionIfElementIsNotCountable()
         }
 
         catch (PHPUnit_Framework_Exception $e) {
-            $this->assertEquals('Argument #2 of PHPUnit_Framework_Assert::assertCount() must be a countable', $e->getMessage());
+            $this->assertEquals('Argument #2 (No Value) of PHPUnit_Framework_Assert::assertCount() must be a countable or traversable', $e->getMessage());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeCount
+     */
+    public function testAssertAttributeCount()
+    {
+        $o    = new stdClass;
+        $o->a = array();
+
+        $this->assertAttributeCount(0, 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotCount
+     */
+    public function testAssertNotCount()
+    {
+        $this->assertNotCount(2, array(1,2,3));
+
+        try {
+            $this->assertNotCount(2, array(1,2));
+        }
 
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
             return;
         }
 
         $this->fail();
     }
 
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotCount
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotCountThrowsExceptionIfExpectedCountIsNoInteger()
+    {
+        $this->assertNotCount('a', array());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotCount
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotCountThrowsExceptionIfElementIsNotCountable()
+    {
+        $this->assertNotCount(2, '');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotCount
+     */
+    public function testAssertAttributeNotCount()
+    {
+        $o    = new stdClass;
+        $o->a = array();
+
+        $this->assertAttributeNotCount(1, 'a', $o);
+    }
+
     /**
      * @covers PHPUnit_Framework_Assert::assertSameSize
      */
@@ -4054,15 +3743,14 @@ public function testAssertSameSize()
     /**
      * @covers PHPUnit_Framework_Assert::assertSameSize
      */
-    public function testAssertSameSizeThrowsExceptionIfExpectedIsNotCoutable()
+    public function testAssertSameSizeThrowsExceptionIfExpectedIsNotCountable()
     {
-
         try {
             $this->assertSameSize('a', array());
         }
 
         catch (PHPUnit_Framework_Exception $e) {
-            $this->assertEquals('Argument #1 of PHPUnit_Framework_Assert::assertSameSize() must be a countable', $e->getMessage());
+            $this->assertEquals('Argument #1 (No Value) of PHPUnit_Framework_Assert::assertSameSize() must be a countable or traversable', $e->getMessage());
 
             return;
         }
@@ -4070,26 +3758,69 @@ public function testAssertSameSizeThrowsExceptionIfExpectedIsNotCoutable()
         $this->fail();
     }
 
-
     /**
      * @covers PHPUnit_Framework_Assert::assertSameSize
      */
     public function testAssertSameSizeThrowsExceptionIfActualIsNotCountable()
     {
-
         try {
             $this->assertSameSize(array(), '');
         }
 
         catch (PHPUnit_Framework_Exception $e) {
-            $this->assertEquals('Argument #2 of PHPUnit_Framework_Assert::assertSameSize() must be a countable', $e->getMessage());
+            $this->assertEquals('Argument #2 (No Value) of PHPUnit_Framework_Assert::assertSameSize() must be a countable or traversable', $e->getMessage());
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSameSize
+     */
+    public function testAssertNotSameSize()
+    {
+        $this->assertNotSameSize(array(1,2), array(1,2,3));
+
+        try {
+            $this->assertNotSameSize(array(1,2), array(3,4));
+        }
 
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
             return;
         }
 
         $this->fail();
     }
 
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSameSize
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotSameSizeThrowsExceptionIfExpectedIsNotCountable()
+    {
+        $this->assertNotSameSize('a', array());
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotSameSize
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotSameSizeThrowsExceptionIfActualIsNotCountable()
+    {
+        $this->assertNotSameSize(array(), '');
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertJson
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertJsonRaisesExceptionForInvalidArgument()
+    {
+        $this->assertJson(null);
+    }
+
     /**
      * @covers PHPUnit_Framework_Assert::assertJsonStringEqualsJsonString
      */
@@ -4181,7 +3912,7 @@ public function testAssertJsonStringEqualsJsonFileExpectingException()
     {
         $file = __DIR__ . '/../_files/JsonData/simpleObject.js';
         try {
-            $this->assertJsonStringEqualsJsonFile($file, NULL);
+            $this->assertJsonStringEqualsJsonFile($file, null);
         } catch (PHPUnit_Framework_Exception $e) {
             return;
         }
@@ -4206,7 +3937,7 @@ public function testAssertJsonStringNotEqualsJsonFileExpectingException()
     {
         $file = __DIR__ . '/../_files/JsonData/simpleObject.js';
         try {
-            $this->assertJsonStringNotEqualsJsonFile($file, NULL);
+            $this->assertJsonStringNotEqualsJsonFile($file, null);
         } catch (PHPUnit_Framework_Exception $e) {
             return;
         }
@@ -4234,6 +3965,158 @@ public function testAssertJsonFileEqualsJsonFile()
         $this->assertJsonFileEqualsJsonFile($file, $file, $message);
     }
 
+    /**
+     * @covers PHPUnit_Framework_Assert::assertInstanceOf
+     */
+    public function testAssertInstanceOf()
+    {
+        $this->assertInstanceOf('stdClass', new stdClass);
+
+        try {
+            $this->assertInstanceOf('Exception', new stdClass);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertInstanceOf
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertInstanceOfThrowsExceptionForInvalidArgument()
+    {
+        $this->assertInstanceOf(null, new stdClass);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeInstanceOf
+     */
+    public function testAssertAttributeInstanceOf()
+    {
+        $o    = new stdClass;
+        $o->a = new stdClass;
+
+        $this->assertAttributeInstanceOf('stdClass', 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotInstanceOf
+     */
+    public function testAssertNotInstanceOf()
+    {
+        $this->assertNotInstanceOf('Exception', new stdClass);
+
+        try {
+            $this->assertNotInstanceOf('stdClass', new stdClass);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotInstanceOf
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotInstanceOfThrowsExceptionForInvalidArgument()
+    {
+        $this->assertNotInstanceOf(null, new stdClass);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotInstanceOf
+     */
+    public function testAssertAttributeNotInstanceOf()
+    {
+        $o    = new stdClass;
+        $o->a = new stdClass;
+
+        $this->assertAttributeNotInstanceOf('Exception', 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertInternalType
+     */
+    public function testAssertInternalType()
+    {
+        $this->assertInternalType('integer', 1);
+
+        try {
+            $this->assertInternalType('string', 1);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertInternalType
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertInternalTypeThrowsExceptionForInvalidArgument()
+    {
+        $this->assertInternalType(null, 1);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeInternalType
+     */
+    public function testAssertAttributeInternalType()
+    {
+        $o    = new stdClass;
+        $o->a = 1;
+
+        $this->assertAttributeInternalType('integer', 'a', $o);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotInternalType
+     */
+    public function testAssertNotInternalType()
+    {
+        $this->assertNotInternalType('string', 1);
+
+        try {
+            $this->assertNotInternalType('integer', 1);
+        }
+
+        catch (PHPUnit_Framework_AssertionFailedError $e) {
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotInternalType
+     * @expectedException PHPUnit_Framework_Exception
+     */
+    public function testAssertNotInternalTypeThrowsExceptionForInvalidArgument()
+    {
+        $this->assertNotInternalType(null, 1);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertAttributeNotInternalType
+     */
+    public function testAssertAttributeNotInternalType()
+    {
+        $o    = new stdClass;
+        $o->a = 1;
+
+        $this->assertAttributeNotInternalType('string', 'a', $o);
+    }
+
     public static function validInvalidJsonDataprovider()
     {
         return array(
@@ -4241,5 +4124,4 @@ public static function validInvalidJsonDataprovider()
             'error UTF-8 in actual JSON'    => array('{"Mascott" : "Tux"}', '{"Mascott" : :}'),
         );
     }
-
 }
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php b/core/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5e46c0fbeda9571b633456bb12f49c1db0c6dcea
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Framework/BaseTestListenerTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Giorgio Sironi <info@giorgiosironi.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 4.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Giorgio Sironi <info@giorgiosironi.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 4.0.0
+ */
+class Framework_BaseTestListenerTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var PHPUnit_Framework_TestResult
+     */
+    private $result;
+
+    /**
+     * @covers PHPUnit_Framework_TestResult
+     */
+    public function testEndEventsAreCounted()
+    {
+        $this->result = new PHPUnit_Framework_TestResult;
+        $listener = new BaseTestListenerSample();
+        $this->result->addListener($listener);
+        $test = new Success;
+        $test->run($this->result);
+
+        $this->assertEquals(1, $listener->endCount);
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..326b6c3c829c2220d0bcb75b2be7c0068853c210
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/CountTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Jeroen Versteeg <jversteeg@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.7.30
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Jeroen Versteeg <jversteeg@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.7.30
+ * @covers     PHPUnit_Framework_Constraint_Count
+ */
+class CountTest extends PHPUnit_Framework_TestCase
+{
+    public function testCount()
+    {
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(3);
+        $this->assertTrue($countConstraint->evaluate(array(1,2,3), '', true));
+
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(0);
+        $this->assertTrue($countConstraint->evaluate(array(), '', true));
+
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(2);
+        $it = new TestIterator(array(1, 2));
+        $this->assertTrue($countConstraint->evaluate($it, '', true));
+    }
+
+    public function testCountDoesNotChangeIteratorKey()
+    {
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(2);
+
+        // test with 1st implementation of Iterator
+        $it = new TestIterator(array(1, 2));
+
+        $countConstraint->evaluate($it, '', true);
+        $this->assertEquals(1, $it->current());
+
+        $it->next();
+        $countConstraint->evaluate($it, '', true);
+        $this->assertEquals(2, $it->current());
+
+        $it->next();
+        $countConstraint->evaluate($it, '', true);
+        $this->assertFalse($it->valid());
+
+        // test with 2nd implementation of Iterator
+        $it = new TestIterator2(array(1, 2));
+
+        $countConstraint = new PHPUnit_Framework_Constraint_Count(2);
+        $countConstraint->evaluate($it, '', true);
+        $this->assertEquals(1, $it->current());
+
+        $it->next();
+        $countConstraint->evaluate($it, '', true);
+        $this->assertEquals(2, $it->current());
+
+        $it->next();
+        $countConstraint->evaluate($it, '', true);
+        $this->assertFalse($it->valid());
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/Tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
index 1990ddce28af045471d19169d9be755a5c09c60d..929afad7fb13f8c50d1cf96e3c0451405974eafb 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatches/ErrorMessageProviderTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Bastian Feder <php@bastian-feder.de>
- * @copyright  2002-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.0
@@ -45,7 +45,7 @@
 /**
  * @package    PHPUnit
  * @author     Bastian Feder <php@bastian-feder.de>
- * @copyright  2011-2013 Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.0
@@ -56,7 +56,7 @@ class Framework_Constraint_JsonMatches_ErrorMessageProviderTest extends PHPUnit_
      * @dataProvider translateTypeToPrefixDataprovider
      * @covers PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider::translateTypeToPrefix
      */
-    public function testTranslatTypeToPrefix($expected, $type)
+    public function testTranslateTypeToPrefix($expected, $type)
     {
         $this->assertEquals(
             $expected,
@@ -83,7 +83,7 @@ public static function determineJsonErrorDataprovider()
     {
         return array(
             'JSON_ERROR_NONE'  => array(
-                NULL, 'json_error_none', ''
+                null, 'json_error_none', ''
             ),
             'JSON_ERROR_DEPTH' => array(
                 'Maximum stack depth exceeded', JSON_ERROR_DEPTH, ''
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/Constraint/JsonMatchesTest.php b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
similarity index 87%
rename from core/vendor/phpunit/phpunit/Tests/Framework/Constraint/JsonMatchesTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
index 402675666bd407b1ca15cef5401fcee38832e67e..08e74c4145c349b51bde5fd79f5e1325b009b0c2 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/Constraint/JsonMatchesTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/Constraint/JsonMatchesTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Bastian Feder <php@bastian-feder.de>
- * @copyright  2002-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.0
@@ -45,7 +45,7 @@
 /**
  * @package    PHPUnit
  * @author     Bastian Feder <php@bastian-feder.de>
- * @copyright  2011 Bastian Feder <php@bastian-feder.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.0
@@ -62,7 +62,7 @@ class Framework_Constraint_JsonMatchesTest extends PHPUnit_Framework_TestCase
     public function testEvaluate($expected, $jsonOther, $jsonValue)
     {
         $constraint = new PHPUnit_Framework_Constraint_JsonMatches($jsonValue);
-        $this->assertEquals($expected, $constraint->evaluate($jsonOther, '', TRUE));
+        $this->assertEquals($expected, $constraint->evaluate($jsonOther, '', true));
     }
 
     /**
@@ -80,10 +80,10 @@ public function testToString()
     public static function evaluateDataprovider()
     {
         return array(
-            'valid JSON' => array(TRUE, json_encode(array('Mascott' => 'Tux')), json_encode(array('Mascott' => 'Tux'))),
-            'error syntax' => array(FALSE, '{"Mascott"::}', json_encode(array('Mascott' => 'Tux'))),
-            'error UTF-8' => array(FALSE, json_encode('\xB1\x31'), json_encode(array('Mascott' => 'Tux'))),
-            'invalid JSON in class instantiation' => array(FALSE, json_encode(array('Mascott' => 'Tux')), '{"Mascott"::}'),
+            'valid JSON' => array(true, json_encode(array('Mascott' => 'Tux')), json_encode(array('Mascott' => 'Tux'))),
+            'error syntax' => array(false, '{"Mascott"::}', json_encode(array('Mascott' => 'Tux'))),
+            'error UTF-8' => array(false, json_encode('\xB1\x31'), json_encode(array('Mascott' => 'Tux'))),
+            'invalid JSON in class instantiation' => array(false, json_encode(array('Mascott' => 'Tux')), '{"Mascott"::}'),
         );
     }
 }
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/ConstraintTest.php b/core/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
similarity index 91%
rename from core/vendor/phpunit/phpunit/Tests/Framework/ConstraintTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
index 3f0375a64586e6959f36c5c557bd25c82f717182..7151146d8bfc1e8de6da44872f63edae447d1177 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/ConstraintTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/ConstraintTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,39 +37,25 @@
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.0.0
  */
 
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ClassWithNonPublicAttributes.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'TestIterator.php';
-
 /**
  *
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.0.0
  */
 class Framework_ConstraintTest extends PHPUnit_Framework_TestCase
 {
-    /**
-     * Removes spaces in front of newlines
-     *
-     * @param  string $string
-     * @return string
-     */
-    public static function trimnl($string)
-    {
-        return preg_replace('/[ ]*\n/', "\n", $string);
-    }
-
     /**
      * @covers PHPUnit_Framework_Constraint_ArrayHasKey
      * @covers PHPUnit_Framework_Assert::arrayHasKey
@@ -80,7 +66,7 @@ public function testConstraintArrayHasKey()
     {
         $constraint = PHPUnit_Framework_Assert::arrayHasKey(0);
 
-        $this->assertFalse($constraint->evaluate(array(), '', TRUE));
+        $this->assertFalse($constraint->evaluate(array(), '', true));
         $this->assertEquals('has the key 0', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -145,7 +131,7 @@ public function testConstraintArrayNotHasKey()
           PHPUnit_Framework_Assert::arrayHasKey(0)
         );
 
-        $this->assertFalse($constraint->evaluate(array(0 => 1), '', TRUE));
+        $this->assertFalse($constraint->evaluate(array(0 => 1), '', true));
         $this->assertEquals('does not have the key 0', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -213,7 +199,7 @@ public function testConstraintFileExists()
     {
         $constraint = PHPUnit_Framework_Assert::fileExists();
 
-        $this->assertFalse($constraint->evaluate('foo', '', TRUE));
+        $this->assertFalse($constraint->evaluate('foo', '', true));
         $this->assertEquals('file exists', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -281,7 +267,7 @@ public function testConstraintFileNotExists()
           PHPUnit_Framework_Assert::fileExists()
         );
 
-        $this->assertFalse($constraint->evaluate($file, '', TRUE));
+        $this->assertFalse($constraint->evaluate($file, '', true));
         $this->assertEquals('file does not exist', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -350,8 +336,8 @@ public function testConstraintGreaterThan()
     {
         $constraint = PHPUnit_Framework_Assert::greaterThan(1);
 
-        $this->assertFalse($constraint->evaluate(0, '', TRUE));
-        $this->assertTrue($constraint->evaluate(2, '', TRUE));
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertTrue($constraint->evaluate(2, '', true));
         $this->assertEquals('is greater than 1', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -418,7 +404,7 @@ public function testConstraintNotGreaterThan()
           PHPUnit_Framework_Assert::greaterThan(1)
         );
 
-        $this->assertTrue($constraint->evaluate(1, '', TRUE));
+        $this->assertTrue($constraint->evaluate(1, '', true));
         $this->assertEquals('is not greater than 1', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -487,8 +473,8 @@ public function testConstraintGreaterThanOrEqual()
     {
         $constraint = PHPUnit_Framework_Assert::greaterThanOrEqual(1);
 
-        $this->assertTrue($constraint->evaluate(1, '', TRUE));
-        $this->assertFalse($constraint->evaluate(0, '', TRUE));
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertFalse($constraint->evaluate(0, '', true));
         $this->assertEquals('is equal to 1 or is greater than 1', $constraint->toString());
         $this->assertEquals(2, count($constraint));
 
@@ -559,7 +545,7 @@ public function testConstraintNotGreaterThanOrEqual()
           PHPUnit_Framework_Assert::greaterThanOrEqual(1)
         );
 
-        $this->assertFalse($constraint->evaluate(1, '', TRUE));
+        $this->assertFalse($constraint->evaluate(1, '', true));
         $this->assertEquals('not( is equal to 1 or is greater than 1 )', $constraint->toString());
         $this->assertEquals(2, count($constraint));
 
@@ -629,8 +615,8 @@ public function testConstraintIsAnything()
     {
         $constraint = PHPUnit_Framework_Assert::anything();
 
-        $this->assertTrue($constraint->evaluate(NULL, '', TRUE));
-        $this->assertNull($constraint->evaluate(NULL));
+        $this->assertTrue($constraint->evaluate(null, '', true));
+        $this->assertNull($constraint->evaluate(null));
         $this->assertEquals('is anything', $constraint->toString());
         $this->assertEquals(0, count($constraint));
     }
@@ -648,12 +634,12 @@ public function testConstraintNotIsAnything()
           PHPUnit_Framework_Assert::anything()
         );
 
-        $this->assertFalse($constraint->evaluate(NULL, '', TRUE));
+        $this->assertFalse($constraint->evaluate(null, '', true));
         $this->assertEquals('is not anything', $constraint->toString());
         $this->assertEquals(0, count($constraint));
 
         try {
-            $constraint->evaluate(NULL);
+            $constraint->evaluate(null);
         }
 
         catch (PHPUnit_Framework_ExpectationFailedException $e) {
@@ -682,8 +668,8 @@ public function testConstraintIsEqual()
     {
         $constraint = PHPUnit_Framework_Assert::equalTo(1);
 
-        $this->assertTrue($constraint->evaluate(1, '', TRUE));
-        $this->assertFalse($constraint->evaluate(0, '', TRUE));
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertFalse($constraint->evaluate(0, '', true));
         $this->assertEquals('is equal to 1', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -737,12 +723,14 @@ public function isEqualProvider()
         $storage1->attach($b);
         $storage2 = new SplObjectStorage;
         $storage2->attach($b);
+        $storage1hash = spl_object_hash($storage1);
+        $storage2hash = spl_object_hash($storage2);
 
         $dom1 = new DOMDocument;
-        $dom1->preserveWhiteSpace = FALSE;
+        $dom1->preserveWhiteSpace = false;
         $dom1->loadXML('<root></root>');
         $dom2 = new DOMDocument;
-        $dom2->preserveWhiteSpace = FALSE;
+        $dom2->preserveWhiteSpace = false;
         $dom2->loadXML('<root><foo/></root>');
 
         return array(
@@ -805,7 +793,7 @@ public function isEqualProvider()
 
 EOF
             ),
-            array(array(TRUE), array('true'), <<<EOF
+            array(array(true), array('true'), <<<EOF
 Failed asserting that two arrays are equal.
 --- Expected
 +++ Actual
@@ -892,17 +880,17 @@ public function isEqualProvider()
 --- Expected
 +++ Actual
 @@ @@
- SplObjectStorage Object (
--    '$ahash' => Array (
--        'obj' => stdClass Object (
+-SplObjectStorage Object &$storage1hash (
+-    '$ahash' => Array &0 (
+-        'obj' => stdClass Object &$ahash (
 -            'foo' => 'bar'
 -        )
--        'inf' => null
--    )
-     '$bhash' => Array (
-         'obj' => stdClass Object ()
++SplObjectStorage Object &$storage2hash (
++    '$bhash' => Array &0 (
++        'obj' => stdClass Object &$bhash ()
          'inf' => null
      )
+-    '$bhash' => Array &0
  )
 
 EOF
@@ -918,6 +906,19 @@ public function isEqualProvider()
 +  <foo/>
 +</root>
 
+EOF
+            ),
+            array(
+              new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+              new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+              <<<EOF
+Failed asserting that two DateTime objects are equal.
+--- Expected
++++ Actual
+@@ @@
+-2013-03-29T04:13:35-0400
++2013-03-29T04:13:35-0500
+
 EOF
             ),
         );
@@ -940,7 +941,7 @@ public function testConstraintIsEqual2($expected, $actual, $message)
         catch (PHPUnit_Framework_ExpectationFailedException $e) {
             $this->assertEquals(
               "custom message\n$message",
-              self::trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
             );
 
             return;
@@ -962,8 +963,8 @@ public function testConstraintIsNotEqual()
           PHPUnit_Framework_Assert::equalTo(1)
         );
 
-        $this->assertTrue($constraint->evaluate(0, '', TRUE));
-        $this->assertFalse($constraint->evaluate(1, '', TRUE));
+        $this->assertTrue($constraint->evaluate(0, '', true));
+        $this->assertFalse($constraint->evaluate(1, '', true));
         $this->assertEquals('is not equal to 1', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1034,8 +1035,8 @@ public function testConstraintIsIdentical()
 
         $constraint = PHPUnit_Framework_Assert::identicalTo($a);
 
-        $this->assertFalse($constraint->evaluate($b, '', TRUE));
-        $this->assertTrue($constraint->evaluate($a, '', TRUE));
+        $this->assertFalse($constraint->evaluate($b, '', true));
+        $this->assertTrue($constraint->evaluate($a, '', true));
         $this->assertEquals('is identical to an object of class "stdClass"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1140,8 +1141,8 @@ public function testConstraintIsNotIdentical()
           PHPUnit_Framework_Assert::identicalTo($a)
         );
 
-        $this->assertTrue($constraint->evaluate($b, '', TRUE));
-        $this->assertFalse($constraint->evaluate($a, '', TRUE));
+        $this->assertTrue($constraint->evaluate($b, '', true));
+        $this->assertFalse($constraint->evaluate($a, '', true));
         $this->assertEquals('is not identical to an object of class "stdClass"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1155,7 +1156,7 @@ public function testConstraintIsNotIdentical()
 
 EOF
               ,
-              self::trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
             );
 
             return;
@@ -1223,7 +1224,7 @@ public function testConstraintIsNotIdentical3()
 
 EOF
               ,
-              self::trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
             );
 
             return;
@@ -1242,11 +1243,16 @@ public function testConstraintIsInstanceOf()
     {
         $constraint = PHPUnit_Framework_Assert::isInstanceOf('Exception');
 
-        $this->assertFalse($constraint->evaluate(new stdClass, '', TRUE));
-        $this->assertTrue($constraint->evaluate(new Exception, '', TRUE));
+        $this->assertFalse($constraint->evaluate(new stdClass, '', true));
+        $this->assertTrue($constraint->evaluate(new Exception, '', true));
         $this->assertEquals('is instance of class "Exception"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
+        $interfaceConstraint = PHPUnit_Framework_Assert::isInstanceOf('Countable');
+        $this->assertFalse($interfaceConstraint->evaluate(new stdClass, '', true));
+        $this->assertTrue($interfaceConstraint->evaluate(new ArrayObject, '', true));
+        $this->assertEquals('is instance of interface "Countable"', $interfaceConstraint->toString());
+
         try {
             $constraint->evaluate(new stdClass);
         }
@@ -1309,8 +1315,8 @@ public function testConstraintIsNotInstanceOf()
           PHPUnit_Framework_Assert::isInstanceOf('stdClass')
         );
 
-        $this->assertFalse($constraint->evaluate(new stdClass, '', TRUE));
-        $this->assertTrue($constraint->evaluate(new Exception, '', TRUE));
+        $this->assertFalse($constraint->evaluate(new stdClass, '', true));
+        $this->assertTrue($constraint->evaluate(new Exception, '', true));
         $this->assertEquals('is not instance of class "stdClass"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1377,8 +1383,8 @@ public function testConstraintIsType()
     {
         $constraint = PHPUnit_Framework_Assert::isType('string');
 
-        $this->assertFalse($constraint->evaluate(0, '', TRUE));
-        $this->assertTrue($constraint->evaluate('', '', TRUE));
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertTrue($constraint->evaluate('', '', true));
         $this->assertEquals('is of type "string"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1387,12 +1393,12 @@ public function testConstraintIsType()
         }
 
         catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertEquals(<<<EOF
-Failed asserting that stdClass Object () is of type "string".
+            $this->assertStringMatchesFormat(<<<EOF
+Failed asserting that stdClass Object &%x () is of type "string".
 
 EOF
               ,
-              self::trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
             );
 
             return;
@@ -1415,13 +1421,13 @@ public function testConstraintIsType2()
         }
 
         catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertEquals(<<<EOF
+            $this->assertStringMatchesFormat(<<<EOF
 custom message
-Failed asserting that stdClass Object () is of type "string".
+Failed asserting that stdClass Object &%x () is of type "string".
 
 EOF
               ,
-              self::trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
+              $this->trimnl(PHPUnit_Framework_TestFailure::exceptionToString($e))
             );
 
             return;
@@ -1443,8 +1449,8 @@ public function testConstraintIsNotType()
           PHPUnit_Framework_Assert::isType('string')
         );
 
-        $this->assertTrue($constraint->evaluate(0, '', TRUE));
-        $this->assertFalse($constraint->evaluate('', '', TRUE));
+        $this->assertTrue($constraint->evaluate(0, '', true));
+        $this->assertFalse($constraint->evaluate('', '', true));
         $this->assertEquals('is not of type "string"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1511,8 +1517,8 @@ public function testConstraintIsNull()
     {
         $constraint = PHPUnit_Framework_Assert::isNull();
 
-        $this->assertFalse($constraint->evaluate(0, '', TRUE));
-        $this->assertTrue($constraint->evaluate(NULL, '', TRUE));
+        $this->assertFalse($constraint->evaluate(0, '', true));
+        $this->assertTrue($constraint->evaluate(null, '', true));
         $this->assertEquals('is null', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1578,13 +1584,13 @@ public function testConstraintIsNotNull()
           PHPUnit_Framework_Assert::isNull()
         );
 
-        $this->assertFalse($constraint->evaluate(NULL, '', TRUE));
-        $this->assertTrue($constraint->evaluate(0, '', TRUE));
+        $this->assertFalse($constraint->evaluate(null, '', true));
+        $this->assertTrue($constraint->evaluate(0, '', true));
         $this->assertEquals('is not null', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
         try {
-            $constraint->evaluate(NULL);
+            $constraint->evaluate(null);
         }
 
         catch (PHPUnit_Framework_ExpectationFailedException $e) {
@@ -1616,7 +1622,7 @@ public function testConstraintIsNotNull2()
         );
 
         try {
-            $constraint->evaluate(NULL, 'custom message');
+            $constraint->evaluate(null, 'custom message');
         }
 
         catch (PHPUnit_Framework_ExpectationFailedException $e) {
@@ -1645,8 +1651,8 @@ public function testConstraintLessThan()
     {
         $constraint = PHPUnit_Framework_Assert::lessThan(1);
 
-        $this->assertTrue($constraint->evaluate(0, '', TRUE));
-        $this->assertFalse($constraint->evaluate(1, '', TRUE));
+        $this->assertTrue($constraint->evaluate(0, '', true));
+        $this->assertFalse($constraint->evaluate(1, '', true));
         $this->assertEquals('is less than 1', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1713,8 +1719,8 @@ public function testConstraintNotLessThan()
           PHPUnit_Framework_Assert::lessThan(1)
         );
 
-        $this->assertTrue($constraint->evaluate(1, '', TRUE));
-        $this->assertFalse($constraint->evaluate(0, '', TRUE));
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertFalse($constraint->evaluate(0, '', true));
         $this->assertEquals('is not less than 1', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -1783,8 +1789,8 @@ public function testConstraintLessThanOrEqual()
     {
         $constraint = PHPUnit_Framework_Assert::lessThanOrEqual(1);
 
-        $this->assertTrue($constraint->evaluate(1, '', TRUE));
-        $this->assertFalse($constraint->evaluate(2, '', TRUE));
+        $this->assertTrue($constraint->evaluate(1, '', true));
+        $this->assertFalse($constraint->evaluate(2, '', true));
         $this->assertEquals('is equal to 1 or is less than 1', $constraint->toString());
         $this->assertEquals(2, count($constraint));
 
@@ -1818,23 +1824,23 @@ public function testConstraintCallback()
         };
 
         $closureWithoutParameter = function() {
-            return TRUE;
+            return true;
         };
 
         $constraint = PHPUnit_Framework_Assert::callback($closureWithoutParameter);
-        $this->assertTrue($constraint->evaluate('', '', TRUE));
+        $this->assertTrue($constraint->evaluate('', '', true));
 
         $constraint = PHPUnit_Framework_Assert::callback($closureReflect);
-        $this->assertTrue($constraint->evaluate(TRUE, '', TRUE));
-        $this->assertFalse($constraint->evaluate(FALSE, '', TRUE));
+        $this->assertTrue($constraint->evaluate(true, '', true));
+        $this->assertFalse($constraint->evaluate(false, '', true));
 
         $callback = array($this, 'callbackReturningTrue');
         $constraint = PHPUnit_Framework_Assert::callback($callback);
-        $this->assertTrue($constraint->evaluate(FALSE,  '', TRUE));
+        $this->assertTrue($constraint->evaluate(false,  '', true));
 
         $callback = array('Framework_ConstraintTest', 'staticCallbackReturningTrue');
         $constraint = PHPUnit_Framework_Assert::callback($callback);
-        $this->assertTrue($constraint->evaluate(NULL, '', TRUE));
+        $this->assertTrue($constraint->evaluate(null, '', true));
 
         $this->assertEquals('is accepted by specified callback', $constraint->toString());
     }
@@ -1847,70 +1853,19 @@ public function testConstraintCallback()
     public function testConstraintCallbackFailure()
     {
         $constraint = PHPUnit_Framework_Assert::callback(function() {
-            return FALSE;
+            return false;
         });
         $constraint->evaluate('This fails');
     }
 
     public function callbackReturningTrue()
     {
-        return TRUE;
+        return true;
     }
 
     public static function staticCallbackReturningTrue()
     {
-        return TRUE;
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Constraint_Callback
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Specified callback <invalid callback> is not callable.
-     */
-    public function testConstraintCallbackInvalidFunctionArgument()
-    {
-        PHPUnit_Framework_Assert::callback('invalid callback');
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Constraint_Callback
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Specified callback <empty array> is not callable.
-     */
-    public function testConstraintCallbackInvalidArrayArgumentWithEmptyArray()
-    {
-        PHPUnit_Framework_Assert::callback(array());
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Constraint_Callback
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Specified callback <array without indexes 0 and 1 set> is not callable.
-     */
-    public function testConstraintCallbackInvalidArrayArgumentWithBadArray()
-    {
-        PHPUnit_Framework_Assert::callback(array(3 => 'foo'));
-    }
-
-
-    /**
-     * @covers PHPUnit_Framework_Constraint_Callback
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Specified callback <Framework_ConstraintTest::invalid callback> is not callable.
-     */
-    public function testConstraintCallbackInvalidArrayArgumentWithObject()
-    {
-        PHPUnit_Framework_Assert::callback(array($this, 'invalid callback'));
-    }
-
-    /**
-     * @covers PHPUnit_Framework_Constraint_Callback
-     * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage Specified callback <Framework_ConstraintTest::invalid callback> is not callable.
-     */
-    public function testConstraintCallbackInvalidArrayArgumentWithClassname()
-    {
-        PHPUnit_Framework_Assert::callback(array('Framework_ConstraintTest', 'invalid callback'));
+        return true;
     }
 
     /**
@@ -1960,8 +1915,8 @@ public function testConstraintNotLessThanOrEqual()
           PHPUnit_Framework_Assert::lessThanOrEqual(1)
         );
 
-        $this->assertTrue($constraint->evaluate(2, '', TRUE));
-        $this->assertFalse($constraint->evaluate(1, '', TRUE));
+        $this->assertTrue($constraint->evaluate(2, '', true));
+        $this->assertFalse($constraint->evaluate(1, '', true));
         $this->assertEquals('not( is equal to 1 or is less than 1 )', $constraint->toString());
         $this->assertEquals(2, count($constraint));
 
@@ -2031,8 +1986,8 @@ public function testConstraintClassHasAttribute()
     {
         $constraint = PHPUnit_Framework_Assert::classHasAttribute('privateAttribute');
 
-        $this->assertTrue($constraint->evaluate('ClassWithNonPublicAttributes', '', TRUE));
-        $this->assertFalse($constraint->evaluate('stdClass', '', TRUE));
+        $this->assertTrue($constraint->evaluate('ClassWithNonPublicAttributes', '', true));
+        $this->assertFalse($constraint->evaluate('stdClass', '', true));
         $this->assertEquals('has attribute "privateAttribute"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2098,8 +2053,8 @@ public function testConstraintClassNotHasAttribute()
           PHPUnit_Framework_Assert::classHasAttribute('privateAttribute')
         );
 
-        $this->assertTrue($constraint->evaluate('stdClass', '', TRUE));
-        $this->assertFalse($constraint->evaluate('ClassWithNonPublicAttributes', '', TRUE));
+        $this->assertTrue($constraint->evaluate('stdClass', '', true));
+        $this->assertFalse($constraint->evaluate('ClassWithNonPublicAttributes', '', true));
         $this->assertEquals('does not have attribute "privateAttribute"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2166,8 +2121,8 @@ public function testConstraintClassHasStaticAttribute()
     {
         $constraint = PHPUnit_Framework_Assert::classHasStaticAttribute('privateStaticAttribute');
 
-        $this->assertTrue($constraint->evaluate('ClassWithNonPublicAttributes', '', TRUE));
-        $this->assertFalse($constraint->evaluate('stdClass', '', TRUE));
+        $this->assertTrue($constraint->evaluate('ClassWithNonPublicAttributes', '', true));
+        $this->assertFalse($constraint->evaluate('stdClass', '', true));
         $this->assertEquals('has static attribute "privateStaticAttribute"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2233,8 +2188,8 @@ public function testConstraintClassNotHasStaticAttribute()
           PHPUnit_Framework_Assert::classHasStaticAttribute('privateStaticAttribute')
         );
 
-        $this->assertTrue($constraint->evaluate('stdClass', '', TRUE));
-        $this->assertFalse($constraint->evaluate('ClassWithNonPublicAttributes', '', TRUE));
+        $this->assertTrue($constraint->evaluate('stdClass', '', true));
+        $this->assertFalse($constraint->evaluate('ClassWithNonPublicAttributes', '', true));
         $this->assertEquals('does not have static attribute "privateStaticAttribute"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2301,8 +2256,8 @@ public function testConstraintObjectHasAttribute()
     {
         $constraint = PHPUnit_Framework_Assert::objectHasAttribute('privateAttribute');
 
-        $this->assertTrue($constraint->evaluate(new ClassWithNonPublicAttributes, '', TRUE));
-        $this->assertFalse($constraint->evaluate(new stdClass, '', TRUE));
+        $this->assertTrue($constraint->evaluate(new ClassWithNonPublicAttributes, '', true));
+        $this->assertFalse($constraint->evaluate(new stdClass, '', true));
         $this->assertEquals('has attribute "privateAttribute"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2368,8 +2323,8 @@ public function testConstraintObjectNotHasAttribute()
           PHPUnit_Framework_Assert::objectHasAttribute('privateAttribute')
         );
 
-        $this->assertTrue($constraint->evaluate(new stdClass, '', TRUE));
-        $this->assertFalse($constraint->evaluate(new ClassWithNonPublicAttributes, '', TRUE));
+        $this->assertTrue($constraint->evaluate(new stdClass, '', true));
+        $this->assertFalse($constraint->evaluate(new ClassWithNonPublicAttributes, '', true));
         $this->assertEquals('does not have attribute "privateAttribute"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2436,8 +2391,8 @@ public function testConstraintPCREMatch()
     {
         $constraint = PHPUnit_Framework_Assert::matchesRegularExpression('/foo/');
 
-        $this->assertFalse($constraint->evaluate('barbazbar', '', TRUE));
-        $this->assertTrue($constraint->evaluate('barfoobar', '', TRUE));
+        $this->assertFalse($constraint->evaluate('barbazbar', '', true));
+        $this->assertTrue($constraint->evaluate('barfoobar', '', true));
         $this->assertEquals('matches PCRE pattern "/foo/"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2503,8 +2458,8 @@ public function testConstraintPCRENotMatch()
           PHPUnit_Framework_Assert::matchesRegularExpression('/foo/')
         );
 
-        $this->assertTrue($constraint->evaluate('barbazbar', '', TRUE));
-        $this->assertFalse($constraint->evaluate('barfoobar', '', TRUE));
+        $this->assertTrue($constraint->evaluate('barbazbar', '', true));
+        $this->assertFalse($constraint->evaluate('barfoobar', '', true));
         $this->assertEquals('does not match PCRE pattern "/foo/"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2569,8 +2524,8 @@ public function testConstraintPCRENotMatch2()
     public function testConstraintStringMatches()
     {
         $constraint = PHPUnit_Framework_Assert::matches('*%c*');
-        $this->assertFalse($constraint->evaluate('**', '', TRUE));
-        $this->assertTrue($constraint->evaluate('***', '', TRUE));
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('***', '', true));
         $this->assertEquals('matches PCRE pattern "/^\*.\*$/s"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
     }
@@ -2583,8 +2538,8 @@ public function testConstraintStringMatches()
     public function testConstraintStringMatches2()
     {
         $constraint = PHPUnit_Framework_Assert::matches('*%s*');
-        $this->assertFalse($constraint->evaluate('**', '', TRUE));
-        $this->assertTrue($constraint->evaluate('***', '', TRUE));
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('***', '', true));
         $this->assertEquals('matches PCRE pattern "/^\*[^\r\n]+\*$/s"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
     }
@@ -2597,8 +2552,8 @@ public function testConstraintStringMatches2()
     public function testConstraintStringMatches3()
     {
         $constraint = PHPUnit_Framework_Assert::matches('*%i*');
-        $this->assertFalse($constraint->evaluate('**', '', TRUE));
-        $this->assertTrue($constraint->evaluate('*0*', '', TRUE));
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('*0*', '', true));
         $this->assertEquals('matches PCRE pattern "/^\*[+-]?\d+\*$/s"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
     }
@@ -2611,8 +2566,8 @@ public function testConstraintStringMatches3()
     public function testConstraintStringMatches4()
     {
         $constraint = PHPUnit_Framework_Assert::matches('*%d*');
-        $this->assertFalse($constraint->evaluate('**', '', TRUE));
-        $this->assertTrue($constraint->evaluate('*0*', '', TRUE));
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('*0*', '', true));
         $this->assertEquals('matches PCRE pattern "/^\*\d+\*$/s"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
     }
@@ -2625,8 +2580,8 @@ public function testConstraintStringMatches4()
     public function testConstraintStringMatches5()
     {
         $constraint = PHPUnit_Framework_Assert::matches('*%x*');
-        $this->assertFalse($constraint->evaluate('**', '', TRUE));
-        $this->assertTrue($constraint->evaluate('*0f0f0f*', '', TRUE));
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('*0f0f0f*', '', true));
         $this->assertEquals('matches PCRE pattern "/^\*[0-9a-fA-F]+\*$/s"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
     }
@@ -2639,8 +2594,8 @@ public function testConstraintStringMatches5()
     public function testConstraintStringMatches6()
     {
         $constraint = PHPUnit_Framework_Assert::matches('*%f*');
-        $this->assertFalse($constraint->evaluate('**', '', TRUE));
-        $this->assertTrue($constraint->evaluate('*1.0*', '', TRUE));
+        $this->assertFalse($constraint->evaluate('**', '', true));
+        $this->assertTrue($constraint->evaluate('*1.0*', '', true));
         $this->assertEquals('matches PCRE pattern "/^\*[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?\*$/s"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
     }
@@ -2655,8 +2610,8 @@ public function testConstraintStringStartsWith()
     {
         $constraint = PHPUnit_Framework_Assert::stringStartsWith('prefix');
 
-        $this->assertFalse($constraint->evaluate('foo', '', TRUE));
-        $this->assertTrue($constraint->evaluate('prefixfoo', '', TRUE));
+        $this->assertFalse($constraint->evaluate('foo', '', true));
+        $this->assertTrue($constraint->evaluate('prefixfoo', '', true));
         $this->assertEquals('starts with "prefix"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2722,8 +2677,8 @@ public function testConstraintStringStartsNotWith()
           PHPUnit_Framework_Assert::stringStartsWith('prefix')
         );
 
-        $this->assertTrue($constraint->evaluate('foo', '', TRUE));
-        $this->assertFalse($constraint->evaluate('prefixfoo', '', TRUE));
+        $this->assertTrue($constraint->evaluate('foo', '', true));
+        $this->assertFalse($constraint->evaluate('prefixfoo', '', true));
         $this->assertEquals('starts not with "prefix"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2789,8 +2744,8 @@ public function testConstraintStringContains()
     {
         $constraint = PHPUnit_Framework_Assert::stringContains('foo');
 
-        $this->assertFalse($constraint->evaluate('barbazbar', '', TRUE));
-        $this->assertTrue($constraint->evaluate('barfoobar', '', TRUE));
+        $this->assertFalse($constraint->evaluate('barbazbar', '', true));
+        $this->assertTrue($constraint->evaluate('barfoobar', '', true));
         $this->assertEquals('contains "foo"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2857,8 +2812,8 @@ public function testConstraintStringNotContains()
           PHPUnit_Framework_Assert::stringContains('foo')
         );
 
-        $this->assertTrue($constraint->evaluate('barbazbar', '', TRUE));
-        $this->assertFalse($constraint->evaluate('barfoobar', '', TRUE));
+        $this->assertTrue($constraint->evaluate('barbazbar', '', true));
+        $this->assertFalse($constraint->evaluate('barfoobar', '', true));
         $this->assertEquals('does not contain "foo"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2926,8 +2881,8 @@ public function testConstraintStringEndsWith()
     {
         $constraint = PHPUnit_Framework_Assert::stringEndsWith('suffix');
 
-        $this->assertFalse($constraint->evaluate('foo', '', TRUE));
-        $this->assertTrue($constraint->evaluate('foosuffix', '', TRUE));
+        $this->assertFalse($constraint->evaluate('foo', '', true));
+        $this->assertTrue($constraint->evaluate('foosuffix', '', true));
         $this->assertEquals('ends with "suffix"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -2994,8 +2949,8 @@ public function testConstraintStringEndsNotWith()
           PHPUnit_Framework_Assert::stringEndsWith('suffix')
         );
 
-        $this->assertTrue($constraint->evaluate('foo', '', TRUE));
-        $this->assertFalse($constraint->evaluate('foosuffix', '', TRUE));
+        $this->assertTrue($constraint->evaluate('foo', '', true));
+        $this->assertFalse($constraint->evaluate('foosuffix', '', true));
         $this->assertEquals('ends not with "suffix"', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -3051,6 +3006,24 @@ public function testConstraintStringEndsNotWith2()
         $this->fail();
     }
 
+    /**
+     * @covers PHPUnit_Framework_Constraint_TraversableContains
+     */
+    public function testConstraintArrayContainsCheckForObjectIdentity()
+    {
+        // Check for primitive type.
+        $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo', true, true);
+
+        $this->assertFalse($constraint->evaluate(array(0), '', true));
+        $this->assertFalse($constraint->evaluate(array(true), '', true));
+
+        // Default case.
+        $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo');
+
+        $this->assertTrue($constraint->evaluate(array(0), '', true));
+        $this->assertTrue($constraint->evaluate(array(true), '', true));
+    }
+
     /**
      * @covers PHPUnit_Framework_Constraint_TraversableContains
      * @covers PHPUnit_Framework_Constraint::count
@@ -3060,8 +3033,8 @@ public function testConstraintArrayContains()
     {
         $constraint = new PHPUnit_Framework_Constraint_TraversableContains('foo');
 
-        $this->assertFalse($constraint->evaluate(array('bar'), '', TRUE));
-        $this->assertTrue($constraint->evaluate(array('foo'), '', TRUE));
+        $this->assertFalse($constraint->evaluate(array('bar'), '', true));
+        $this->assertTrue($constraint->evaluate(array('foo'), '', true));
         $this->assertEquals("contains 'foo'", $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -3126,8 +3099,8 @@ public function testConstraintArrayNotContains()
           new PHPUnit_Framework_Constraint_TraversableContains('foo')
         );
 
-        $this->assertTrue($constraint->evaluate(array('bar'), '', TRUE));
-        $this->assertFalse($constraint->evaluate(array('foo'), '', TRUE));
+        $this->assertTrue($constraint->evaluate(array('bar'), '', true));
+        $this->assertFalse($constraint->evaluate(array('foo'), '', true));
         $this->assertEquals("does not contain 'foo'", $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -3193,22 +3166,22 @@ public function testConstraintSplObjectStorageContains()
     {
         $object     = new StdClass;
         $constraint = new PHPUnit_Framework_Constraint_TraversableContains($object);
-        $this->assertEquals("contains stdClass Object ()", $constraint->toString());
+        $this->assertStringMatchesFormat("contains stdClass Object &%s ()", $constraint->toString());
 
         $storage = new SplObjectStorage;
-        $this->assertFalse($constraint->evaluate($storage, '', TRUE));
+        $this->assertFalse($constraint->evaluate($storage, '', true));
 
         $storage->attach($object);
-        $this->assertTrue($constraint->evaluate($storage, '', TRUE));
+        $this->assertTrue($constraint->evaluate($storage, '', true));
 
         try {
             $constraint->evaluate(new SplObjectStorage);
         }
 
         catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertEquals(
+            $this->assertStringMatchesFormat(
               <<<EOF
-Failed asserting that an iterator contains stdClass Object ().
+Failed asserting that a traversable contains stdClass Object &%x ().
 
 EOF
               ,
@@ -3235,10 +3208,10 @@ public function testConstraintSplObjectStorageContains2()
         }
 
         catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->assertEquals(
+            $this->assertStringMatchesFormat(
               <<<EOF
 custom message
-Failed asserting that an iterator contains stdClass Object ().
+Failed asserting that a traversable contains stdClass Object &%x ().
 
 EOF
               ,
@@ -3261,13 +3234,13 @@ public function testAttributeEqualTo()
         $object     = new ClassWithNonPublicAttributes;
         $constraint = PHPUnit_Framework_Assert::attributeEqualTo('foo', 1);
 
-        $this->assertTrue($constraint->evaluate($object, '', TRUE));
+        $this->assertTrue($constraint->evaluate($object, '', true));
         $this->assertEquals('attribute "foo" is equal to 1', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
         $constraint = PHPUnit_Framework_Assert::attributeEqualTo('foo', 2);
 
-        $this->assertFalse($constraint->evaluate($object, '', TRUE));
+        $this->assertFalse($constraint->evaluate($object, '', true));
 
         try {
             $constraint->evaluate($object);
@@ -3333,7 +3306,7 @@ public function testAttributeNotEqualTo()
           PHPUnit_Framework_Assert::attributeEqualTo('foo', 2)
         );
 
-        $this->assertTrue($constraint->evaluate($object, '', TRUE));
+        $this->assertTrue($constraint->evaluate($object, '', true));
         $this->assertEquals('attribute "foo" is not equal to 2', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -3341,7 +3314,7 @@ public function testAttributeNotEqualTo()
           PHPUnit_Framework_Assert::attributeEqualTo('foo', 1)
         );
 
-        $this->assertFalse($constraint->evaluate($object, '', TRUE));
+        $this->assertFalse($constraint->evaluate($object, '', true));
 
         try {
             $constraint->evaluate($object);
@@ -3406,8 +3379,10 @@ public function testConstraintIsEmpty()
     {
         $constraint = new PHPUnit_Framework_Constraint_IsEmpty;
 
-        $this->assertFalse($constraint->evaluate(array('foo'), '', TRUE));
-        $this->assertTrue($constraint->evaluate(array(), '', TRUE));
+        $this->assertFalse($constraint->evaluate(array('foo'), '', true));
+        $this->assertTrue($constraint->evaluate(array(), '', true));
+        $this->assertFalse($constraint->evaluate(new ArrayObject(array('foo')), '', true));
+        $this->assertTrue($constraint->evaluate(new ArrayObject(array()), '', true));
         $this->assertEquals('is empty', $constraint->toString());
         $this->assertEquals(1, count($constraint));
 
@@ -3466,8 +3441,8 @@ public function testConstraintCountWithAnArray()
     {
         $constraint = new PHPUnit_Framework_Constraint_Count(5);
 
-        $this->assertTrue($constraint->evaluate(array(1,2,3,4,5), '', TRUE));
-        $this->assertFalse($constraint->evaluate(array(1,2,3,4), '', TRUE));
+        $this->assertTrue($constraint->evaluate(array(1,2,3,4,5), '', true));
+        $this->assertFalse($constraint->evaluate(array(1,2,3,4), '', true));
     }
 
     /**
@@ -3477,8 +3452,8 @@ public function testConstraintCountWithAnIteratorWhichDoesNotImplementCountable(
     {
         $constraint = new PHPUnit_Framework_Constraint_Count(5);
 
-        $this->assertTrue($constraint->evaluate(new TestIterator(array(1,2,3,4,5)), '', TRUE));
-        $this->assertFalse($constraint->evaluate(new TestIterator(array(1,2,3,4)), '', TRUE));
+        $this->assertTrue($constraint->evaluate(new TestIterator(array(1,2,3,4,5)), '', true));
+        $this->assertFalse($constraint->evaluate(new TestIterator(array(1,2,3,4)), '', true));
     }
 
     /**
@@ -3488,8 +3463,8 @@ public function testConstraintCountWithAnObjectImplementingCountable()
     {
         $constraint = new PHPUnit_Framework_Constraint_Count(5);
 
-        $this->assertTrue($constraint->evaluate(new ArrayObject(array(1,2,3,4,5)), '', TRUE));
-        $this->assertFalse($constraint->evaluate(new ArrayObject(array(1,2,3,4)), '', TRUE));
+        $this->assertTrue($constraint->evaluate(new ArrayObject(array(1,2,3,4,5)), '', true));
+        $this->assertFalse($constraint->evaluate(new ArrayObject(array(1,2,3,4)), '', true));
     }
 
     /**
@@ -3559,8 +3534,8 @@ public function testConstraintSameSizeWithAnArray()
     {
         $constraint = new PHPUnit_Framework_Constraint_SameSize(array(1,2,3,4,5));
 
-        $this->assertTrue($constraint->evaluate(array(6,7,8,9,10), '', TRUE));
-        $this->assertFalse($constraint->evaluate(array(1,2,3,4), '', TRUE));
+        $this->assertTrue($constraint->evaluate(array(6,7,8,9,10), '', true));
+        $this->assertFalse($constraint->evaluate(array(1,2,3,4), '', true));
     }
 
     /**
@@ -3570,8 +3545,8 @@ public function testConstraintSameSizeWithAnIteratorWhichDoesNotImplementCountab
     {
         $constraint = new PHPUnit_Framework_Constraint_SameSize(new TestIterator(array(1,2,3,4,5)));
 
-        $this->assertTrue($constraint->evaluate(new TestIterator(array(6,7,8,9,10)), '', TRUE));
-        $this->assertFalse($constraint->evaluate(new TestIterator(array(1,2,3,4)), '', TRUE));
+        $this->assertTrue($constraint->evaluate(new TestIterator(array(6,7,8,9,10)), '', true));
+        $this->assertFalse($constraint->evaluate(new TestIterator(array(1,2,3,4)), '', true));
     }
 
     /**
@@ -3581,8 +3556,8 @@ public function testConstraintSameSizeWithAnObjectImplementingCountable()
     {
         $constraint = new PHPUnit_Framework_Constraint_SameSize(new ArrayObject(array(1,2,3,4,5)));
 
-        $this->assertTrue($constraint->evaluate(new ArrayObject(array(6,7,8,9,10)), '', TRUE));
-        $this->assertFalse($constraint->evaluate(new ArrayObject(array(1,2,3,4)), '', TRUE));
+        $this->assertTrue($constraint->evaluate(new ArrayObject(array(6,7,8,9,10)), '', true));
+        $this->assertFalse($constraint->evaluate(new ArrayObject(array(1,2,3,4)), '', true));
     }
 
     /**
@@ -3644,4 +3619,46 @@ public function testConstraintNotSameSizeFailing()
 
         $this->fail();
     }
+
+    /**
+     * @covers PHPUnit_Framework_Constraint_Exception
+     * @covers PHPUnit_Framework_TestFailure::exceptionToString
+     */
+    public function testConstraintException()
+    {
+        $constraint = new PHPUnit_Framework_Constraint_Exception('FoobarException');
+        $exception = new DummyException('Test');
+        $stackTrace = $exception->getTraceAsString();
+
+        try {
+            $constraint->evaluate($exception);
+        }
+
+        catch (PHPUnit_Framework_ExpectationFailedException $e) {
+            $this->assertEquals(
+              <<<EOF
+Failed asserting that exception of type "DummyException" matches expected exception "FoobarException". Message was: "Test" at
+$stackTrace.
+
+EOF
+                ,
+                PHPUnit_Framework_TestFailure::exceptionToString($e)
+            );
+
+            return;
+        }
+
+        $this->fail();
+    }
+
+    /**
+     * Removes spaces in front of newlines
+     *
+     * @param  string $string
+     * @return string
+     */
+    private function trimnl($string)
+    {
+        return preg_replace('/[ ]*\n/', "\n", $string);
+    }
 }
diff --git a/core/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php b/core/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..17a20837d3ca42f684e7e13e1a9c4317858a4c64
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Framework/SelectorAssertionsTest.php
@@ -0,0 +1,977 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 2.0.0
+ */
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 2.0.0
+ */
+class Framework_SelectorAssertionsTest extends PHPUnit_Framework_TestCase
+{
+    private $html;
+
+    protected function setUp()
+    {
+        $this->html = file_get_contents(
+            dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'SelectorAssertionsFixture.html'
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagTypeTrue()
+    {
+        $matcher = array('tag' => 'html');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagTypeFalse()
+    {
+        $matcher = array('tag' => 'code');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagIdTrue()
+    {
+        $matcher = array('id' => 'test_text');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagIdFalse()
+    {
+        $matcher = array('id' => 'test_text_doesnt_exist');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagStringContentTrue()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'My test tag content');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagStringContentFalse()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'My non existent tag content');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagRegexpContentTrue()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'regexp:/test tag/');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagRegexpModifierContentTrue()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'regexp:/TEST TAG/i');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagRegexpContentFalse()
+    {
+        $matcher = array('id' => 'test_text',
+            'content' => 'regexp:/asdf/');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagCdataContentTrue()
+    {
+        $matcher = array('tag' => 'script',
+            'content' => 'alert(\'Hello, world!\');');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagCdataontentFalse()
+    {
+        $matcher = array('tag' => 'script',
+            'content' => 'asdf');
+        $this->assertTag($matcher, $this->html);
+    }
+
+
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesTrueA()
+    {
+        $matcher = array('tag' => 'span',
+            'attributes' => array('class' => 'test_class'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesTrueB()
+    {
+        $matcher = array('tag' => 'div',
+            'attributes' => array('id' => 'test_child_id'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAttributesFalse()
+    {
+        $matcher = array('tag' => 'span',
+            'attributes' => array('class' => 'test_missing_class'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesRegexpTrueA()
+    {
+        $matcher = array('tag' => 'span',
+            'attributes' => array('class' => 'regexp:/.+_class/'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesRegexpTrueB()
+    {
+        $matcher = array('tag' => 'div',
+            'attributes' => array('id' => 'regexp:/.+_child_.+/'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesRegexpModifierTrue()
+    {
+        $matcher = array('tag' => 'div',
+            'attributes' => array('id' => 'regexp:/.+_CHILD_.+/i'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAttributesRegexpModifierFalse()
+    {
+        $matcher = array('tag' => 'div',
+            'attributes' => array('id' => 'regexp:/.+_CHILD_.+/'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAttributesRegexpFalse()
+    {
+        $matcher = array('tag' => 'span',
+            'attributes' => array('class' => 'regexp:/.+_missing_.+/'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesMultiPartClassTrueA()
+    {
+        $matcher = array('tag' => 'div',
+            'id'  => 'test_multi_class',
+            'attributes' => array('class' => 'multi class'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAttributesMultiPartClassTrueB()
+    {
+        $matcher = array('tag' => 'div',
+            'id'  => 'test_multi_class',
+            'attributes' => array('class' => 'multi'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAttributesMultiPartClassFalse()
+    {
+        $matcher = array('tag' => 'div',
+            'id'  => 'test_multi_class',
+            'attributes' => array('class' => 'mul'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagParentTrue()
+    {
+        $matcher = array('tag' => 'head',
+            'parent' => array('tag' => 'html'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagParentFalse()
+    {
+        $matcher = array('tag' => 'head',
+            'parent' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagMultiplePossibleChildren()
+    {
+        $matcher = array(
+            'tag' => 'li',
+            'parent' => array(
+                'tag' => 'ul',
+                'id' => 'another_ul'
+            )
+        );
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildTrue()
+    {
+        $matcher = array('tag' => 'html',
+            'child' => array('tag' => 'head'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildFalse()
+    {
+        $matcher = array('tag' => 'html',
+            'child' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAdjacentSiblingTrue()
+    {
+        $matcher = array('tag' => 'img',
+            'adjacent-sibling' => array('tag' => 'input'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAdjacentSiblingFalse()
+    {
+        $matcher = array('tag' => 'img',
+            'adjacent-sibling' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagAncestorTrue()
+    {
+        $matcher = array('tag' => 'div',
+            'ancestor' => array('tag' => 'html'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagAncestorFalse()
+    {
+        $matcher = array('tag' => 'html',
+            'ancestor' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagDescendantTrue()
+    {
+        $matcher = array('tag' => 'html',
+            'descendant' => array('tag' => 'div'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagDescendantFalse()
+    {
+        $matcher = array('tag' => 'div',
+            'descendant' => array('tag' => 'html'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildrenCountTrue()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('count' => 3));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildrenCountFalse()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('count' => 5));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildrenLessThanTrue()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('less_than' => 10));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildrenLessThanFalse()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('less_than' => 2));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildrenGreaterThanTrue()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('greater_than' => 2));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildrenGreaterThanFalse()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('greater_than' => 10));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagChildrenOnlyTrue()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('only' => array('tag' =>'li')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagChildrenOnlyFalse()
+    {
+        $matcher = array('tag' => 'ul',
+            'children' => array('only' => array('tag' =>'div')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagTypeIdTrueA()
+    {
+        $matcher = array('tag' => 'ul', 'id' => 'my_ul');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagTypeIdTrueB()
+    {
+        $matcher = array('id' => 'my_ul', 'tag' => 'ul');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagTypeIdTrueC()
+    {
+        $matcher = array('tag' => 'input', 'id'  => 'input_test_id');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertTagTypeIdFalse()
+    {
+        $matcher = array('tag' => 'div', 'id'  => 'my_ul');
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertTagContentAttributes()
+    {
+        $matcher = array('tag' => 'div',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id' => 'test_id',
+                'class' => 'my_test_class'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertParentContentAttributes()
+    {
+        $matcher = array('tag'        => 'div',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id'    => 'test_id',
+                'class' => 'my_test_class'),
+            'parent'     => array('tag' => 'body'));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertChildContentAttributes()
+    {
+        $matcher = array('tag'        => 'div',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id'    => 'test_id',
+                'class' => 'my_test_class'),
+            'child'      => array('tag'        => 'div',
+                'attributes' => array('id' => 'test_child_id')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertAdjacentSiblingContentAttributes()
+    {
+        $matcher = array('tag'              => 'div',
+            'content'          => 'Test Id Text',
+            'attributes'       => array('id'    => 'test_id',
+                'class' => 'my_test_class'),
+            'adjacent-sibling' => array('tag'        => 'div',
+                'attributes' => array('id' => 'test_children')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertChildSubChildren()
+    {
+        $matcher = array('id' => 'test_id',
+            'child' => array('id' => 'test_child_id',
+                'child' => array('id' => 'test_subchild_id')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertAdjacentSiblingSubAdjacentSibling()
+    {
+        $matcher = array('id' => 'test_id',
+            'adjacent-sibling' => array('id' => 'test_children',
+                'adjacent-sibling' => array('class' => 'test_class')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertAncestorContentAttributes()
+    {
+        $matcher = array('id'         => 'test_subchild_id',
+            'content'    => 'My Subchild',
+            'attributes' => array('id' => 'test_subchild_id'),
+            'ancestor'   => array('tag'        => 'div',
+                'attributes' => array('id' => 'test_id')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertDescendantContentAttributes()
+    {
+        $matcher = array('id'         => 'test_id',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id'  => 'test_id'),
+            'descendant' => array('tag'        => 'span',
+                'attributes' => array('id' => 'test_subchild_id')));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertTag
+     */
+    public function testAssertChildrenContentAttributes()
+    {
+        $matcher = array('id'         => 'test_children',
+            'content'    => 'My Children',
+            'attributes' => array('class'  => 'children'),
+
+            'children' => array('less_than'    => '25',
+                'greater_than' => '2',
+                'only'         => array('tag' => 'div',
+                    'attributes' => array('class' => 'my_child'))
+            ));
+        $this->assertTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertNotTag
+     */
+    public function testAssertNotTagTypeIdFalse()
+    {
+        $matcher = array('tag' => 'div', 'id'  => 'my_ul');
+        $this->assertNotTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertNotTag
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertNotTagContentAttributes()
+    {
+        $matcher = array('tag' => 'div',
+            'content'    => 'Test Id Text',
+            'attributes' => array('id' => 'test_id',
+                'class' => 'my_test_class'));
+        $this->assertNotTag($matcher, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountPresentTrue()
+    {
+        $selector = 'div#test_id';
+        $count    = true;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountPresentFalse()
+    {
+        $selector = 'div#non_existent';
+        $count    = true;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountNotPresentTrue()
+    {
+        $selector = 'div#non_existent';
+        $count    = false;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectNotPresentFalse()
+    {
+        $selector = 'div#test_id';
+        $count    = false;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountChildTrue()
+    {
+        $selector = '#my_ul > li';
+        $count    = 3;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountChildFalse()
+    {
+        $selector = '#my_ul > li';
+        $count    = 4;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountAdjacentSiblingTrue()
+    {
+        $selector = 'div + div + div';
+        $count    = 2;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountAdjacentSiblingFalse()
+    {
+        $selector = '#test_children + div';
+        $count    = 1;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountDescendantTrue()
+    {
+        $selector = '#my_ul li';
+        $count    = 3;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountDescendantFalse()
+    {
+        $selector = '#my_ul li';
+        $count    = 4;
+
+        $this->assertSelectCount($selector, $count, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountGreaterThanTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>' => 2);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountGreaterThanFalse()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountGreaterThanEqualToTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>=' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountGreaterThanEqualToFalse()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>=' => 4);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountLessThanTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('<' => 4);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountLessThanFalse()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('<' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountLessThanEqualToTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('<=' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountLessThanEqualToFalse()
+    {
+        $selector = '#my_ul > li';
+        $range  = array('<=' => 2);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectCount
+     */
+    public function testAssertSelectCountRangeTrue()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>' => 2, '<' => 4);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectCount
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectCountRangeFalse()
+    {
+        $selector = '#my_ul > li';
+        $range    = array('>' => 1, '<' => 3);
+
+        $this->assertSelectCount($selector, $range, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectEquals
+     */
+    public function testAssertSelectEqualsContentPresentTrue()
+    {
+        $selector = 'span.test_class';
+        $content  = 'Test Class Text';
+
+        $this->assertSelectEquals($selector, $content, true, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectEquals
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectEqualsContentPresentFalse()
+    {
+        $selector = 'span.test_class';
+        $content  = 'Test Nonexistent';
+
+        $this->assertSelectEquals($selector, $content, true, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectEquals
+     */
+    public function testAssertSelectEqualsContentNotPresentTrue()
+    {
+        $selector = 'span.test_class';
+        $content  = 'Test Nonexistent';
+
+        $this->assertSelectEquals($selector, $content, false, $this->html);
+    }
+
+    /**
+     * @covers            PHPUnit_Framework_Assert::assertSelectEquals
+     * @expectedException PHPUnit_Framework_AssertionFailedError
+     */
+    public function testAssertSelectEqualsContentNotPresentFalse()
+    {
+        $selector = 'span.test_class';
+        $content  = 'Test Class Text';
+
+        $this->assertSelectEquals($selector, $content, false, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectRegExp
+     */
+    public function testAssertSelectRegExpContentPresentTrue()
+    {
+        $selector = 'span.test_class';
+        $regexp   = '/Test.*Text/';
+
+        $this->assertSelectRegExp($selector, $regexp, true, $this->html);
+    }
+
+    /**
+     * @covers PHPUnit_Framework_Assert::assertSelectRegExp
+     */
+    public function testAssertSelectRegExpContentPresentFalse()
+    {
+        $selector = 'span.test_class';
+        $regexp   = '/Nonexistant/';
+
+        $this->assertSelectRegExp($selector, $regexp, false, $this->html);
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/SuiteTest.php b/core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
similarity index 80%
rename from core/vendor/phpunit/phpunit/Tests/Framework/SuiteTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
index 5b61f7338f81048177270562a9954a42460eecf9..61e141c5220381967c80ee736e5e9a7689058efc 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/SuiteTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/SuiteTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,18 +36,19 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
  */
 
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'BeforeAndAfterTest.php';
+require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'BeforeClassAndAfterClassTest.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'InheritedTestCase.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoTestCaseClass.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoTestCases.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NotPublicTestCase.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NotVoidTestCase.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'OneTestCase.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'OverrideTestCase.php';
 
 /**
@@ -55,10 +56,11 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Framework_TestSuite
  */
 class Framework_SuiteTest extends PHPUnit_Framework_TestCase {
     protected $result;
@@ -81,6 +83,8 @@ public static function suite()
         $suite->addTest(new Framework_SuiteTest('testNotVoidTestCase'));
         $suite->addTest(new Framework_SuiteTest('testOneTestCase'));
         $suite->addTest(new Framework_SuiteTest('testShadowedTests'));
+        $suite->addTest(new Framework_SuiteTest('testBeforeClassAndAfterClassAnnotations'));
+        $suite->addTest(new Framework_SuiteTest('testBeforeAnnotation'));
 
         return $suite;
     }
@@ -182,4 +186,31 @@ public function testShadowedTests()
 
         $this->assertEquals(1, count($this->result));
     }
+
+    public function testBeforeClassAndAfterClassAnnotations()
+    {
+        $suite = new PHPUnit_Framework_TestSuite(
+          'BeforeClassAndAfterClassTest'
+        );
+
+        BeforeClassAndAfterClassTest::resetProperties();
+        $suite->run($this->result);
+
+        $this->assertEquals(1, BeforeClassAndAfterClassTest::$beforeClassWasRun, "@beforeClass method was not run once for the whole suite.");
+        $this->assertEquals(1, BeforeClassAndAfterClassTest::$afterClassWasRun, "@afterClass method was not run once for the whole suite.");
+    }
+
+    public function testBeforeAnnotation()
+    {
+        $test = new PHPUnit_Framework_TestSuite(
+            'BeforeAndAfterTest'
+        );
+
+        BeforeAndAfterTest::resetProperties();
+        $result = $test->run();
+
+        $this->assertEquals(2, BeforeAndAfterTest::$beforeWasRun);
+        $this->assertEquals(2, BeforeAndAfterTest::$afterWasRun);
+    }
+
 }
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/TestCaseTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/Tests/Framework/TestCaseTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
index 5bbd04a93e38aed81faf19d598bd25ef5f9b9b80..65dc64d324ca2f1f1bbdc7a067445253d54c5b63 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/TestCaseTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/TestCaseTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,28 +36,14 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
  */
 
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Error.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ExceptionInAssertPostConditionsTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ExceptionInAssertPreConditionsTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ExceptionInSetUpTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ExceptionInTearDownTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ExceptionInTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Failure.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NoArgTestCaseTest.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'OutputTestCase.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'RequirementsTest.php';
 require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Singleton.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Success.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ThrowExceptionTestCase.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ThrowNoExceptionTestCase.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'WasRun.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'ChangeCurrentWorkingDirectoryTest.php';
 
 $GLOBALS['a']  = 'a';
 $_ENV['b']     = 'b';
@@ -74,15 +60,21 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Framework_TestCase
  */
 class Framework_TestCaseTest extends PHPUnit_Framework_TestCase
 {
     protected $backupGlobalsBlacklist = array('i', 'singleton');
 
+    /**
+     * Used be testStaticAttributesBackupPre
+     */
+    protected static $_testStatic = 0;
+
     public function testCaseToString()
     {
         $this->assertEquals(
@@ -306,11 +298,16 @@ public function testGlobalsBackupPost()
     public function testStaticAttributesBackupPre()
     {
         $GLOBALS['singleton'] = Singleton::getInstance();
+        self::$_testStatic = 123;
     }
 
+    /**
+     * @depends testStaticAttributesBackupPre
+     */
     public function testStaticAttributesBackupPost()
     {
         $this->assertNotSame($GLOBALS['singleton'], Singleton::getInstance());
+        $this->assertSame(123, self::$_testStatic);
     }
 
     public function testExpectOutputStringFooActualFoo()
@@ -373,6 +370,18 @@ public function testSkipsIfRequiresHigherVersionOfPHP()
         );
     }
 
+    public function testSkipsIfRequiresNonExistingOs()
+    {
+        $test   = new RequirementsTest('testAlwaysSkip3');
+        $result = $test->run();
+
+        $this->assertEquals(1, $result->skippedCount());
+        $this->assertEquals(
+          'Operating system matching /DOESNOTEXIST/i is required.',
+          $test->getStatusMessage()
+        );
+    }
+
     public function testSkipsIfRequiresNonExistingFunction()
     {
         $test   = new RequirementsTest('testNine');
@@ -404,6 +413,7 @@ public function testSkipsProvidesMessagesForAllSkippingReasons()
         $this->assertEquals(
           'PHP 99-dev (or later) is required.' . PHP_EOL .
           'PHPUnit 9-dev (or later) is required.' . PHP_EOL .
+          'Operating system matching /DOESNOTEXIST/i is required.' . PHP_EOL .
           'Function testFuncOne is required.' . PHP_EOL .
           'Function testFuncTwo is required.' . PHP_EOL .
           'Extension testExtOne is required.' . PHP_EOL .
@@ -426,6 +436,13 @@ public function testRequiringAnExistingExtensionDoesNotSkip()
         $this->assertEquals(0, $result->skippedCount());
     }
 
+    public function testRequiringAnExistingOsDoesNotSkip()
+    {
+        $test   = new RequirementsTest('testExistingOs');
+        $result = $test->run();
+        $this->assertEquals(0, $result->skippedCount());
+    }
+
     public function testCurrentWorkingDirectoryIsRestored()
     {
         $expectedCwd = getcwd();
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/TestFailureTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/Tests/Framework/TestFailureTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
index 1257100dff65c110104f5efa55cc869811faaea1..4b8805ae5983e534a23e16e42be5e2159f3e44c2 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/TestFailureTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/TestFailureTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.20
@@ -47,7 +47,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.7.20
@@ -62,7 +62,7 @@ public function testToString()
         $test = new self(__FUNCTION__);
         $exception = new PHPUnit_Framework_Exception('message');
         $failure = new PHPUnit_Framework_TestFailure($test, $exception);
-        
+
         $this->assertEquals(__METHOD__ . ': message', $failure->toString());
     }
-}
\ No newline at end of file
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/TestImplementorTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
similarity index 78%
rename from core/vendor/phpunit/phpunit/Tests/Framework/TestImplementorTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
index 4f8d9e1f5a8df394c6cb093c986a90e6d251eac9..f2d33a837421dac647e1117c71014da61ee9abf7 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/TestImplementorTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/TestImplementorTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,43 +36,35 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
  */
 
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'DoubleTestCase.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Success.php';
-
 /**
  *
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
  */
 class Framework_TestImplementorTest extends PHPUnit_Framework_TestCase
 {
-    protected $test;
-
-    public function __construct()
-    {
-        $this->test = new DoubleTestCase(
-          new Success
-        );
-    }
-
+    /**
+     * @covers PHPUnit_Framework_TestCase
+     */
     public function testSuccessfulRun()
     {
         $result = new PHPUnit_Framework_TestResult;
 
-        $this->test->run($result);
+        $test = new DoubleTestCase(new Success);
+        $test->run($result);
 
-        $this->assertEquals(count($this->test), count($result));
+        $this->assertEquals(count($test), count($result));
         $this->assertEquals(0, $result->errorCount());
         $this->assertEquals(0, $result->failureCount());
     }
diff --git a/core/vendor/phpunit/phpunit/Tests/Framework/TestListenerTest.php b/core/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
similarity index 89%
rename from core/vendor/phpunit/phpunit/Tests/Framework/TestListenerTest.php
rename to core/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
index c242aff3e2bfcc9af6c7f6d5b34f26d43f8fb639..30d184b54fe1e7e248a8b26bacea667fb34245b6 100644
--- a/core/vendor/phpunit/phpunit/Tests/Framework/TestListenerTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Framework/TestListenerTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,25 +36,22 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
  */
 
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Error.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Failure.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'Success.php';
-
 /**
  *
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Framework_TestCase
  */
 class Framework_TestListenerTest extends PHPUnit_Framework_TestCase implements PHPUnit_Framework_TestListener
 {
@@ -62,6 +59,7 @@ class Framework_TestListenerTest extends PHPUnit_Framework_TestCase implements P
     protected $errorCount;
     protected $failureCount;
     protected $notImplementedCount;
+    protected $riskyCount;
     protected $skippedCount;
     protected $result;
     protected $startCount;
@@ -81,6 +79,11 @@ public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $t
         $this->notImplementedCount++;
     }
 
+    public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
+    {
+        $this->riskyCount++;
+    }
+
     public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
     {
         $this->skippedCount++;
@@ -112,6 +115,7 @@ protected function setUp()
         $this->endCount            = 0;
         $this->failureCount        = 0;
         $this->notImplementedCount = 0;
+        $this->riskyCount          = 0;
         $this->skippedCount        = 0;
         $this->startCount          = 0;
     }
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/1021.phpt b/core/vendor/phpunit/phpunit/tests/Regression/1021.phpt
similarity index 77%
rename from core/vendor/phpunit/phpunit/Tests/Regression/1021.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/1021.phpt
index b3b9bc7f5a33fc9ce54a73595f27e2b173d5d463..2f31e7343f40940eef02c76ac2f1ec71619842c6 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/1021.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/1021.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue1021Test';
 $_SERVER['argv'][3] = dirname(__FILE__).'/1021/Issue1021Test.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -14,6 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (2 tests, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/1021/Issue1021Test.php b/core/vendor/phpunit/phpunit/tests/Regression/1021/Issue1021Test.php
similarity index 90%
rename from core/vendor/phpunit/phpunit/Tests/Regression/1021/Issue1021Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/1021/Issue1021Test.php
index 422d580c82ebd81d84427c12fc3a122e48f347c5..5814e94c36823d017875e701c27d78025831b33a 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/1021/Issue1021Test.php
+++ b/core/vendor/phpunit/phpunit/tests/Regression/1021/Issue1021Test.php
@@ -18,6 +18,6 @@ public function testSomethingElse()
 
     public function provider()
     {
-        return array(array(TRUE));
+        return array(array(true));
     }
 }
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/523.phpt b/core/vendor/phpunit/phpunit/tests/Regression/523.phpt
similarity index 78%
rename from core/vendor/phpunit/phpunit/Tests/Regression/523.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/523.phpt
index 181c945409e1fdbaec4e94956a208371aa4ac8df..339570fcf98c1ee14fd366a0db62a7546040ba8b 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/523.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/523.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue523Test';
 $_SERVER['argv'][3] = dirname(__FILE__).'/523/Issue523Test.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -14,6 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 .
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/523/Issue523Test.php b/core/vendor/phpunit/phpunit/tests/Regression/523/Issue523Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/523/Issue523Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/523/Issue523Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/578.phpt b/core/vendor/phpunit/phpunit/tests/Regression/578.phpt
similarity index 87%
rename from core/vendor/phpunit/phpunit/Tests/Regression/578.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/578.phpt
index b5df4030a759a684a389f5937ad9c2e4ab896438..dfbf855b395d7a02b14b1e99a4a711af0adb8c42 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/578.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/578.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue578Test';
 $_SERVER['argv'][3] = dirname(__FILE__).'/578/Issue578Test.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 EEE
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There were 3 errors:
 
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/578/Issue578Test.php b/core/vendor/phpunit/phpunit/tests/Regression/578/Issue578Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/578/Issue578Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/578/Issue578Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/684.phpt b/core/vendor/phpunit/phpunit/tests/Regression/684.phpt
similarity index 81%
rename from core/vendor/phpunit/phpunit/Tests/Regression/684.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/684.phpt
index de26fcd81e9da2ed0b3f54a68cf68293e5268574..139b3f9a18c59283af08dccc510ee2322b9d0cd9 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/684.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/684.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue684Test';
 $_SERVER['argv'][3] = dirname(__FILE__).'/684/Issue684Test.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -14,13 +14,12 @@ PHPUnit %s by Sebastian Bergmann.
 
 F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
 1) Warning
 No tests found in class "Foo_Bar_Issue684Test".
 
-
 FAILURES!
 Tests: 1, Assertions: 0, Failures: 1.
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/684/Issue684Test.php b/core/vendor/phpunit/phpunit/tests/Regression/684/Issue684Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/684/Issue684Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/684/Issue684Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/783.phpt b/core/vendor/phpunit/phpunit/tests/Regression/783.phpt
similarity index 80%
rename from core/vendor/phpunit/phpunit/Tests/Regression/783.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/783.phpt
index 1de4f1ba8785c38e2bb0b691909f04edb8a7649f..84f00f6bc9614186676f3059adb2ea75fb37e454 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/783.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/783.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][3] = 'foo,bar';
 $_SERVER['argv'][4] = 'ParentSuite';
 $_SERVER['argv'][5] = dirname(__FILE__).'/783/ParentSuite.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (2 tests, 0 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/783/ChildSuite.php b/core/vendor/phpunit/phpunit/tests/Regression/783/ChildSuite.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/783/ChildSuite.php
rename to core/vendor/phpunit/phpunit/tests/Regression/783/ChildSuite.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/783/OneTest.php b/core/vendor/phpunit/phpunit/tests/Regression/783/OneTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/783/OneTest.php
rename to core/vendor/phpunit/phpunit/tests/Regression/783/OneTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/783/ParentSuite.php b/core/vendor/phpunit/phpunit/tests/Regression/783/ParentSuite.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/783/ParentSuite.php
rename to core/vendor/phpunit/phpunit/tests/Regression/783/ParentSuite.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/783/TwoTest.php b/core/vendor/phpunit/phpunit/tests/Regression/783/TwoTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/783/TwoTest.php
rename to core/vendor/phpunit/phpunit/tests/Regression/783/TwoTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/244.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/244.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt
index 97082acaf5655cb068e0cc056c422bf1ba9f1bd7..33ec8192d09c4ca864d8a06a7b1cbc7df156e9ce 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/244.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/244.phpt
@@ -2,14 +2,12 @@
 GH-244: Expected Exception should support string codes
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue244Test';
 $_SERVER['argv'][4] = dirname(__FILE__).'/244/Issue244Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,24 +15,18 @@ PHPUnit %s by Sebastian Bergmann.
 
 .FFF
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There were 3 failures:
 
 1) Issue244Test::testFails
 Failed asserting that '123StringCode' is equal to expected exception code 'OtherString'.
 
-%s:%i
-
 2) Issue244Test::testFailsTooIfExpectationIsANumber
 Failed asserting that '123StringCode' is equal to expected exception code 123.
 
-%s:%i
-
 3) Issue244Test::testFailsTooIfExceptionCodeIsANumber
 Failed asserting that 123 is equal to expected exception code '123String'.
 
-%s:%i
-
 FAILURES!
 Tests: 4, Assertions: 8, Failures: 3.
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/244/Issue244Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/244/Issue244Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/244/Issue244Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/244/Issue244Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/322.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt
similarity index 84%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/322.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt
index ef826acc2ddcefe8b89e645643aa2e33f3b3dc0f..7fc31c494f813f9d179ed9160b1a6d3ef2bd3447 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/322.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/322.phpt
@@ -11,7 +11,7 @@ $_SERVER['argv'][5] = 'one';
 $_SERVER['argv'][6] = 'Issue322Test';
 $_SERVER['argv'][7] = dirname(__FILE__).'/322/Issue322Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -23,6 +23,6 @@ Configuration read from %s
 Starting test 'Issue322Test::testOne'.
 .
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (1 test, 0 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/322/Issue322Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/322/Issue322Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/322/Issue322Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/322/Issue322Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/322/phpunit322.xml b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml
similarity index 93%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/322/phpunit322.xml
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml
index 5a95002f22e873502c9e4c6d792cdcc828134b95..e3b2948393344ef165ecc7d5faa5a309ebf28eb1 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/322/phpunit322.xml
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/322/phpunit322.xml
@@ -8,4 +8,4 @@
       <group>one</group>
     </exclude>
   </groups>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/433.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/433.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt
index 8b9df96cb3f1789a67bb854481bfde3a301289e7..9c512d8a0400f66a862602e5f9442f1f2a312397 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/433.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/433.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue433Test';
 $_SERVER['argv'][3] = dirname(__FILE__).'/433/Issue433Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
@@ -27,7 +27,5 @@ Failed asserting that two strings are equal.
 -'foo'
 +'bar'
 
-
 FAILURES!
 Tests: 3, Assertions: 3, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/433/Issue433Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/433/Issue433Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/433/Issue433Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/433/Issue433Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/445.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/445.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt
index bffe7542b3ed9f756b0c16fd0f3416831b8d9fb5..37e2a86149a4bcc13f16c32ebd037e7b22ef15d4 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/445.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/445.phpt
@@ -8,7 +8,7 @@ $_SERVER['argv'][2] = '--strict';
 $_SERVER['argv'][3] = 'Issue445Test';
 $_SERVER['argv'][4] = dirname(__FILE__).'/445/Issue445Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
@@ -28,7 +28,5 @@ Failed asserting that two strings are equal.
 -'foo'
 +'bar'
 
-
 FAILURES!
 Tests: 3, Assertions: 3, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/445/Issue445Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/445/Issue445Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/445/Issue445Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/445/Issue445Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/498.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt
similarity index 84%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/498.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt
index f57e9c655de1bbed49d8cb476d389919dccc3316..e2ef876d6842f1fc505b85c1f33095c892d35537 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/498.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/498.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][3] = 'trueOnly';
 $_SERVER['argv'][4] = 'Issue498Test';
 $_SERVER['argv'][5] = dirname(__FILE__).'/498/Issue498Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,7 +17,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
@@ -25,7 +25,5 @@ There was 1 failure:
 The data provider specified for Issue498Test::shouldBeFalse is invalid.
 Can't create the data
 
-
 FAILURES!
 Tests: 1, Assertions: 0, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/498/Issue498Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php
similarity index 94%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/498/Issue498Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php
index db281d88b7829eb1e9c2b7fd394242e1f253dcd9..a42c62959eefbc769ee0377ef82bc61de134b5dc 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/498/Issue498Test.php
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/498/Issue498Test.php
@@ -24,7 +24,7 @@ public function shouldBeFalse($testData)
         $this->assertFalse(false);
     }
 
-    public function shouldBeTrueDataProvider() 
+    public function shouldBeTrueDataProvider()
     {
 
         //throw new Exception("Can't create the data");
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/503.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt
similarity index 83%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/503.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt
index 3ccff278404ee1bb0a36b548333640dec0b4c3a0..6e4c46b639714e36a9c66df6284fcf6bb9aee041 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/503.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/503.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue503Test';
 $_SERVER['argv'][3] = dirname(__FILE__).'/503/Issue503Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
@@ -31,4 +31,3 @@ Failed asserting that two strings are identical.
 
 FAILURES!
 Tests: 1, Assertions: 1, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/503/Issue503Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/503/Issue503Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/503/Issue503Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/503/Issue503Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/581.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt
similarity index 85%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/581.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt
index 9e6f30424d065e2790142584b47b1eeb28405957..1ba868adbf5eb6b751476ce930da3dc2ac229840 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/581.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/581.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue581Test';
 $_SERVER['argv'][3] = dirname(__FILE__).'/581/Issue581Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -15,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
@@ -40,4 +40,3 @@ Failed asserting that two objects are equal.
 
 FAILURES!
 Tests: 1, Assertions: 1, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/581/Issue581Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/581/Issue581Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/581/Issue581Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt
similarity index 71%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt
index 851dfb28d53e534250fa7beac24efe46f7a3f9a6..79b33a4a1f37f85ab66d48337f71d57a51e09c26 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74.phpt
@@ -2,14 +2,12 @@
 GH-74: catchable fatal error in 3.5
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'Issue74Test';
 $_SERVER['argv'][4] = dirname(__FILE__).'/74/Issue74Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,15 +15,14 @@ PHPUnit %s by Sebastian Bergmann.
 
 E
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 error:
 
 1) Issue74Test::testCreateAndThrowNewExceptionInProcessIsolation
 NewException: Testing GH-74
 
-%s/Tests/Regression/GitHub/74/Issue74Test.php:7
-%s
+%s/tests/Regression/GitHub/74/Issue74Test.php:7
 
 FAILURES!
 Tests: 1, Assertions: 0, Errors: 1.
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74/Issue74Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php
similarity index 99%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74/Issue74Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php
index 4d68c5519ec32b53b364d41f3b7354487a017c9f..72f35928a960790bfb4cd4fc5ff5abb66df8b2d8 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74/Issue74Test.php
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74/Issue74Test.php
@@ -6,4 +6,4 @@ public function testCreateAndThrowNewExceptionInProcessIsolation()
         require_once __DIR__ . '/NewException.php';
         throw new NewException('Testing GH-74');
     }
-}
\ No newline at end of file
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74/NewException.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php
similarity index 95%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74/NewException.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php
index e81c0b5a5874a81fdb4c7eaaf069d365373c4164..abe2f7119a9d3f30db4403fffcf29fbe91631cb4 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/74/NewException.php
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/74/NewException.php
@@ -1,4 +1,4 @@
 <?php
 class NewException extends Exception
 {
-}
\ No newline at end of file
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/765.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/765.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt
index 888dc2cd148221d3534b202730d05f6544bed393..eadcd1166b3b64c52b72e627fc58de0335bd79fe 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/765.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/765.phpt
@@ -7,7 +7,7 @@ $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'Issue765Test';
 $_SERVER['argv'][3] = dirname(__FILE__).'/765/Issue765Test.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -15,14 +15,12 @@ PHPUnit %s by Sebastian Bergmann.
 
 .F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
 1) Warning
 The data provider specified for Issue765Test::testDependent is invalid.
 
-
 FAILURES!
 Tests: 2, Assertions: 1, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/765/Issue765Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/765/Issue765Test.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/765/Issue765Test.php
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/765/Issue765Test.php
diff --git a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/863.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt
similarity index 85%
rename from core/vendor/phpunit/phpunit/Tests/Regression/GitHub/863.phpt
rename to core/vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt
index 56f35fc58234d0e19176d9bf63d6a349e3285086..5a622053b88f91295e5affd6a87c1efa2934f38b 100644
--- a/core/vendor/phpunit/phpunit/Tests/Regression/GitHub/863.phpt
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/863.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][3] = '50';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(dirname(dirname(__FILE__))) . '/_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -19,7 +19,6 @@ PHPUnit %s by Sebastian Bergmann.
 ............................................................... 126 / 150 ( 84%)
 ........................
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (150 tests, 150 assertions)
-
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..ca33c7fc55643b60865db1a8ab20f341e6d528fd
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873.phpt
@@ -0,0 +1,16 @@
+--TEST--
+GH-873: PHPUnit suppresses exceptions thrown outside of test case function
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = 'Issue873Test';
+$_SERVER['argv'][3] = dirname(__FILE__) . '/873/Issue873Test.php';
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+
+Fatal error: Uncaught exception 'Exception' with message 'PHPUnit suppresses exceptions thrown outside of test case function' in %s:%i
+Stack trace:
+%a
diff --git a/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php
new file mode 100644
index 0000000000000000000000000000000000000000..70ef27d1a6e5773dd556ac352b1b64f0329661e8
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Regression/GitHub/873/Issue873Test.php
@@ -0,0 +1,9 @@
+<?php
+
+    if (extension_loaded('xdebug')) {
+        xdebug_disable();
+    }
+
+    throw new Exception(
+      'PHPUnit suppresses exceptions thrown outside of test case function'
+    );
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/Tests/Runner/BaseTestRunnerTest.php b/core/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
similarity index 85%
rename from core/vendor/phpunit/phpunit/Tests/Runner/BaseTestRunnerTest.php
rename to core/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
index 5d84d0e03b4a83f566967679e83fd713c5ac0947..77e3854568ba74b69677bff3506f7acdb0787c6d 100644
--- a/core/vendor/phpunit/phpunit/Tests/Runner/BaseTestRunnerTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Runner/BaseTestRunnerTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,24 +36,22 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.0.0
  */
 
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MockRunner.php';
-require_once dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'NonStatic.php';
-
 /**
  *
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.0.0
+ * @covers     PHPUnit_Runner_BaseTestRunner
  */
 class Runner_BaseTestRunnerTest extends PHPUnit_Framework_TestCase
 {
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/abstract-test-class.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt
similarity index 75%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/abstract-test-class.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt
index c54fc472264127bb6dab3259c71051e1da089870..42ff953a6b9722f3061f6ada1b0fe57e7793d69b 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/abstract-test-class.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/abstract-test-class.phpt
@@ -2,13 +2,11 @@
 phpunit AbstractTest ../_files/AbstractTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'AbstractTest';
 $_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/AbstractTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,15 +14,12 @@ PHPUnit %s by Sebastian Bergmann.
 
 F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
 1) Warning
 Cannot instantiate class "AbstractTest".
 
-%s:%i
-
 FAILURES!
 Tests: 1, Assertions: 0, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/concrete-test-class.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt
similarity index 71%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/concrete-test-class.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt
index a46e9c4cf03bf6384c532db1e3fb6facdb005c04..f27530bb66d68147a8c110cd91a5ada17bb5d493 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/concrete-test-class.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/concrete-test-class.phpt
@@ -2,13 +2,11 @@
 phpunit ConcreteTest ../_files/ConcreteTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'ConcreteTest';
 $_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/ConcreteTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,7 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (2 tests, 0 assertions)
-
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..a73d0ac9b5fa3fd00c08cb6e1ce806cca432bd8b
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-debug.phpt
@@ -0,0 +1,29 @@
+--TEST--
+phpunit -c ../_files/configuration.custom-printer.xml --debug BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '-c';
+$_SERVER['argv'][2] = dirname(__FILE__).'/../_files/configuration.custom-printer.xml';
+$_SERVER['argv'][3] = '--debug';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Configuration read from %s/configuration.custom-printer.xml
+
+
+Starting test 'BankAccountTest::testBalanceIsInitiallyZero'.
+.
+Starting test 'BankAccountTest::testBalanceCannotBecomeNegative'.
+.
+Starting test 'BankAccountTest::testBalanceCannotBecomeNegative2'.
+.
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..4528e397d6fc5ee233c9ce858bfad8aac6d70541
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/custom-printer-verbose.phpt
@@ -0,0 +1,31 @@
+--TEST--
+phpunit -c ../_files/configuration.custom-printer.xml --verbose IncompleteTest ../_files/IncompleteTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '-c';
+$_SERVER['argv'][2] = dirname(__FILE__).'/../_files/configuration.custom-printer.xml';
+$_SERVER['argv'][3] = '--verbose';
+$_SERVER['argv'][4] = 'IncompleteTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/IncompleteTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+Configuration read from %s/configuration.custom-printer.xml
+
+I
+
+Time: %s, Memory: %sMb
+
+There was 1 incomplete test:
+
+1) IncompleteTest::testIncomplete
+Test incomplete
+
+%s
+
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Incomplete: 1.
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-log-xml-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
similarity index 91%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-log-xml-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
index 1d34333ae8ce31a60e0955be0de03ec2bbf8f06a..bb8c55f14995dd574d6e4139e637caa2cead3803 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-log-xml-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml-isolation.phpt
@@ -2,8 +2,6 @@
 phpunit --process-isolation --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = '--log-junit';
@@ -11,7 +9,7 @@ $_SERVER['argv'][4] = 'php://stdout';
 $_SERVER['argv'][5] = 'DataProviderTest';
 $_SERVER['argv'][6] = dirname(dirname(__FILE__)) . '/_files/DataProviderTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -36,14 +34,14 @@ Failed asserting that 2 matches expected 3.
 </testsuites>
 
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
 1) DataProviderTest::testAdd with data set #2 (1, 1, 3)
 Failed asserting that 2 matches expected 3.
+
 %s:%i
 
 FAILURES!
 Tests: 4, Assertions: 4, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-log-xml.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt
similarity index 90%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-log-xml.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt
index ce9175326dde96de22746186e3984eef00a9fae0..fa7287c3bb0fd5192b257c8a2717486371e88961 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-log-xml.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-log-xml.phpt
@@ -2,15 +2,13 @@
 phpunit --log-junit php://stdout DataProviderTest ../_files/DataProviderTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--log-junit';
 $_SERVER['argv'][3] = 'php://stdout';
 $_SERVER['argv'][4] = 'DataProviderTest';
 $_SERVER['argv'][5] = dirname(dirname(__FILE__)) . '/_files/DataProviderTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -26,7 +24,6 @@ PHPUnit %s by Sebastian Bergmann.
         <failure type="PHPUnit_Framework_ExpectationFailedException">DataProviderTest::testAdd with data set #2 (1, 1, 3)
 Failed asserting that 2 matches expected 3.
 
-%s:%i
 %s:%i
 </failure>
       </testcase>
@@ -36,15 +33,14 @@ Failed asserting that 2 matches expected 3.
 </testsuites>
 
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
 1) DataProviderTest::testAdd with data set #2 (1, 1, 3)
 Failed asserting that 2 matches expected 3.
-%s:%i
+
 %s:%i
 
 FAILURES!
 Tests: 4, Assertions: 4, Failures: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-testdox.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt
similarity index 78%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-testdox.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt
index a9f608420e18f8fc547ba6eac0b65224e6a9375f..b3544c2fcc47631aad4e493a83d36b8298484ccb 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dataprovider-testdox.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dataprovider-testdox.phpt
@@ -2,14 +2,12 @@
 phpunit --testdox DataProviderTest ../_files/DataProviderTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--testdox';
 $_SERVER['argv'][3] = 'DataProviderTest';
 $_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/DataProviderTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/debug.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/debug.phpt
similarity index 81%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/debug.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/debug.phpt
index 842c59dfdd47ad2d7596d44018334e3351f37d8a..7be7b39fc91968feacf8aebd995cfa128c1c806c 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/debug.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/debug.phpt
@@ -2,14 +2,12 @@
 phpunit --debug BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--debug';
 $_SERVER['argv'][3] = 'BankAccountTest';
 $_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -23,6 +21,6 @@ Starting test 'BankAccountTest::testBalanceCannotBecomeNegative'.
 Starting test 'BankAccountTest::testBalanceCannotBecomeNegative2'.
 .
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/default-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt
similarity index 75%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/default-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt
index a18cbe5a74262ec1c5f834d5d86086fe82841c79..210cdfb595bcac8730de15918884ba11657e7188 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/default-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/default-isolation.phpt
@@ -2,14 +2,12 @@
 phpunit --process-isolation BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'BankAccountTest';
 $_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,6 +15,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/default.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/default.phpt
similarity index 71%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/default.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/default.phpt
index 9e010ede38d1579cb3112aeed2bd684a0f115bf3..73da9152cc5272321de7b2d763f1c3d23b13328f 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/default.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/default.phpt
@@ -2,13 +2,11 @@
 phpunit BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'BankAccountTest';
 $_SERVER['argv'][3] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,6 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt
similarity index 84%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dependencies-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt
index f03170ad887527ab51738b622d2972e14a7ab3e1..08817b86bcf1c5ee8d6ab55814c2a7d3c8de0666 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies-isolation.phpt
@@ -2,15 +2,13 @@
 phpunit --process-isolation --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = '--verbose';
 $_SERVER['argv'][4] = 'DependencyTestSuite';
 $_SERVER['argv'][5] = dirname(dirname(__FILE__)) . '/_files/DependencyTestSuite.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -18,7 +16,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...FSS
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
@@ -26,17 +24,15 @@ There was 1 failure:
 
 %s:%i
 
+--
+
 There were 2 skipped tests:
 
 1) DependencyFailureTest::testTwo
 This test depends on "DependencyFailureTest::testOne" to pass.
 
-%s:%i
-
 2) DependencyFailureTest::testThree
 This test depends on "DependencyFailureTest::testTwo" to pass.
 
-%s:%i
-
 FAILURES!
 Tests: 4, Assertions: 0, Failures: 1, Skipped: 2.
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dependencies.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt
index 39dd9be05bfe1456b2521befe6cb9be85bc6f38e..d95baccbbe9dff9dfc82c5fd357590dd77bf4733 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies.phpt
@@ -2,14 +2,12 @@
 phpunit --verbose DependencyTestSuite ../_files/DependencyTestSuite.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--verbose';
 $_SERVER['argv'][3] = 'DependencyTestSuite';
 $_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/DependencyTestSuite.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,26 +15,23 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...FSS
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
 1) DependencyFailureTest::testOne
 
-%s:%i
 %s:%i
 
+--
+
 There were 2 skipped tests:
 
 1) DependencyFailureTest::testTwo
 This test depends on "DependencyFailureTest::testOne" to pass.
 
-%s:%i
-
 2) DependencyFailureTest::testThree
 This test depends on "DependencyFailureTest::testTwo" to pass.
 
-%s:%i
-
 FAILURES!
 Tests: 4, Assertions: 0, Failures: 1, Skipped: 2.
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies2-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt
similarity index 74%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dependencies2-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt
index 5f9465733c65256db1dcbe5720de218d5cb399e1..45c2d60506d43003cf04eb1bd16d372b0c2b09d6 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies2-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies2-isolation.phpt
@@ -2,14 +2,12 @@
 phpunit --process-isolation StackTest ../_files/StackTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'StackTest';
 $_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/StackTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,7 +15,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (2 tests, 5 assertions)
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies2.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt
similarity index 70%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dependencies2.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt
index 92c109e87eff42e6c6bbfaefab3b6d0fe9bc3fbc..5fe5f3990449b456236e79a1e97778aa0ea95cbd 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies2.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies2.phpt
@@ -2,13 +2,11 @@
 phpunit StackTest ../_files/StackTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'StackTest';
 $_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/StackTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,7 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (2 tests, 5 assertions)
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies3-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt
similarity index 76%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dependencies3-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt
index 5191dc9ff84f2335ef3e82997b8d2e57710d69b2..7981df0ec88443c3218c7064d4b809f68b0dbddc 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies3-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies3-isolation.phpt
@@ -2,14 +2,12 @@
 phpunit --process-isolation MultiDependencyTest ../_files/MultiDependencyTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'MultiDependencyTest';
 $_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/MultiDependencyTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,7 +15,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 2 assertions)
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies3.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt
similarity index 73%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/dependencies3.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt
index 562b8e4c0e0ec83e7f43bb8a37196c2cd5a16e9e..4b7ba743f8793ad945bc9c5ef25c423388bffcb1 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/dependencies3.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/dependencies3.phpt
@@ -2,13 +2,11 @@
 phpunit MultiDependencyTest ../_files/MultiDependencyTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'MultiDependencyTest';
 $_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/MultiDependencyTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,6 +14,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 2 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/empty-testcase.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt
similarity index 76%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/empty-testcase.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt
index d8e4a64437c5716276bd8a41b73c1477234425d7..6538c47bb95bb11f85e851370ea1e2cf1c67948a 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/empty-testcase.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/empty-testcase.phpt
@@ -2,13 +2,11 @@
 phpunit EmptyTestCaseTest ../_files/EmptyTestCaseTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'EmptyTestCaseTest';
 $_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/EmptyTestCaseTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,14 +14,12 @@ PHPUnit %s by Sebastian Bergmann.
 
 F
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 failure:
 
 1) Warning
 No tests found in class "EmptyTestCaseTest".
 
-%s:%i
-
 FAILURES!
 Tests: 1, Assertions: 0, Failures: 1.
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/exception-stack.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
similarity index 72%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/exception-stack.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
index 9f3704d9c8ce0ba7e262b6fd9c5b5afece8e1863..9d81da414f2114c9ef4ec53626433404564c4741 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/exception-stack.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/exception-stack.phpt
@@ -1,12 +1,12 @@
 --TEST--
-phpunit ExceptionStackTest ../_files/ExceptionStack.php
+phpunit ExceptionStackTest ../_files/ExceptionStackTest.php
 --FILE--
 <?php
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'ExceptionStackTest';
-$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/ExceptionStack.php';
+$_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/ExceptionStackTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -14,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 EE
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There were 2 errors:
 
@@ -30,9 +30,21 @@ Failed asserting that two arrays are equal.
 +    0 => 2
  )
 
+
+%s:%i
 %s:%i
 
 Caused by
+message
+Failed asserting that two arrays are equal.
+--- Expected
++++ Actual
+@@ @@
+ Array (
+-    0 => 1
++    0 => 2
+ )
+
 %s:%i
 
 2) ExceptionStackTest::testNestedExceptions
@@ -52,4 +64,3 @@ Exception: Three
 
 FAILURES!
 Tests: 2, Assertions: 1, Errors: 2.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/exclude-group-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt
similarity index 79%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/exclude-group-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt
index c8ebbce216db42090cc6862d511134d6c8c217fa..01189e16b65efc210af3ad93a539ca1e558eeb54 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/exclude-group-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/exclude-group-isolation.phpt
@@ -2,8 +2,6 @@
 phpunit --process-isolation --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = '--exclude-group';
@@ -11,7 +9,7 @@ $_SERVER['argv'][4] = 'balanceIsInitiallyZero';
 $_SERVER['argv'][5] = 'BankAccountTest';
 $_SERVER['argv'][6] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -19,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (2 tests, 2 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/exclude-group.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt
similarity index 77%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/exclude-group.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt
index fa88b5e61f701f48ccc6a956a1d75c344dfaf7a3..ad3022e810a9c3515359d0697d34a3ab2a2d126a 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/exclude-group.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/exclude-group.phpt
@@ -2,15 +2,13 @@
 phpunit --exclude-group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--exclude-group';
 $_SERVER['argv'][3] = 'balanceIsInitiallyZero';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -18,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ..
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (2 tests, 2 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/failure-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt
similarity index 94%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/failure-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt
index 1f78cd7e75bc6d3ae6195654a26134dc9eaa60ff..686cfd3bb7a40fa6e12768f7d5bfc5ac8f50e7be 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/failure-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/failure-isolation.phpt
@@ -2,14 +2,12 @@
 phpunit --process-isolation FailureTest ../_files/FailureTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'FailureTest';
 $_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/FailureTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 FFFFFFFFFFFFF
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There were 13 failures:
 
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/failure.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/failure.phpt
similarity index 94%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/failure.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/failure.phpt
index a341865170dc968b22e4d681e303311ef668fbce..453f841dccdfa0e0634990c2eea5f157e53df15e 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/failure.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/failure.phpt
@@ -2,13 +2,11 @@
 phpunit FailureTest ../_files/FailureTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'FailureTest';
 $_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/FailureTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,7 +14,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 FFFFFFFFFFFFF
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There were 13 failures:
 
@@ -141,4 +139,3 @@ Failed asserting that format description matches text.
 
 FAILURES!
 Tests: 13, Assertions: 14, Failures: 13.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/fatal-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt
similarity index 69%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/fatal-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt
index 3eeb0f31352897510ad200ca2ba6ebf5e36b8e47..0a28dc85c3c42de479bc427d225f69a52424aad2 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/fatal-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/fatal-isolation.phpt
@@ -2,13 +2,12 @@
 phpunit FatalTest ../_files/FatalTest.php
 --FILE--
 <?php
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = 'FatalTest';
 $_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/FatalTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -16,14 +15,12 @@ PHPUnit %s by Sebastian Bergmann.
 
 E
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 There was 1 error:
 
 1) FatalTest::testFatalError
-PHPUnit_Framework_Exception: %s error: Call to undefined function non_existing_function() in %s
-
+%s
 
 FAILURES!
 Tests: 1, Assertions: 0, Errors: 1.
-
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/fatal.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/fatal.phpt
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/fatal.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/fatal.phpt
index da1955701bf7b8c7bc997762966165fed9796533..c1bb7bf2a1d027f1ecb842676fe8f720f41a9e5d 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/fatal.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/fatal.phpt
@@ -2,12 +2,11 @@
 phpunit FatalTest ../_files/FatalTest.php
 --FILE--
 <?php
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = 'FatalTest';
 $_SERVER['argv'][3] = dirname(dirname(__FILE__)) . '/_files/FatalTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-class-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt
similarity index 78%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/filter-class-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt
index 85fff4e04cbc1b874535464603f4edeb0e2d9ecc..63af89e82d32467b22fe925761a3841cf81f75bc 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-class-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-class-isolation.phpt
@@ -2,8 +2,6 @@
 phpunit --process-isolation --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = '--filter';
@@ -11,7 +9,7 @@ $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = 'BankAccountTest';
 $_SERVER['argv'][6] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -19,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-class.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt
similarity index 76%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/filter-class.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt
index 459cf28fdad14b6a485b245d6e8f4e5e6e1a47e0..e75e87ae868bfb802a9fdff0cdc4d2c16a7605b0 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-class.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-class.phpt
@@ -2,15 +2,13 @@
 phpunit --filter BankAccountTest BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--filter';
 $_SERVER['argv'][3] = 'BankAccountTest';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -18,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..b76bfadef5a82c01bcab6f9f7d2f0a1485be4042
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'DataProviderFilterTest#1-3';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..f80e9b1115ada605ba584cfdc2ae5c5a828f14b3
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-classname-and-range.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter DataProviderFilterTest#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'DataProviderFilterTest#1-3';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..364378c3414193d6485efc970321b29356ae078f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testTrue#3';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..8279e81a6833568c483a1a2f8969566296672684
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-number.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testTrue#3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testTrue#3';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..3937ada7eec9abd0bc1b5017fbd103c764056982
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = '#1-3';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..8317b45884abe7371a75b6aeaef688161724fc6c
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-range.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter \#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = '#1-3';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..a753566bb43f6715c80be53294bb26a1c59f8f0c
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = '@false.*';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..a868011b7264513e0ff788f14d0f835e15c5a54b
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-regexp.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter @false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = '@false.*';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..ec2a8fa19e75779fa309a2f719c8b1c65043781c
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = '@false test';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..496ed231133941a68596d61157ea55944adc1bdd
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-only-string.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter @false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = '@false test';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..f1467b9ec8048f294d5351f50bee91276f60cf1e
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testTrue#1-3';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..759e120800ec2922fd0c48c7118d472bbfc4c956
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-range.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testTrue#1-3 DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testTrue#1-3';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+...
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..136e056902f75d28ba2de38fa3ae8bc1a5f19476
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testFalse@false.*';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..5db30b1da9a47edf0eff859d87d7edcef1179622
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-regexp.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testFalse@false.* DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testFalse@false.*';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+..
+
+Time: %s, Memory: %sMb
+
+OK (2 tests, 2 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..521a58ef0869a727095bf5487c0536f85ceff27f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation --filter testFalse@false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '--filter';
+$_SERVER['argv'][4] = 'testFalse@false test';
+$_SERVER['argv'][5] = 'DataProviderFilterTest';
+$_SERVER['argv'][6] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..bbf955f18a924be73bc36ecd39dc7cedfddaeee9
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-dataprovider-by-string.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --filter testFalse@false\ test DataProviderFilterTest ../_files/DataProviderFilterTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--filter';
+$_SERVER['argv'][3] = 'testFalse@false test';
+$_SERVER['argv'][4] = 'DataProviderFilterTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/DataProviderFilterTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-method-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt
similarity index 79%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/filter-method-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt
index aede5553d0693e5caf4d2ac11d2e328f3c7fba38..643c8dab0a1f3c9bb40a388d6f1576d8fec7bcc2 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-method-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-method-isolation.phpt
@@ -2,8 +2,6 @@
 phpunit --process-isolation --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = '--filter';
@@ -11,7 +9,7 @@ $_SERVER['argv'][4] = 'testBalanceIsInitiallyZero';
 $_SERVER['argv'][5] = 'BankAccountTest';
 $_SERVER['argv'][6] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -19,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 .
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-method.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt
similarity index 77%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/filter-method.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt
index e553a030fb7dad4e295fb607bbb156c5af13f686..ec3e0a0036ea9c32ad1d39b8586912cdcdb8779c 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-method.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-method.phpt
@@ -2,15 +2,13 @@
 phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--filter';
 $_SERVER['argv'][3] = 'testBalanceIsInitiallyZero';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -18,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 .
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-no-results.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt
similarity index 76%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/filter-no-results.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt
index 03f69957fd9bef34fa47819e04c17683edaf318b..b917f5c28a9e753b4821d69fc4347b9d765f0149 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/filter-no-results.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/filter-no-results.phpt
@@ -2,15 +2,13 @@
 phpunit --filter testBalanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--filter';
 $_SERVER['argv'][3] = 'doesNotExist';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -18,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 No tests executed!
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/group-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt
similarity index 79%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/group-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt
index 5abbadac92a263bbf27c79c48c710c631f35902c..fc79220b4f83e7d7b583acfba4316f7a6cd6c01d 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/group-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/group-isolation.phpt
@@ -2,8 +2,6 @@
 phpunit --process-isolation --group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--process-isolation';
 $_SERVER['argv'][3] = '--group';
@@ -11,7 +9,7 @@ $_SERVER['argv'][4] = 'balanceIsInitiallyZero';
 $_SERVER['argv'][5] = 'BankAccountTest';
 $_SERVER['argv'][6] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -19,6 +17,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 .
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/group.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/group.phpt
similarity index 76%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/group.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/group.phpt
index 77003f2e6b570e2f0b070806b8b61cc4faa283a4..56f488f635e822aefd7fa1ce9d5e08f89aedab70 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/group.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/group.phpt
@@ -2,15 +2,13 @@
 phpunit --group balanceIsInitiallyZero BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--group';
 $_SERVER['argv'][3] = 'balanceIsInitiallyZero';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -18,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 .
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/help.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/help.phpt
similarity index 73%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/help.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/help.phpt
index 7a5ce43539c281cd99686bb9a39f67179d1f1ca9..e0a0ec800d82aaae3dd79010cc72b375832a6927 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/help.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/help.phpt
@@ -2,32 +2,37 @@
 phpunit
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann.
 
-Usage: phpunit [switches] UnitTest [UnitTest.php]
-       phpunit [switches] <directory>
+Usage: phpunit [options] UnitTest [UnitTest.php]
+       phpunit [options] <directory>
 
-  --log-junit <file>        Log test execution in JUnit XML format to file.
-  --log-tap <file>          Log test execution in TAP format to file.
-  --log-json <file>         Log test execution in JSON format.
+Code Coverage Options:
 
   --coverage-clover <file>  Generate code coverage report in Clover XML format.
+  --coverage-crap4j <file>  Generate code coverage report in Crap4J XML format.
   --coverage-html <dir>     Generate code coverage report in HTML format.
-  --coverage-php <file>     Serialize PHP_CodeCoverage object to file.
+  --coverage-php <file>     Export PHP_CodeCoverage object to file.
   --coverage-text=<file>    Generate code coverage report in text format.
-                            Default to writing to the standard output.
+                            Default: Standard output.
+  --coverage-xml <dir>      Generate code coverage report in PHPUnit XML format.
 
+Logging Options:
+
+  --log-junit <file>        Log test execution in JUnit XML format to file.
+  --log-tap <file>          Log test execution in TAP format to file.
+  --log-json <file>         Log test execution in JSON format.
   --testdox-html <file>     Write agile documentation in HTML format to file.
   --testdox-text <file>     Write agile documentation in Text format to file.
 
+Test Selection Options:
+
   --filter <pattern>        Filter which tests to run.
   --testsuite <pattern>     Filter which testsuite to run.
   --group ...               Only runs tests from the specified group(s).
@@ -36,26 +41,35 @@ Usage: phpunit [switches] UnitTest [UnitTest.php]
   --test-suffix ...         Only search for test in files with specified
                             suffix(es). Default: Test.php,.phpt
 
-  --loader <loader>         TestSuiteLoader implementation to use.
-  --printer <printer>       TestSuiteListener implementation to use.
-  --repeat <times>          Runs the test(s) repeatedly.
+Test Execution Options:
 
-  --tap                     Report test execution progress in TAP format.
-  --testdox                 Report test execution progress in TestDox format.
+  --report-useless-tests    Be strict about tests that do not test anything.
+  --strict-coverage         Be strict about unintentionally covered code.
+  --disallow-test-output    Be strict about output during tests.
+  --enforce-time-limit      Enforce time limit based on test size.
+  --strict                  Run tests in strict mode (enables all of the above).
+
+  --process-isolation       Run each test in a separate PHP process.
+  --no-globals-backup       Do not backup and restore $GLOBALS for each test.
+  --static-backup           Backup and restore static attributes for each test.
 
   --colors                  Use colors in output.
   --stderr                  Write to STDERR instead of STDOUT.
   --stop-on-error           Stop execution upon first error.
   --stop-on-failure         Stop execution upon first error or failure.
+  --stop-on-risky           Stop execution upon first risky test.
   --stop-on-skipped         Stop execution upon first skipped test.
   --stop-on-incomplete      Stop execution upon first incomplete test.
-  --strict                  Run tests in strict mode.
   -v|--verbose              Output more verbose information.
   --debug                   Display debugging information during test execution.
 
-  --process-isolation       Run each test in a separate PHP process.
-  --no-globals-backup       Do not backup and restore $GLOBALS for each test.
-  --static-backup           Backup and restore static attributes for each test.
+  --loader <loader>         TestSuiteLoader implementation to use.
+  --repeat <times>          Runs the test(s) repeatedly.
+  --tap                     Report test execution progress in TAP format.
+  --testdox                 Report test execution progress in TestDox format.
+  --printer <printer>       TestSuiteListener implementation to use.
+
+Configuration Options:
 
   --bootstrap <file>        A "bootstrap" PHP file that is run before the tests.
   -c|--configuration <file> Read configuration from XML file.
@@ -63,5 +77,7 @@ Usage: phpunit [switches] UnitTest [UnitTest.php]
   --include-path <path(s)>  Prepend PHP's include_path with given path(s).
   -d key[=value]            Sets a php.ini value.
 
+Miscellaneous Options:
+
   -h|--help                 Prints this usage information.
   --version                 Prints the version and exits.
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/help2.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/help2.phpt
similarity index 74%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/help2.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/help2.phpt
index 9f3d3091765e0a8bad7db8abd557cf920c94249c..0e1297a1f4c0fb6a8069e4c2d627cc6883baacf4 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/help2.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/help2.phpt
@@ -2,33 +2,38 @@
 phpunit --help
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--help';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann.
 
-Usage: phpunit [switches] UnitTest [UnitTest.php]
-       phpunit [switches] <directory>
+Usage: phpunit [options] UnitTest [UnitTest.php]
+       phpunit [options] <directory>
 
-  --log-junit <file>        Log test execution in JUnit XML format to file.
-  --log-tap <file>          Log test execution in TAP format to file.
-  --log-json <file>         Log test execution in JSON format.
+Code Coverage Options:
 
   --coverage-clover <file>  Generate code coverage report in Clover XML format.
+  --coverage-crap4j <file>  Generate code coverage report in Crap4J XML format.
   --coverage-html <dir>     Generate code coverage report in HTML format.
-  --coverage-php <file>     Serialize PHP_CodeCoverage object to file.
+  --coverage-php <file>     Export PHP_CodeCoverage object to file.
   --coverage-text=<file>    Generate code coverage report in text format.
-                            Default to writing to the standard output.
+                            Default: Standard output.
+  --coverage-xml <dir>      Generate code coverage report in PHPUnit XML format.
 
+Logging Options:
+
+  --log-junit <file>        Log test execution in JUnit XML format to file.
+  --log-tap <file>          Log test execution in TAP format to file.
+  --log-json <file>         Log test execution in JSON format.
   --testdox-html <file>     Write agile documentation in HTML format to file.
   --testdox-text <file>     Write agile documentation in Text format to file.
 
+Test Selection Options:
+
   --filter <pattern>        Filter which tests to run.
   --testsuite <pattern>     Filter which testsuite to run.
   --group ...               Only runs tests from the specified group(s).
@@ -37,26 +42,35 @@ Usage: phpunit [switches] UnitTest [UnitTest.php]
   --test-suffix ...         Only search for test in files with specified
                             suffix(es). Default: Test.php,.phpt
 
-  --loader <loader>         TestSuiteLoader implementation to use.
-  --printer <printer>       TestSuiteListener implementation to use.
-  --repeat <times>          Runs the test(s) repeatedly.
+Test Execution Options:
 
-  --tap                     Report test execution progress in TAP format.
-  --testdox                 Report test execution progress in TestDox format.
+  --report-useless-tests    Be strict about tests that do not test anything.
+  --strict-coverage         Be strict about unintentionally covered code.
+  --disallow-test-output    Be strict about output during tests.
+  --enforce-time-limit      Enforce time limit based on test size.
+  --strict                  Run tests in strict mode (enables all of the above).
+
+  --process-isolation       Run each test in a separate PHP process.
+  --no-globals-backup       Do not backup and restore $GLOBALS for each test.
+  --static-backup           Backup and restore static attributes for each test.
 
   --colors                  Use colors in output.
   --stderr                  Write to STDERR instead of STDOUT.
   --stop-on-error           Stop execution upon first error.
   --stop-on-failure         Stop execution upon first error or failure.
+  --stop-on-risky           Stop execution upon first risky test.
   --stop-on-skipped         Stop execution upon first skipped test.
   --stop-on-incomplete      Stop execution upon first incomplete test.
-  --strict                  Run tests in strict mode.
   -v|--verbose              Output more verbose information.
   --debug                   Display debugging information during test execution.
 
-  --process-isolation       Run each test in a separate PHP process.
-  --no-globals-backup       Do not backup and restore $GLOBALS for each test.
-  --static-backup           Backup and restore static attributes for each test.
+  --loader <loader>         TestSuiteLoader implementation to use.
+  --repeat <times>          Runs the test(s) repeatedly.
+  --tap                     Report test execution progress in TAP format.
+  --testdox                 Report test execution progress in TestDox format.
+  --printer <printer>       TestSuiteListener implementation to use.
+
+Configuration Options:
 
   --bootstrap <file>        A "bootstrap" PHP file that is run before the tests.
   -c|--configuration <file> Read configuration from XML file.
@@ -64,5 +78,7 @@ Usage: phpunit [switches] UnitTest [UnitTest.php]
   --include-path <path(s)>  Prepend PHP's include_path with given path(s).
   -d key[=value]            Sets a php.ini value.
 
+Miscellaneous Options:
+
   -h|--help                 Prints this usage information.
   --version                 Prints the version and exits.
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..824da279d465f80e652260f4dabf529f7ab9265f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/ini-isolation.phpt
@@ -0,0 +1,22 @@
+--TEST--
+phpunit --process-isolation -d default_mimetype=application/x-test IniTest ../_files/IniTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--process-isolation';
+$_SERVER['argv'][3] = '-d';
+$_SERVER['argv'][4] = 'default_mimetype=application/x-test';
+$_SERVER['argv'][5] = 'IniTest';
+$_SERVER['argv'][6] = dirname(dirname(__FILE__)) . '/_files/IniTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.
+
+Time: %s, Memory: %sMb
+
+OK (1 test, 1 assertion)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/list-groups.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/list-groups.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt
index 5b07ed0e5730dc2c0484c0dc6bf7cb8d3bcb91f6..f95d779390f0b8a7ee5d5be5b9d5ffd1e89adcc7 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/list-groups.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/list-groups.phpt
@@ -2,14 +2,12 @@
 phpunit --list-groups BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--list-groups';
 $_SERVER['argv'][3] = 'BankAccountTest';
 $_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..24181aef4a3ec8afea9af48f0a59f1f8d735ac50
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-5.3.phpt
@@ -0,0 +1,25 @@
+--TEST--
+phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
+--SKIPIF--
+<?php
+if (version_compare(PHP_VERSION, '5.4.0') >= 0) print 'skip: PHP < 5.4 required';
+?>
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-json';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+{"event":"suiteStart","suite":"BankAccountTest","tests":3}{"event":"testStart","suite":"BankAccountTest","test":"BankAccountTest::testBalanceIsInitiallyZero"}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceIsInitiallyZero","status":"pass","time":%f,"trace":[],"message":"","output":""}{"event":"testStart","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative"}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative","status":"pass","time":%f,"trace":[],"message":"","output":""}{"event":"testStart","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative2"}.{"event":"test","suite":"BankAccountTest","test":"BankAccountTest::testBalanceCannotBecomeNegative2","status":"pass","time":%f,"trace":[],"message":"","output":""}
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..dce85c2bd8ec3f53a5d703127e6fcfffe76f7d47
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-post-66021.phpt
@@ -0,0 +1,71 @@
+--TEST--
+phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
+--SKIPIF--
+<?php
+if (!((version_compare(PHP_VERSION, '5.4.28', '>=') && version_compare(PHP_VERSION, '5.5', '<')) ||
+    (version_compare(PHP_VERSION, '5.5.12', '>=') && version_compare(PHP_VERSION, '5.6', '<')) ||
+    version_compare(PHP_VERSION, '5.6.0beta2', '>=')) || defined('HHVM_VERSION'))
+    print "skip: PHP 5.4.(28+) or PHP 5.5.(12+) or PHP 5.6.0beta2+ required";
+?>
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--log-json';
+$_SERVER['argv'][3] = 'php://stdout';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+{
+    "event": "suiteStart",
+    "suite": "BankAccountTest",
+    "tests": 3
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceIsInitiallyZero"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceIsInitiallyZero",
+    "status": "pass",
+    "time": %f,
+    "trace": [],
+    "message": "",
+    "output": ""
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative",
+    "status": "pass",
+    "time": %f,
+    "trace": [],
+    "message": "",
+    "output": ""
+}{
+    "event": "testStart",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative2"
+}.{
+    "event": "test",
+    "suite": "BankAccountTest",
+    "test": "BankAccountTest::testBalanceCannotBecomeNegative2",
+    "status": "pass",
+    "time": %f,
+    "trace": [],
+    "message": "",
+    "output": ""
+}
+
+Time: %s, Memory: %sMb
+
+OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/log-json.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
similarity index 75%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/log-json.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
index dcc348e7605c0b9b93705a9cb67468abfadfb71d..3e42e1696cee4051c9e501718ef75248b2578379 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/log-json.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-json-pre-66021.phpt
@@ -2,20 +2,21 @@
 phpunit --log-json php://stdout BankAccountTest ../_files/BankAccountTest.php
 --SKIPIF--
 <?php
-if (!defined("JSON_PRETTY_PRINT")) {
-    echo "Skip: Test requires JSON_PRETTY_PRINT / PHP >= 5.4";
-}
+if (!((version_compare(PHP_VERSION, '5.4', '>=') && version_compare(PHP_VERSION, '5.4.27', '<=')) ||
+    (version_compare(PHP_VERSION, '5.5', '>=') && version_compare(PHP_VERSION, '5.5.11', '<=')) ||
+    (version_compare(PHP_VERSION, '5.6', '>=') && version_compare(PHP_VERSION, '5.6.0beta1', '<=')) ||
+    defined('HHVM_VERSION')))
+    print "skip: PHP 5.4.(0-27) or PHP 5.5.(0-11) or PHP 5.6.(0alpha1-0beta1) or HHVM required";
+?>
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--log-json';
 $_SERVER['argv'][3] = 'php://stdout';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -72,6 +73,6 @@ PHPUnit %s by Sebastian Bergmann.
     "output": ""
 }
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/log-tap.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-tap.phpt
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/log-tap.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/log-tap.phpt
index 1d965a259ca3473e6d532d132f8c5ecb90379660..986dbfe7983a787c7346899524e0f336a034669f 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/log-tap.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-tap.phpt
@@ -2,15 +2,13 @@
 phpunit --log-tap php://stdout BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--log-tap';
 $_SERVER['argv'][3] = 'php://stdout';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -23,6 +21,6 @@ TAP version 13
 1..3
 
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/log-xml.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
similarity index 64%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/log-xml.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
index 2c95fa6668ed932e5fcf484a6daf3f83474d9eed..c1f83fbcc305cce367e7d944c4d34a0c634d6bc9 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/log-xml.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/log-xml.phpt
@@ -2,15 +2,13 @@
 phpunit --log-junit php://stdout BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--log-junit';
 $_SERVER['argv'][3] = 'php://stdout';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -18,14 +16,14 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...<?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-  <testsuite name="BankAccountTest" file="%sBankAccountTest.php" fullPackage="PHPUnit" package="PHPUnit" tests="3" assertions="3" failures="0" errors="0" time="%f">
-    <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%sBankAccountTest.php" line="72" assertions="1" time="%f"/>
-    <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%sBankAccountTest.php" line="82" assertions="1" time="%f"/>
-    <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%sBankAccountTest.php" line="102" assertions="1" time="%f"/>
+  <testsuite name="BankAccountTest" file="%sBankAccountTest.php" tests="3" assertions="3" failures="0" errors="0" time="%f">
+    <testcase name="testBalanceIsInitiallyZero" class="BankAccountTest" file="%sBankAccountTest.php" line="69" assertions="1" time="%f"/>
+    <testcase name="testBalanceCannotBecomeNegative" class="BankAccountTest" file="%sBankAccountTest.php" line="79" assertions="1" time="%f"/>
+    <testcase name="testBalanceCannotBecomeNegative2" class="BankAccountTest" file="%sBankAccountTest.php" line="99" assertions="1" time="%f"/>
   </testsuite>
 </testsuites>
 
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/tests/TextUI/repeat.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/repeat.phpt
new file mode 100644
index 0000000000000000000000000000000000000000..a8dd7e83b49fbf8e2a94c3ba87e59535a2ea7ab2
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/repeat.phpt
@@ -0,0 +1,21 @@
+--TEST--
+phpunit --repeat 3 BankAccountTest ../_files/BankAccountTest.php
+--FILE--
+<?php
+$_SERVER['argv'][1] = '--no-configuration';
+$_SERVER['argv'][2] = '--repeat';
+$_SERVER['argv'][3] = '3';
+$_SERVER['argv'][4] = 'BankAccountTest';
+$_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
+
+require __DIR__ . '/../bootstrap.php';
+PHPUnit_TextUI_Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann.
+
+.........
+
+Time: %s, Memory: %sMb
+
+OK (9 tests, 9 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/strict-incomplete.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/strict-incomplete.phpt
similarity index 70%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/strict-incomplete.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/strict-incomplete.phpt
index 5c4149767291cd9f84384e7b033c5f488e677ea1..de99cdd49ac4b3306d4402ac581bbfa227ca8fb1 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/strict-incomplete.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/strict-incomplete.phpt
@@ -2,14 +2,12 @@
 phpunit --strict IncompleteTest ../_files/IncompleteTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--strict';
 $_SERVER['argv'][3] = 'IncompleteTest';
 $_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/IncompleteTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,7 +15,7 @@ PHPUnit %s by Sebastian Bergmann.
 
 I
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
-OK, but incomplete or skipped tests!
+OK, but incomplete, skipped, or risky tests!
 Tests: 1, Assertions: 0, Incomplete: 1.
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/strict-isolation.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/strict-isolation.phpt
similarity index 66%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/strict-isolation.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/strict-isolation.phpt
index ef0ae374ac9abdb0ec66ba9036f8fa604a753f12..6a6a7cc4bfd73bba28f345fceca83ccfb98f5714 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/strict-isolation.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/strict-isolation.phpt
@@ -2,23 +2,21 @@
 phpunit --strict --process-isolation IncompleteTest ../_files/IncompleteTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--strict';
 $_SERVER['argv'][3] = '--process-isolation';
 $_SERVER['argv'][4] = 'NothingTest';
 $_SERVER['argv'][5] = dirname(dirname(__FILE__)) . '/_files/NothingTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann.
 
-I
+R
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
-OK, but incomplete or skipped tests!
-Tests: 1, Assertions: 0, Incomplete: 1.
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Risky: 1.
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/strict.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/strict.phpt
similarity index 62%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/strict.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/strict.phpt
index f566ef6fa9cf9c0a453f940de9f2a35c652de5f6..d5f2feb5fdf2dfd955f3bd84c4ad76e2be6df186 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/strict.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/strict.phpt
@@ -2,22 +2,20 @@
 phpunit --strict NothingTest ../_files/NothingTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--strict';
 $_SERVER['argv'][3] = 'NothingTest';
 $_SERVER['argv'][4] = dirname(dirname(__FILE__)) . '/_files/NothingTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann.
 
-I
+R
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
-OK, but incomplete or skipped tests!
-Tests: 1, Assertions: 0, Incomplete: 1.
+OK, but incomplete, skipped, or risky tests!
+Tests: 1, Assertions: 0, Risky: 1.
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/tap.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/tap.phpt
similarity index 81%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/tap.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/tap.phpt
index f53708050ac13c42be02eaa8b7bd598cf87220bf..88d855ffc1ac9b04307de2ed7891560f0125924b 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/tap.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/tap.phpt
@@ -2,14 +2,12 @@
 phpunit --tap BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--tap';
 $_SERVER['argv'][3] = 'BankAccountTest';
 $_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/test-suffix-multiple.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt
similarity index 73%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/test-suffix-multiple.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt
index 145ebeb41d9300e07d0709fc69c4e841654ec6ac..0f81cfd7db5079f3788c816cfe88c8bad3218357 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/test-suffix-multiple.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/test-suffix-multiple.phpt
@@ -2,14 +2,12 @@
 phpunit --test-suffix .test.php,.my.php ../_files/
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--test-suffix';
 $_SERVER['argv'][3] = '.test.php,.my.php';
 $_SERVER['argv'][4] = dirname(__FILE__).'/../_files/';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,6 +15,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 .....
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (5 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/test-suffix-single.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt
similarity index 72%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/test-suffix-single.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt
index 4d63efac441578660d19ea833271cd3ddac667a6..db205a2d8b80e682b248962b6049f3595bab60e6 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/test-suffix-single.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/test-suffix-single.phpt
@@ -2,14 +2,12 @@
 phpunit --test-suffix .test.php ../_files/
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--test-suffix';
 $_SERVER['argv'][3] = '.test.php';
 $_SERVER['argv'][4] = dirname(__FILE__).'/../_files/';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -17,6 +15,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 ...
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/testdox-html.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt
similarity index 81%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/testdox-html.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt
index 61de71d7c58872ea447f275a891b9102063ada61..f2b3f93273890c098cc1f95e52e7b19e39bcf04a 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/testdox-html.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/testdox-html.phpt
@@ -2,15 +2,13 @@
 phpunit --testdox-html php://stdout BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--testdox-html';
 $_SERVER['argv'][3] = 'php://stdout';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -18,6 +16,6 @@ PHPUnit %s by Sebastian Bergmann.
 
 <html><body><h2 id="BankAccountTest">BankAccount</h2><ul>...<li>Balance is initially zero</li><li>Balance cannot become negative</li></ul></body></html>
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/testdox-text.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt
similarity index 79%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/testdox-text.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt
index 8a57c817f1a330891a06cc17ccfb734f6a03b3b6..06f34a6b3119d9b815afc145a07f52936e8a5f9c 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/testdox-text.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/testdox-text.phpt
@@ -2,15 +2,13 @@
 phpunit --testdox-text php://stdout BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--testdox-text';
 $_SERVER['argv'][3] = 'php://stdout';
 $_SERVER['argv'][4] = 'BankAccountTest';
 $_SERVER['argv'][5] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
@@ -22,6 +20,6 @@ BankAccount
 
 
 
-Time: %i %s, Memory: %sMb
+Time: %s, Memory: %sMb
 
 OK (3 tests, 3 assertions)
diff --git a/core/vendor/phpunit/phpunit/Tests/TextUI/testdox.phpt b/core/vendor/phpunit/phpunit/tests/TextUI/testdox.phpt
similarity index 80%
rename from core/vendor/phpunit/phpunit/Tests/TextUI/testdox.phpt
rename to core/vendor/phpunit/phpunit/tests/TextUI/testdox.phpt
index 0d24c0e22133c6aa027e4a5ded2d9a37fca5fa33..57e32ff44125a77c5068c23b2f1d4cbc0fc6be63 100644
--- a/core/vendor/phpunit/phpunit/Tests/TextUI/testdox.phpt
+++ b/core/vendor/phpunit/phpunit/tests/TextUI/testdox.phpt
@@ -2,14 +2,12 @@
 phpunit --testdox php://stdout BankAccountTest ../_files/BankAccountTest.php
 --FILE--
 <?php
-define('PHPUNIT_TESTSUITE', TRUE);
-
 $_SERVER['argv'][1] = '--no-configuration';
 $_SERVER['argv'][2] = '--testdox';
 $_SERVER['argv'][3] = 'BankAccountTest';
 $_SERVER['argv'][4] = dirname(__FILE__).'/../_files/BankAccountTest.php';
 
-require_once dirname(dirname(dirname(__FILE__))) . '/PHPUnit/Autoload.php';
+require __DIR__ . '/../bootstrap.php';
 PHPUnit_TextUI_Command::main();
 ?>
 --EXPECTF--
diff --git a/core/vendor/phpunit/phpunit/Tests/Util/ConfigurationTest.php b/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
similarity index 79%
rename from core/vendor/phpunit/phpunit/Tests/Util/ConfigurationTest.php
rename to core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
index 7726496ef4f2d78895a72d63ce3c6e6614daf28b..8d50f1fef48a7ed4da489fbcde7c2e866b839bc9 100644
--- a/core/vendor/phpunit/phpunit/Tests/Util/ConfigurationTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
@@ -47,7 +47,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
@@ -64,6 +64,7 @@ protected function setUp()
     }
 
     /**
+     * @covers PHPUnit_Util_Configuration::getInstance
      * @expectedException PHPUnit_Framework_Exception
      */
     public function testExceptionIsThrownForNotExistingConfigurationFile()
@@ -71,6 +72,9 @@ public function testExceptionIsThrownForNotExistingConfigurationFile()
         PHPUnit_Util_Configuration::getInstance('not_existing_file.xml');
     }
 
+    /**
+     * @covers PHPUnit_Util_Configuration::getFilterConfiguration
+     */
     public function testFilterConfigurationIsReadCorrectly()
     {
         $this->assertEquals(
@@ -114,8 +118,8 @@ public function testFilterConfigurationIsReadCorrectly()
             ),
             'whitelist' =>
             array(
-              'addUncoveredFilesFromWhitelist' => TRUE,
-              'processUncoveredFilesFromWhitelist' => FALSE,
+              'addUncoveredFilesFromWhitelist' => true,
+              'processUncoveredFilesFromWhitelist' => false,
               'include' =>
               array(
                 'directory' =>
@@ -156,6 +160,9 @@ public function testFilterConfigurationIsReadCorrectly()
         );
     }
 
+    /**
+     * @covers PHPUnit_Util_Configuration::getGroupConfiguration
+     */
     public function testGroupConfigurationIsReadCorrectly()
     {
         $this->assertEquals(
@@ -173,6 +180,9 @@ public function testGroupConfigurationIsReadCorrectly()
         );
     }
 
+    /**
+     * @covers PHPUnit_Util_Configuration::getListenerConfiguration
+     */
     public function testListenerConfigurationIsReadCorrectly()
     {
         $dir = __DIR__;
@@ -195,7 +205,7 @@ public function testListenerConfigurationIsReadCorrectly()
                 1 => 22,
                 2 => 'April',
                 3 => 19.78,
-                4 => NULL,
+                4 => null,
                 5 => new stdClass,
                 6 => dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MyTestFile.php',
                 7 => dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'MyRelativePath',
@@ -221,20 +231,21 @@ public function testListenerConfigurationIsReadCorrectly()
         ini_set('include_path', $includePath);
     }
 
+    /**
+     * @covers PHPUnit_Util_Configuration::getLoggingConfiguration
+     */
     public function testLoggingConfigurationIsReadCorrectly()
     {
         $this->assertEquals(
           array(
-            'charset' => 'UTF-8',
-            'lowUpperBound' => '35',
-            'highLowerBound' => '70',
-            'highlight' => FALSE,
+            'lowUpperBound' => '50',
+            'highLowerBound' => '90',
             'coverage-html' => '/tmp/report',
             'coverage-clover' => '/tmp/clover.xml',
             'json' => '/tmp/logfile.json',
             'plain' => '/tmp/logfile.txt',
             'tap' => '/tmp/logfile.tap',
-            'logIncompleteSkipped' => FALSE,
+            'logIncompleteSkipped' => false,
             'junit' => '/tmp/logfile.xml',
             'testdox-html' => '/tmp/testdox.html',
             'testdox-text' => '/tmp/testdox.txt',
@@ -243,6 +254,9 @@ public function testLoggingConfigurationIsReadCorrectly()
         );
     }
 
+    /**
+     * @covers PHPUnit_Util_Configuration::getPHPConfiguration
+     */
     public function testPHPConfigurationIsReadCorrectly()
     {
         $this->assertEquals(
@@ -253,9 +267,9 @@ public function testPHPConfigurationIsReadCorrectly()
               '/path/to/lib'
             ),
             'ini'=> array('foo' => 'bar'),
-            'const'=> array('FOO' => FALSE, 'BAR' => TRUE),
-            'var'=> array('foo' => FALSE),
-            'env'=> array('foo' => TRUE),
+            'const'=> array('FOO' => false, 'BAR' => true),
+            'var'=> array('foo' => false),
+            'env'=> array('foo' => true),
             'post'=> array('foo' => 'bar'),
             'get'=> array('foo' => 'bar'),
             'cookie'=> array('foo' => 'bar'),
@@ -269,6 +283,7 @@ public function testPHPConfigurationIsReadCorrectly()
 
     /**
      * @backupGlobals enabled
+     * @covers PHPUnit_Util_Configuration::handlePHPConfiguration
      */
     public function testPHPConfigurationIsHandledCorrectly()
     {
@@ -276,11 +291,11 @@ public function testPHPConfigurationIsHandledCorrectly()
 
         $path = dirname(__DIR__) . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . '.' . PATH_SEPARATOR . '/path/to/lib';
         $this->assertStringStartsWith($path, ini_get('include_path'));
-        $this->assertEquals(FALSE, FOO);
-        $this->assertEquals(TRUE, BAR);
-        $this->assertEquals(FALSE, $GLOBALS['foo']);
-        $this->assertEquals(TRUE, $_ENV['foo']);
-        $this->assertEquals(TRUE, getenv('foo'));
+        $this->assertEquals(false, FOO);
+        $this->assertEquals(true, BAR);
+        $this->assertEquals(false, $GLOBALS['foo']);
+        $this->assertEquals(true, $_ENV['foo']);
+        $this->assertEquals(true, getenv('foo'));
         $this->assertEquals('bar', $_POST['foo']);
         $this->assertEquals('bar', $_GET['foo']);
         $this->assertEquals('bar', $_COOKIE['foo']);
@@ -289,25 +304,58 @@ public function testPHPConfigurationIsHandledCorrectly()
         $this->assertEquals('bar', $_REQUEST['foo']);
     }
 
+    /**
+     * @backupGlobals enabled
+     * @see https://github.com/sebastianbergmann/phpunit/issues/1181
+     */
+    public function testHandlePHPConfigurationDoesNotOverwrittenExistingEnvArrayVariables()
+    {
+        $_ENV['foo'] = false;
+        $this->configuration->handlePHPConfiguration();
+
+        $this->assertEquals(false, $_ENV['foo']);
+        $this->assertEquals(true, getenv('foo'));
+    }
+
+    /**
+     * @backupGlobals enabled
+     * @see https://github.com/sebastianbergmann/phpunit/issues/1181
+     */
+    public function testHandlePHPConfigurationDoesNotOverriteVariablesFromPutEnv()
+    {
+        putenv('foo=putenv');
+        $this->configuration->handlePHPConfiguration();
+
+        $this->assertEquals(true, $_ENV['foo']);
+        $this->assertEquals('putenv', getenv('foo'));
+    }
+
+    /**
+     * @covers PHPUnit_Util_Configuration::getPHPUnitConfiguration
+     */
     public function testPHPUnitConfigurationIsReadCorrectly()
     {
         $this->assertEquals(
           array(
-            'backupGlobals' => TRUE,
-            'backupStaticAttributes' => FALSE,
+            'backupGlobals' => true,
+            'backupStaticAttributes' => false,
             'bootstrap' => '/path/to/bootstrap.php',
-            'cacheTokens' => FALSE,
-            'colors' => FALSE,
-            'convertErrorsToExceptions' => TRUE,
-            'convertNoticesToExceptions' => TRUE,
-            'convertWarningsToExceptions' => TRUE,
-            'forceCoversAnnotation' => FALSE,
-            'mapTestClassNameToCoveredClassName' => FALSE,
+            'cacheTokens' => false,
+            'colors' => false,
+            'stderr' => false,
+            'convertErrorsToExceptions' => true,
+            'convertNoticesToExceptions' => true,
+            'convertWarningsToExceptions' => true,
+            'forceCoversAnnotation' => false,
+            'mapTestClassNameToCoveredClassName' => false,
             'printerClass' => 'PHPUnit_TextUI_ResultPrinter',
-            'stopOnFailure' => FALSE,
-            'strict' => FALSE,
+            'stopOnFailure' => false,
+            'reportUselessTests' => false,
+            'strictCoverage' => false,
+            'disallowTestOutput' => false,
+            'enforceTimeLimit' => false,
             'testSuiteLoaderClass' => 'PHPUnit_Runner_StandardTestSuiteLoader',
-            'verbose' => FALSE,
+            'verbose' => false,
             'timeoutForSmallTests' => 1,
             'timeoutForMediumTests' => 10,
             'timeoutForLargeTests' => 60
@@ -316,6 +364,9 @@ public function testPHPUnitConfigurationIsReadCorrectly()
         );
     }
 
+    /**
+     * @covers PHPUnit_Util_Configuration::getSeleniumBrowserConfiguration
+     */
     public function testSeleniumBrowserConfigurationIsReadCorrectly()
     {
         $this->assertEquals(
@@ -333,6 +384,9 @@ public function testSeleniumBrowserConfigurationIsReadCorrectly()
         );
     }
 
+    /**
+     * @covers PHPUnit_Util_Configuration::getInstance
+     */
     public function testXincludeInConfiguration()
     {
         $configurationWithXinclude = PHPUnit_Util_Configuration::getInstance(
@@ -358,30 +412,37 @@ protected function assertConfigurationEquals( PHPUnit_Util_Configuration $expect
             $expectedConfiguration->getFilterConfiguration(),
             $actualConfiguration->getFilterConfiguration()
         );
+
         $this->assertEquals(
             $expectedConfiguration->getGroupConfiguration(),
             $actualConfiguration->getGroupConfiguration()
         );
+
         $this->assertEquals(
             $expectedConfiguration->getListenerConfiguration(),
             $actualConfiguration->getListenerConfiguration()
         );
+
         $this->assertEquals(
             $expectedConfiguration->getLoggingConfiguration(),
             $actualConfiguration->getLoggingConfiguration()
         );
+
         $this->assertEquals(
             $expectedConfiguration->getPHPConfiguration(),
             $actualConfiguration->getPHPConfiguration()
         );
+
         $this->assertEquals(
             $expectedConfiguration->getPHPUnitConfiguration(),
             $actualConfiguration->getPHPUnitConfiguration()
         );
+
         $this->assertEquals(
             $expectedConfiguration->getSeleniumBrowserConfiguration(),
             $actualConfiguration->getSeleniumBrowserConfiguration()
         );
+
         $this->assertEquals(
             $expectedConfiguration->getTestSuiteConfiguration(),
             $actualConfiguration->getTestSuiteConfiguration()
diff --git a/core/vendor/phpunit/phpunit/Tests/Util/TestDox/NamePrettifierTest.php b/core/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
similarity index 84%
rename from core/vendor/phpunit/phpunit/Tests/Util/TestDox/NamePrettifierTest.php
rename to core/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
index f87ff769c901ad65e0918ebaab51e56725fba195..d20260f9f91b2c6b3fc67c6327846b53ff4de29f 100644
--- a/core/vendor/phpunit/phpunit/Tests/Util/TestDox/NamePrettifierTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Util/TestDox/NamePrettifierTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -47,7 +47,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.1.0
@@ -61,26 +61,36 @@ protected function setUp()
         $this->namePrettifier = new PHPUnit_Util_TestDox_NamePrettifier;
     }
 
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestClass
+     */
     public function testTitleHasSensibleDefaults()
     {
         $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('FooTest'));
         $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('TestFoo'));
         $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('TestFooTest'));
+        $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('Test\FooTest'));
     }
 
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestClass
+     */
     public function testCaterForUserDefinedSuffix()
     {
         $this->namePrettifier->setSuffix('TestCase');
-        $this->namePrettifier->setPrefix(NULL);
+        $this->namePrettifier->setPrefix(null);
 
         $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('FooTestCase'));
         $this->assertEquals('TestFoo', $this->namePrettifier->prettifyTestClass('TestFoo'));
         $this->assertEquals('FooTest', $this->namePrettifier->prettifyTestClass('FooTest'));
     }
 
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestClass
+     */
     public function testCaterForUserDefinedPrefix()
     {
-        $this->namePrettifier->setSuffix(NULL);
+        $this->namePrettifier->setSuffix(null);
         $this->namePrettifier->setPrefix('XXX');
 
         $this->assertEquals('Foo', $this->namePrettifier->prettifyTestClass('XXXFoo'));
@@ -88,6 +98,9 @@ public function testCaterForUserDefinedPrefix()
         $this->assertEquals('XXX', $this->namePrettifier->prettifyTestClass('XXXXXX'));
     }
 
+    /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestMethod
+     */
     public function testTestNameIsConvertedToASentence()
     {
         $this->assertEquals('This is a test', $this->namePrettifier->prettifyTestMethod('testThisIsATest'));
@@ -98,6 +111,7 @@ public function testTestNameIsConvertedToASentence()
     }
 
     /**
+     * @covers PHPUnit_Util_TestDox_NamePrettifier::prettifyTestMethod
      * @ticket 224
      */
     public function testTestNameIsNotGroupedWhenNotInSequence()
diff --git a/core/vendor/phpunit/phpunit/tests/Util/TestTest.php b/core/vendor/phpunit/phpunit/tests/Util/TestTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..99e55bdcdd4dc99b453b05c3327aa0a179964acd
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/Util/TestTest.php
@@ -0,0 +1,538 @@
+<?php
+/**
+ * PHPUnit
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      File available since Release 3.3.6
+ */
+
+if (!defined('TEST_FILES_PATH')) {
+    define(
+      'TEST_FILES_PATH',
+      dirname(__DIR__) . DIRECTORY_SEPARATOR .
+      '_files' . DIRECTORY_SEPARATOR
+    );
+}
+
+/**
+ *
+ *
+ * @package    PHPUnit
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.phpunit.de/
+ * @since      Class available since Release 3.3.6
+ */
+class Util_TestTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers PHPUnit_Util_Test::getExpectedException
+     * @todo   Split up in separate tests
+     */
+    public function testGetExpectedException()
+    {
+        $this->assertSame(
+          array('class' => 'FooBarBaz', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testOne')
+        );
+
+        $this->assertSame(
+          array('class' => 'Foo_Bar_Baz', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testTwo')
+        );
+
+        $this->assertSame(
+          array('class' => 'Foo\Bar\Baz', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testThree')
+        );
+
+        $this->assertSame(
+          array('class' => 'ほげ', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFour')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => 1234, 'message' => 'Message'),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testFive')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => 1234, 'message' => 'Message'),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSix')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => 'ExceptionCode', 'message' => 'Message'),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSeven')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => 0, 'message' => 'Message'),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testEight')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => ExceptionTest::ERROR_CODE, 'message' => ExceptionTest::ERROR_MESSAGE),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testNine')
+        );
+
+        $this->assertSame(
+          array('class' => 'Class', 'code' => null, 'message' => ''),
+          PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testSingleLine')
+        );
+
+        $this->assertSame(
+            array('class' => 'Class', 'code' => My\Space\ExceptionNamespaceTest::ERROR_CODE, 'message' => My\Space\ExceptionNamespaceTest::ERROR_MESSAGE),
+            PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testConstants')
+        );
+
+        // Ensure the Class::CONST expression is only evaluated when the constant really exists
+        $this->assertSame(
+            array('class' => 'Class', 'code' => 'ExceptionTest::UNKNOWN_CODE_CONSTANT', 'message' => 'ExceptionTest::UNKNOWN_MESSAGE_CONSTANT'),
+            PHPUnit_Util_Test::getExpectedException('ExceptionTest', 'testUnknownConstants')
+        );
+
+        $this->assertSame(
+            array('class' => 'Class', 'code' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_CODE_CONSTANT', 'message' => 'My\Space\ExceptionNamespaceTest::UNKNOWN_MESSAGE_CONSTANT'),
+            PHPUnit_Util_Test::getExpectedException('My\Space\ExceptionNamespaceTest', 'testUnknownConstants')
+        );
+    }
+
+    /**
+     * @covers       PHPUnit_Util_Test::getRequirements
+     * @dataProvider requirementsProvider
+     */
+    public function testGetRequirements($test, $result)
+    {
+        $this->assertEquals(
+          $result,
+          PHPUnit_Util_Test::getRequirements('RequirementsTest', $test)
+        );
+    }
+
+    public function requirementsProvider()
+    {
+        return array(
+            array('testOne',    array()),
+            array('testTwo',    array('PHPUnit' => '1.0')),
+            array('testThree',  array('PHP' => '2.0')),
+            array('testFour',   array('PHPUnit'=>'2.0', 'PHP' => '1.0')),
+            array('testFive',   array('PHP' => '5.4.0RC6')),
+            array('testSix',    array('PHP' => '5.4.0-alpha1')),
+            array('testSeven',  array('PHP' => '5.4.0beta2')),
+            array('testEight',  array('PHP' => '5.4-dev')),
+            array('testNine',   array('functions' => array('testFunc'))),
+            array('testTen',    array('extensions' => array('testExt'))),
+            array('testEleven', array('OS' => '/Linux/i')),
+            array(
+                'testSpace',
+                array(
+                    'extensions' => array('spl'),
+                    'OS' => '/.*/i'
+                )
+            ),
+            array(
+                'testAllPossibleRequirements',
+                array(
+                    'PHP' => '99-dev',
+                    'PHPUnit' => '9-dev',
+                    'OS' => '/DOESNOTEXIST/i',
+                    'functions' => array(
+                        'testFuncOne',
+                        'testFuncTwo',
+                    ),
+                    'extensions' => array(
+                        'testExtOne',
+                        'testExtTwo',
+                    )
+                )
+            )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getRequirements
+     */
+    public function testGetRequirementsMergesClassAndMethodDocBlocks()
+    {
+        $expectedAnnotations = array(
+            'PHP' => '5.4',
+            'PHPUnit' => '3.7',
+            'OS' => '/WINNT/i',
+            'functions' => array(
+                'testFuncClass',
+                'testFuncMethod',
+            ),
+            'extensions' => array(
+                'testExtClass',
+                'testExtMethod',
+            )
+        );
+
+        $this->assertEquals(
+          $expectedAnnotations,
+          PHPUnit_Util_Test::getRequirements('RequirementsClassDocBlockTest', 'testMethod')
+        );
+    }
+
+    /**
+     * @coversNothing
+     * @todo   This test does not really test functionality of PHPUnit_Util_Test
+     */
+    public function testGetProvidedDataRegEx()
+    {
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider method', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('method', $matches[1]);
+
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider class::method', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('class::method', $matches[1]);
+
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider namespace\class::method', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('namespace\class::method', $matches[1]);
+
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider namespace\namespace\class::method', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('namespace\namespace\class::method', $matches[1]);
+
+        $result = preg_match(PHPUnit_Util_Test::REGEX_DATA_PROVIDER, '@dataProvider メソッド', $matches);
+        $this->assertEquals(1, $result);
+        $this->assertEquals('メソッド', $matches[1]);
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getDependencies
+     * @todo   Not sure what this test tests (name is misleading at least)
+     */
+    public function testParseAnnotation()
+    {
+        $this->assertEquals(
+          array('Foo', 'ほげ'),
+          PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotation')
+        );
+    }
+
+    /**
+     * @depends Foo
+     * @depends ほげ
+     * @todo    Remove fixture from test class
+     */
+    public function methodForTestParseAnnotation()
+    {
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getDependencies
+     */
+    public function testParseAnnotationThatIsOnlyOneLine()
+    {
+        $this->assertEquals(
+          array('Bar'),
+          PHPUnit_Util_Test::getDependencies(get_class($this), 'methodForTestParseAnnotationThatIsOnlyOneLine')
+        );
+    }
+
+    /** @depends Bar */
+    public function methodForTestParseAnnotationThatIsOnlyOneLine()
+    {
+        // TODO Remove fixture from test class
+    }
+
+    /**
+     * @covers       PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers       PHPUnit_Util_Test::resolveElementToReflectionObjects
+     * @dataProvider getLinesToBeCoveredProvider
+     */
+    public function testGetLinesToBeCovered($test, $lines)
+    {
+        if (strpos($test, 'Namespace') === 0) {
+            $expected = array(
+              TEST_FILES_PATH . 'NamespaceCoveredClass.php' => $lines
+            );
+        }
+
+        else if ($test === 'CoverageNoneTest') {
+            $expected = array();
+        }
+
+        else if ($test === 'CoverageNothingTest') {
+            $expected = false;
+        }
+
+        else if ($test === 'CoverageFunctionTest') {
+            $expected = array(
+              TEST_FILES_PATH . 'CoveredFunction.php' => $lines
+            );
+        }
+
+        else {
+            $expected = array(TEST_FILES_PATH . 'CoveredClass.php' => $lines);
+        }
+
+        $this->assertEquals(
+          $expected,
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            $test, 'testSomething'
+          )
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers            PHPUnit_Util_Test::resolveElementToReflectionObjects
+     * @expectedException PHPUnit_Framework_CodeCoverageException
+     */
+    public function testGetLinesToBeCovered2()
+    {
+        PHPUnit_Util_Test::getLinesToBeCovered(
+          'NotExistingCoveredElementTest', 'testOne'
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers            PHPUnit_Util_Test::resolveElementToReflectionObjects
+     * @expectedException PHPUnit_Framework_CodeCoverageException
+     */
+    public function testGetLinesToBeCovered3()
+    {
+        PHPUnit_Util_Test::getLinesToBeCovered(
+          'NotExistingCoveredElementTest', 'testTwo'
+        );
+    }
+
+    /**
+     * @covers            PHPUnit_Util_Test::getLinesToBeCovered
+     * @covers            PHPUnit_Util_Test::resolveElementToReflectionObjects
+     * @expectedException PHPUnit_Framework_CodeCoverageException
+     */
+    public function testGetLinesToBeCovered4()
+    {
+        PHPUnit_Util_Test::getLinesToBeCovered(
+          'NotExistingCoveredElementTest', 'testThree'
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testGetLinesToBeCoveredSkipsNonExistantMethods()
+    {
+        $this->assertSame(
+          array(),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'NotExistingCoveredElementTest',
+            'methodDoesNotExist'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     * @expectedException PHPUnit_Framework_CodeCoverageException
+     */
+    public function testTwoCoversDefaultClassAnnoationsAreNotAllowed()
+    {
+        PHPUnit_Util_Test::getLinesToBeCovered(
+          'CoverageTwoDefaultClassAnnotations',
+          'testSomething'
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testFunctionParenthesesAreAllowed()
+    {
+        $this->assertSame(
+          array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'CoverageFunctionParenthesesTest',
+            'testSomething'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testFunctionParenthesesAreAllowedWithWhitespace()
+    {
+        $this->assertSame(
+          array(TEST_FILES_PATH . 'CoveredFunction.php' => range(2, 4)),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'CoverageFunctionParenthesesWhitespaceTest',
+            'testSomething'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testMethodParenthesesAreAllowed()
+    {
+        $this->assertSame(
+          array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'CoverageMethodParenthesesTest',
+            'testSomething'
+          )
+        );
+    }
+
+    /**
+     * @covers PHPUnit_Util_Test::getLinesToBeCovered
+     */
+    public function testMethodParenthesesAreAllowedWithWhitespace()
+    {
+        $this->assertSame(
+          array(TEST_FILES_PATH . 'CoveredClass.php' => range(31, 35)),
+          PHPUnit_Util_Test::getLinesToBeCovered(
+            'CoverageMethodParenthesesWhitespaceTest',
+            'testSomething'
+          )
+        );
+    }
+
+    public function getLinesToBeCoveredProvider()
+    {
+        return array(
+          array(
+            'CoverageNoneTest',
+            array()
+          ),
+          array(
+            'CoverageClassExtendedTest',
+            array_merge(range(19, 36), range(2, 17))
+          ),
+          array(
+            'CoverageClassTest',
+            range(19, 36)
+          ),
+          array(
+            'CoverageMethodTest',
+            range(31, 35)
+          ),
+          array(
+            'CoverageMethodOneLineAnnotationTest',
+            range(31, 35)
+          ),
+          array(
+            'CoverageNotPrivateTest',
+            array_merge(range(25, 29), range(31, 35))
+          ),
+          array(
+            'CoverageNotProtectedTest',
+            array_merge(range(21, 23), range(31, 35))
+          ),
+          array(
+            'CoverageNotPublicTest',
+            array_merge(range(21, 23), range(25, 29))
+          ),
+          array(
+            'CoveragePrivateTest',
+            range(21, 23)
+          ),
+          array(
+            'CoverageProtectedTest',
+            range(25, 29)
+          ),
+          array(
+            'CoveragePublicTest',
+            range(31, 35)
+          ),
+          array(
+            'CoverageFunctionTest',
+            range(2, 4)
+          ),
+          array(
+            'NamespaceCoverageClassExtendedTest',
+            array_merge(range(21, 38), range(4, 19))
+          ),
+          array(
+            'NamespaceCoverageClassTest',
+            range(21, 38)
+          ),
+          array(
+            'NamespaceCoverageMethodTest',
+            range(33, 37)
+          ),
+          array(
+            'NamespaceCoverageNotPrivateTest',
+            array_merge(range(27, 31), range(33, 37))
+          ),
+          array(
+            'NamespaceCoverageNotProtectedTest',
+            array_merge(range(23, 25), range(33, 37))
+          ),
+          array(
+            'NamespaceCoverageNotPublicTest',
+            array_merge(range(23, 25), range(27, 31))
+          ),
+          array(
+            'NamespaceCoveragePrivateTest',
+            range(23, 25)
+          ),
+          array(
+            'NamespaceCoverageProtectedTest',
+            range(27, 31)
+          ),
+          array(
+            'NamespaceCoveragePublicTest',
+            range(33, 37)
+          ),
+          array(
+            'NamespaceCoverageCoversClassTest',
+            array_merge(range(23, 25), range(27, 31), range(33, 37), range(6, 8), range(10, 13), range(15, 18))
+          ),
+          array(
+            'NamespaceCoverageCoversClassPublicTest',
+            range(33, 37)
+          ),
+          array(
+            'CoverageNothingTest',
+            false
+          )
+        );
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/Util/XMLTest.php b/core/vendor/phpunit/phpunit/tests/Util/XMLTest.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/Tests/Util/XMLTest.php
rename to core/vendor/phpunit/phpunit/tests/Util/XMLTest.php
index e9e003960bb34c15cb90bfa70d2253b872c62f5e..8cf307234282325cab21274685c71e7497fb5cb7 100644
--- a/core/vendor/phpunit/phpunit/Tests/Util/XMLTest.php
+++ b/core/vendor/phpunit/phpunit/tests/Util/XMLTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
  * @author     Mike Naberezny <mike@maintainable.com>
  * @author     Derek DeVries <derek@maintainable.com>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.3.0
@@ -51,10 +51,11 @@
  * @author     Mike Naberezny <mike@maintainable.com>
  * @author     Derek DeVries <derek@maintainable.com>
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.3.0
+ * @covers     PHPUnit_Util_XML
  */
 class Util_XMLTest extends PHPUnit_Framework_TestCase
 {
@@ -72,7 +73,7 @@ public function testAssertValidKeysValidKeysEmpty()
     {
         $options   = array('testA' => 1, 'testB' => 2);
         $valid     = array('testA', 'testB', 'testC');
-        $expected  = array('testA' => 1, 'testB' => 2, 'testC' => NULL);
+        $expected  = array('testA' => 1, 'testB' => 2, 'testC' => null);
         $validated = PHPUnit_Util_XML::assertValidKeys($options, $valid);
 
         $this->assertEquals($expected, $validated);
@@ -130,7 +131,7 @@ public function testAssertValidKeysInvalidKeys()
 
     public function testConvertAssertSelect()
     {
-        $selector  = 'div#folder.open a[href="http://www.xerox.com"][title="xerox"].selected.big > span';
+        $selector  = 'div#folder.open a[href="http://www.xerox.com"][title="xerox"].selected.big > span + h1';
         $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
         $tag       = array('tag'   => 'div',
                            'id'    => 'folder',
@@ -139,7 +140,8 @@ public function testConvertAssertSelect()
                                                  'class'      => 'selected big',
                                                  'attributes' => array('href'  => 'http://www.xerox.com',
                                                                        'title' => 'xerox'),
-                                                 'child'      => array('tag' => 'span')));
+                                                 'child'      => array('tag' => 'span',
+                                                                       'adjacent-sibling' => array('tag' => 'h1'))));
          $this->assertEquals($tag, $converted);
     }
 
@@ -262,6 +264,15 @@ public function testConvertAssertSelectEltChild()
         $this->assertEquals($tag, $converted);
     }
 
+    public function testConvertAssertSelectEltAdjacentSibling()
+    {
+        $selector  = 'div + a';
+        $converted = PHPUnit_Util_XML::convertSelectToTag($selector);
+        $tag       = array('tag' => 'div', 'adjacent-sibling' => array('tag' => 'a'));
+
+        $this->assertEquals($tag, $converted);
+    }
+
     public function testConvertAssertSelectEltDescendant()
     {
         $selector  = 'div a';
@@ -284,7 +295,7 @@ public function testConvertAssertSelectContent()
     public function testConvertAssertSelectTrue()
     {
         $selector  = '#foo';
-        $content   = TRUE;
+        $content   = true;
         $converted = PHPUnit_Util_XML::convertSelectToTag($selector, $content);
         $tag       = array('id' => 'foo');
 
@@ -294,7 +305,7 @@ public function testConvertAssertSelectTrue()
     public function testConvertAssertSelectFalse()
     {
         $selector  = '#foo';
-        $content   = FALSE;
+        $content   = false;
         $converted = PHPUnit_Util_XML::convertSelectToTag($selector, $content);
         $tag       = array('id' => 'foo');
 
@@ -321,8 +332,38 @@ public function testConvertAssertRange()
         $this->assertEquals($tag, $converted);
     }
 
-    public function testPrepareStringEscapesChars()
+    /**
+     * @dataProvider charProvider
+     */
+    public function testPrepareString($char)
     {
-        $this->assertEquals('&#x1b;', PHPUnit_Util_XML::prepareString("\033"));
+        $e = null;
+
+        $escapedString = PHPUnit_Util_XML::prepareString($char);
+        $xml = "<?xml version='1.0' encoding='UTF-8' ?><tag>$escapedString</tag>";
+        $dom = new DomDocument('1.0', 'UTF-8');
+
+        try {
+            $dom->loadXML($xml);
+        }
+
+        catch (Exception $e) {
+        }
+
+        $this->assertNull($e, sprintf(
+          'PHPUnit_Util_XML::prepareString("\x%02x") should not crash DomDocument',
+          ord($char)
+        ));
+    }
+
+    public function charProvider()
+    {
+        $data = array();
+
+        for ($i = 0; $i < 256; $i++) {
+            $data[] = array(chr($i));
+        }
+
+        return $data;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/AbstractTest.php b/core/vendor/phpunit/phpunit/tests/_files/AbstractTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/AbstractTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/AbstractTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/Author.php b/core/vendor/phpunit/phpunit/tests/_files/Author.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/Tests/_files/Author.php
rename to core/vendor/phpunit/phpunit/tests/_files/Author.php
index 426d5db6627a63d161f8cb293b025e9613f291a2..54c67cde7c37d44eeaa4a74e0f030535453a4ff5 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/Author.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/Author.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.0
@@ -47,7 +47,7 @@
  *
  * @package    PHPUnit
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.0
@@ -63,4 +63,4 @@ public function __construct($name)
     {
         $this->name = $name;
     }
-}
\ No newline at end of file
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/BankAccount.php b/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php
similarity index 94%
rename from core/vendor/phpunit/phpunit/Tests/_files/BankAccount.php
rename to core/vendor/phpunit/phpunit/tests/_files/BankAccount.php
index 2560dd2359a78e896ec97427982d3021528fad92..e35831c36fe6d6fcda6cb281c2afafbc2f16efb8 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/BankAccount.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccount.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
@@ -49,7 +49,7 @@ class BankAccountException extends RuntimeException {}
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.3.0
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/BankAccountTest.php b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/Tests/_files/BankAccountTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
index f4cfd783e0729eeb308d67df8a38b79bd4c1c594..bfe8875388101404caf075e2d04a7394a991e254 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/BankAccountTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,21 +36,18 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'BankAccount.php';
-
 /**
  * Tests for the BankAccount class.
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.3.0
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/BankAccountTest.test.php b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/Tests/_files/BankAccountTest.test.php
rename to core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php
index 18bda4ff44d3729f080f85ac874c79dd71590e03..4a9a55a19381a74677ff5da900a9f81c292da385 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/BankAccountTest.test.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/BankAccountTest.test.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,21 +36,18 @@
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 2.3.0
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'BankAccount.php';
-
 /**
  * Tests for the BankAccount class.
  *
  * @package    PHPUnit
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 2.3.0
diff --git a/core/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php b/core/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php
new file mode 100644
index 0000000000000000000000000000000000000000..f90f30750fbf1a60652d4d18439eb3d06fa279fa
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/BaseTestListenerSample.php
@@ -0,0 +1,11 @@
+<?php
+
+class BaseTestListenerSample extends PHPUnit_Framework_BaseTestListener
+{
+    public $endCount = 0;
+
+    public function endTest(PHPUnit_Framework_Test $test, $time)
+    {
+        $this->endCount++;
+    }
+}
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php b/core/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..95a7484fa1cb81a0e6fa09416e83df42930583f6
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/BeforeAndAfterTest.php
@@ -0,0 +1,31 @@
+<?php
+class BeforeAndAfterTest extends PHPUnit_Framework_TestCase
+{
+    public static $beforeWasRun;
+    public static $afterWasRun;
+
+    public static function resetProperties()
+    {
+        self::$beforeWasRun = 0;
+        self::$afterWasRun = 0;
+    }
+
+    /**
+     * @before
+     */
+    public function initialSetup()
+    {
+        self::$beforeWasRun++;
+    }
+
+    /**
+     * @after
+     */
+    public function finalTeardown()
+    {
+        self::$afterWasRun++;
+    }
+
+    public function test1() {}
+    public function test2() {}
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php b/core/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..27a8b9c0187769a518d494b08f41d63237a95b91
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/BeforeClassAndAfterClassTest.php
@@ -0,0 +1,31 @@
+<?php
+class BeforeClassAndAfterClassTest extends PHPUnit_Framework_TestCase
+{
+    public static $beforeClassWasRun = 0;
+    public static $afterClassWasRun = 0;
+
+    public static function resetProperties()
+    {
+        self::$beforeClassWasRun = 0;
+        self::$afterClassWasRun = 0;
+    }
+
+    /**
+     * @beforeClass
+     */
+    public static function initialClassSetup()
+    {
+        self::$beforeClassWasRun++;
+    }
+
+    /**
+     * @afterClass
+     */
+    public static function finalClassTeardown()
+    {
+        self::$afterClassWasRun++;
+    }
+
+    public function test1() {}
+    public function test2() {}
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/Book.php b/core/vendor/phpunit/phpunit/tests/_files/Book.php
similarity index 91%
rename from core/vendor/phpunit/phpunit/Tests/_files/Book.php
rename to core/vendor/phpunit/phpunit/tests/_files/Book.php
index b515a6ca5b540289f314d8bce0d36388e05e1c04..521ae8cce4f8565d6e772ae592d83defa6a2ac33 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/Book.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/Book.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.0
@@ -47,7 +47,7 @@
  *
  * @package    PHPUnit
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.0
@@ -55,5 +55,5 @@
 class Book
 {
     // the order of properties is important for testing the cycle!
-    public $author = NULL;
+    public $author = null;
 }
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/Calculator.php b/core/vendor/phpunit/phpunit/tests/_files/Calculator.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/Calculator.php
rename to core/vendor/phpunit/phpunit/tests/_files/Calculator.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ChangeCurrentWorkingDirectoryTest.php b/core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php
similarity index 83%
rename from core/vendor/phpunit/phpunit/Tests/_files/ChangeCurrentWorkingDirectoryTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php
index 2298c5eaca7483770ce19c5e0688ae60727f3eab..1a839a2f9ef1b857b809d5667d9ba94215b640fa 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ChangeCurrentWorkingDirectoryTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ChangeCurrentWorkingDirectoryTest.php
@@ -4,7 +4,7 @@ class ChangeCurrentWorkingDirectoryTest extends PHPUnit_Framework_TestCase
     public function testSomethingThatChangesTheCwd()
     {
         chdir('../');
-        $this->assertTrue(TRUE);
+        $this->assertTrue(true);
     }
 
 }
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ClassWithNonPublicAttributes.php b/core/vendor/phpunit/phpunit/tests/_files/ClassWithNonPublicAttributes.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/ClassWithNonPublicAttributes.php
rename to core/vendor/phpunit/phpunit/tests/_files/ClassWithNonPublicAttributes.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ClassWithToString.php b/core/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/Tests/_files/ClassWithToString.php
rename to core/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
index cfd4fd099a6db0c7f8b512990d66fddad1cac7ef..4481abec5e385ef6cd7e5111b664af57d9172675 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ClassWithToString.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ClassWithToString.php
@@ -2,7 +2,7 @@
 /**
  * PHPUnit
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
  *
  * @package    PHPUnit
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      File available since Release 3.6.0
@@ -47,7 +47,7 @@
  *
  * @package    PHPUnit
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  * @link       http://www.phpunit.de/
  * @since      Class available since Release 3.6.0
@@ -58,4 +58,4 @@ public function __toString()
     {
         return 'string representation';
     }
-}
\ No newline at end of file
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ConcreteTest.my.php b/core/vendor/phpunit/phpunit/tests/_files/ConcreteTest.my.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/Tests/_files/ConcreteTest.my.php
rename to core/vendor/phpunit/phpunit/tests/_files/ConcreteTest.my.php
index ea9f8f136b4a88c881779ab1d7bad0764385a975..fe01ceed5ae8dce340f72c503757258b70080229 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ConcreteTest.my.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ConcreteTest.my.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'AbstractTest.php';
-
 class ConcreteWithMyCustomExtensionTest extends AbstractTest
 {
     public function testTwo()
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ConcreteTest.php b/core/vendor/phpunit/phpunit/tests/_files/ConcreteTest.php
similarity index 73%
rename from core/vendor/phpunit/phpunit/Tests/_files/ConcreteTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/ConcreteTest.php
index b38d74d790c2145249951f9f360cd8137a6995c6..4f51a18004b00f5eac245823f5cb1611f83cd069 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ConcreteTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ConcreteTest.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'AbstractTest.php';
-
 class ConcreteTest extends AbstractTest
 {
     public function testTwo()
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageClassExtendedTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageClassExtendedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..df12d3470a0d2d07a9b4c4a13ace3b067ad59732
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageClassExtendedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageClassExtendedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass<extended>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageClassTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageClassTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..7f569ae606ea07e9616fff92c8ab4525829119a9
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageClassTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..33b5fe3de5be5fa4c36406372dd51eb4382db7a0
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionParenthesesTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction()
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionParenthesesWhitespaceTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c621fd21029121fe83a7b3597989ba3a6ac04d69
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionTest.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageFunctionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers ::globalFunction
+     */
+    public function testSomething()
+    {
+        globalFunction();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodOneLineAnnotationTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodOneLineAnnotationTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/CoverageMethodOneLineAnnotationTest.php
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..422300457a18bc97437c1db237fec06641109b74
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodParenthesesTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod()
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodParenthesesWhitespaceTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/CoverageMethodParenthesesWhitespaceTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..167b3db4c7a353a02ac41f6c3edeeb215c8495cb
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageMethodTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageNoneTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageNoneTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b414c2ef08ef39f6045fcdc31c5783dc30df204
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageNoneTest.php
@@ -0,0 +1,9 @@
+<?php
+class CoverageNoneTest extends PHPUnit_Framework_TestCase
+{
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageNotPrivateTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageNotPrivateTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..12b56e80e8307576d4c61a81cdf79c6eee57a601
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageNotPrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotPrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!private>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageNotProtectedTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageNotProtectedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..c69d261dea85e2167aa08fdc882ad374458a842d
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageNotProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!protected>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageNotPublicTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageNotPublicTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..aebfe4bd9ace643d1bbf48d95d6575d519ae7fc7
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageNotPublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageNotPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<!public>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageNothingTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageNothingTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d5680d9320f7b6fe7487ad0314e72092be8988c
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageNothingTest.php
@@ -0,0 +1,13 @@
+<?php
+class CoverageNothingTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::publicMethod
+     * @coversNothing
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoveragePrivateTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoveragePrivateTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..f09560d3af5f77b4d1dd8dbb9e024c84a6c82672
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoveragePrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoveragePrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<private>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageProtectedTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageProtectedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9b3acbf6caf6ed7c67937f3bf9c5eadac76c1b79
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoverageProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<protected>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoveragePublicTest.php b/core/vendor/phpunit/phpunit/tests/_files/CoveragePublicTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..480a522b4d4e9437861037e81e28eaa342973181
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoveragePublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class CoveragePublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php b/core/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php
new file mode 100644
index 0000000000000000000000000000000000000000..7c743db926a591d801de17de06628859b5ed3b00
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoverageTwoDefaultClassAnnotations.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * @coversDefaultClass \NamespaceOne
+ * @coversDefaultClass \AnotherDefault\Name\Space\Does\Not\Work
+ */
+class CoverageTwoDefaultClassAnnotations
+{
+
+    /**
+     * @covers Foo\CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoveredClass.php b/core/vendor/phpunit/phpunit/tests/_files/CoveredClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..f382ce99b5c7ba90ce2187278fca02b75a54f6f6
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoveredClass.php
@@ -0,0 +1,36 @@
+<?php
+class CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        $this->protectedMethod();
+    }
+}
+
+class CoveredClass extends CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        parent::protectedMethod();
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        parent::publicMethod();
+        $this->protectedMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CoveredFunction.php b/core/vendor/phpunit/phpunit/tests/_files/CoveredFunction.php
new file mode 100644
index 0000000000000000000000000000000000000000..9989eb02ed4c3404399129e8ede31f96f82c7ee4
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CoveredFunction.php
@@ -0,0 +1,4 @@
+<?php
+function globalFunction()
+{
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php b/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php
new file mode 100644
index 0000000000000000000000000000000000000000..4cb66b76ab07f5dfa989f777da7de64da971ee5a
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/CustomPrinter.php
@@ -0,0 +1,4 @@
+<?php
+class CustomPrinter extends PHPUnit_TextUI_ResultPrinter
+{
+}
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php b/core/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..298f0b06fb027b7d664171877e5b3c212cd14e30
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/DataProviderFilterTest.php
@@ -0,0 +1,39 @@
+<?php
+class DataProviderFilterTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider truthProvider
+     */
+    public function testTrue($truth)
+    {
+        $this->assertTrue($truth);
+    }
+
+    public static function truthProvider()
+    {
+        return array(
+           array(true),
+           array(true),
+           array(true),
+           array(true)
+        );
+    }
+
+    /**
+     * @dataProvider falseProvider
+     */
+    public function testFalse($false)
+    {
+        $this->assertFalse($false);
+    }
+
+    public static function falseProvider()
+    {
+        return array(
+          'false test'=>array(false),
+          'false test 2'=>array(false),
+          'other false test'=>array(false),
+          'other false test2'=>array(false)
+        );
+    }
+}
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/DataProviderTest.php b/core/vendor/phpunit/phpunit/tests/_files/DataProviderTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/DataProviderTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/DataProviderTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/DependencyFailureTest.php b/core/vendor/phpunit/phpunit/tests/_files/DependencyFailureTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/DependencyFailureTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/DependencyFailureTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/DependencySuccessTest.php b/core/vendor/phpunit/phpunit/tests/_files/DependencySuccessTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/DependencySuccessTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/DependencySuccessTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/DependencyTestSuite.php b/core/vendor/phpunit/phpunit/tests/_files/DependencyTestSuite.php
similarity index 77%
rename from core/vendor/phpunit/phpunit/Tests/_files/DependencyTestSuite.php
rename to core/vendor/phpunit/phpunit/tests/_files/DependencyTestSuite.php
index 7680008cde0ae94d5f2c2258a7148518d3455a34..b5babc7f292c9ff5d4c4ff4e29fe103745e83d39 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/DependencyTestSuite.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/DependencyTestSuite.php
@@ -1,7 +1,4 @@
 <?php
-require_once 'DependencyFailureTest.php';
-require_once 'DependencySuccessTest.php';
-
 class DependencyTestSuite
 {
     public static function suite()
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/DoubleTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/DoubleTestCase.php
similarity index 86%
rename from core/vendor/phpunit/phpunit/Tests/_files/DoubleTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/DoubleTestCase.php
index ba601a4a28fc63808e94de8d9121d80b7827f825..b1f00a8ff4d193759472331e882ce035c92c4589 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/DoubleTestCase.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/DoubleTestCase.php
@@ -13,7 +13,7 @@ public function count()
         return 2;
     }
 
-    public function run(PHPUnit_Framework_TestResult $result = NULL)
+    public function run(PHPUnit_Framework_TestResult $result = null)
     {
         $result->startTest($this);
 
diff --git a/core/vendor/phpunit/phpunit/tests/_files/DummyException.php b/core/vendor/phpunit/phpunit/tests/_files/DummyException.php
new file mode 100644
index 0000000000000000000000000000000000000000..29a69b997ddcf75aea41d5c8a6611c8a2bbff32d
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/DummyException.php
@@ -0,0 +1,5 @@
+<?php
+
+class DummyException extends Exception
+{
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/EmptyTestCaseTest.php b/core/vendor/phpunit/phpunit/tests/_files/EmptyTestCaseTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/EmptyTestCaseTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/EmptyTestCaseTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/Error.php b/core/vendor/phpunit/phpunit/tests/_files/Error.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/Error.php
rename to core/vendor/phpunit/phpunit/tests/_files/Error.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInAssertPostConditionsTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPostConditionsTest.php
similarity index 50%
rename from core/vendor/phpunit/phpunit/Tests/_files/ExceptionInAssertPostConditionsTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPostConditionsTest.php
index 671403e716ef0631bd725102f3d255789456e9f9..0f53f2264e659a93fa7994ccead360d9a8c90843 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInAssertPostConditionsTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPostConditionsTest.php
@@ -1,35 +1,35 @@
 <?php
 class ExceptionInAssertPostConditionsTest extends PHPUnit_Framework_TestCase
 {
-    public $setUp = FALSE;
-    public $assertPreConditions = FALSE;
-    public $assertPostConditions = FALSE;
-    public $tearDown = FALSE;
-    public $testSomething = FALSE;
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
 
     protected function setUp()
     {
-        $this->setUp = TRUE;
+        $this->setUp = true;
     }
 
     protected function assertPreConditions()
     {
-        $this->assertPreConditions = TRUE;
+        $this->assertPreConditions = true;
     }
 
     public function testSomething()
     {
-        $this->testSomething = TRUE;
+        $this->testSomething = true;
     }
 
     protected function assertPostConditions()
     {
-        $this->assertPostConditions = TRUE;
+        $this->assertPostConditions = true;
         throw new Exception;
     }
 
     protected function tearDown()
     {
-        $this->tearDown = TRUE;
+        $this->tearDown = true;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInAssertPreConditionsTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPreConditionsTest.php
similarity index 50%
rename from core/vendor/phpunit/phpunit/Tests/_files/ExceptionInAssertPreConditionsTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPreConditionsTest.php
index 01f571affdf3785cfe4bf5557508ddf5cbd80e06..db08f9cc4b8e4b7b6eec5a8bf24e7148940dbdd1 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInAssertPreConditionsTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInAssertPreConditionsTest.php
@@ -1,35 +1,35 @@
 <?php
 class ExceptionInAssertPreConditionsTest extends PHPUnit_Framework_TestCase
 {
-    public $setUp = FALSE;
-    public $assertPreConditions = FALSE;
-    public $assertPostConditions = FALSE;
-    public $tearDown = FALSE;
-    public $testSomething = FALSE;
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
 
     protected function setUp()
     {
-        $this->setUp = TRUE;
+        $this->setUp = true;
     }
 
     protected function assertPreConditions()
     {
-        $this->assertPreConditions = TRUE;
+        $this->assertPreConditions = true;
         throw new Exception;
     }
 
     public function testSomething()
     {
-        $this->testSomething = TRUE;
+        $this->testSomething = true;
     }
 
     protected function assertPostConditions()
     {
-        $this->assertPostConditions = TRUE;
+        $this->assertPostConditions = true;
     }
 
     protected function tearDown()
     {
-        $this->tearDown = TRUE;
+        $this->tearDown = true;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9c48030b819917290699e6830bd1e2ef6c82bc28
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInSetUpTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInSetUpTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+        throw new Exception;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInTearDownTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInTearDownTest.php
similarity index 50%
rename from core/vendor/phpunit/phpunit/Tests/_files/ExceptionInTearDownTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/ExceptionInTearDownTest.php
index 3688dfca3a3862eac69a798bb3c0317014d9e248..f5cf7e5901698ccb29aab65ac7b4156438d14c64 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionInTearDownTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInTearDownTest.php
@@ -1,35 +1,35 @@
 <?php
 class ExceptionInTearDownTest extends PHPUnit_Framework_TestCase
 {
-    public $setUp = FALSE;
-    public $assertPreConditions = FALSE;
-    public $assertPostConditions = FALSE;
-    public $tearDown = FALSE;
-    public $testSomething = FALSE;
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
 
     protected function setUp()
     {
-        $this->setUp = TRUE;
+        $this->setUp = true;
     }
 
     protected function assertPreConditions()
     {
-        $this->assertPreConditions = TRUE;
+        $this->assertPreConditions = true;
     }
 
     public function testSomething()
     {
-        $this->testSomething = TRUE;
+        $this->testSomething = true;
     }
 
     protected function assertPostConditions()
     {
-        $this->assertPostConditions = TRUE;
+        $this->assertPostConditions = true;
     }
 
     protected function tearDown()
     {
-        $this->tearDown = TRUE;
+        $this->tearDown = true;
         throw new Exception;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ca556e55b6a97700fd1c87aaaefcac6867e898f
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionInTest.php
@@ -0,0 +1,35 @@
+<?php
+class ExceptionInTest extends PHPUnit_Framework_TestCase
+{
+    public $setUp = false;
+    public $assertPreConditions = false;
+    public $assertPostConditions = false;
+    public $tearDown = false;
+    public $testSomething = false;
+
+    protected function setUp()
+    {
+        $this->setUp = true;
+    }
+
+    protected function assertPreConditions()
+    {
+        $this->assertPreConditions = true;
+    }
+
+    public function testSomething()
+    {
+        $this->testSomething = true;
+        throw new Exception;
+    }
+
+    protected function assertPostConditions()
+    {
+        $this->assertPostConditions = true;
+    }
+
+    protected function tearDown()
+    {
+        $this->tearDown = true;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionNamespaceTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionNamespaceTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/ExceptionNamespaceTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/ExceptionNamespaceTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionStack.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
similarity index 88%
rename from core/vendor/phpunit/phpunit/Tests/_files/ExceptionStack.php
rename to core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
index 0363b9e159dea3efd802898003d8afbf9cdb78ee..fd86c8cf0e42ed88cd6cef9599eb641b78f36438 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionStack.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionStackTest.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 class ExceptionStackTestException extends Exception { }
 
 class ExceptionStackTest extends PHPUnit_Framework_TestCase
@@ -8,7 +8,7 @@ public function testPrintingChildException()
         try {
             $this->assertEquals(array(1), array(2), 'message');
         } catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $message = $e->getMessage() . "\n" . $e->getComparisonFailure()->getDiff();
+            $message = $e->getMessage() . $e->getComparisonFailure()->getDiff();
             throw new ExceptionStackTestException("Child exception\n$message", 101, $e);
         }
     }
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionTest.php b/core/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
similarity index 99%
rename from core/vendor/phpunit/phpunit/Tests/_files/ExceptionTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
index 52984651535433b68fab246e44374b26cec119b4..95a7c0afc52ee3d9c8e86f1f4d7a523dde8b13bd 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/ExceptionTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/ExceptionTest.php
@@ -3,14 +3,14 @@ class ExceptionTest extends PHPUnit_Framework_TestCase
 {
     /**
      * Exception message
-     * 
+     *
      * @var string
      */
     const ERROR_MESSAGE = 'Exception message';
 
     /**
      * Exception code
-     * 
+     *
      * @var integer
      */
     const ERROR_CODE = 500;
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/Failure.php b/core/vendor/phpunit/phpunit/tests/_files/Failure.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/Failure.php
rename to core/vendor/phpunit/phpunit/tests/_files/Failure.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/FailureTest.php b/core/vendor/phpunit/phpunit/tests/_files/FailureTest.php
similarity index 93%
rename from core/vendor/phpunit/phpunit/Tests/_files/FailureTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/FailureTest.php
index 89a5843a64ccdd2997ea73010ff78d25c0c8c175..2bea3dadd2b9db8988e09c86a89cf17e77b86703 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/FailureTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/FailureTest.php
@@ -24,7 +24,7 @@ public function testAssertObjectEqualsObject()
 
     public function testAssertNullEqualsString()
     {
-        $this->assertEquals(NULL, 'bar', 'message');
+        $this->assertEquals(null, 'bar', 'message');
     }
 
     public function testAssertStringEqualsString()
@@ -59,7 +59,7 @@ public function testAssertObjectSameObject()
 
     public function testAssertObjectSameNull()
     {
-        $this->assertSame(new StdClass, NULL, 'message');
+        $this->assertSame(new StdClass, null, 'message');
     }
 
     public function testAssertFloatSameFloat()
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/FatalTest.php b/core/vendor/phpunit/phpunit/tests/_files/FatalTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/FatalTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/FatalTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/IncompleteTest.php b/core/vendor/phpunit/phpunit/tests/_files/IncompleteTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/IncompleteTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/IncompleteTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/InheritedTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/InheritedTestCase.php
similarity index 74%
rename from core/vendor/phpunit/phpunit/Tests/_files/InheritedTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/InheritedTestCase.php
index 1a15eb638121dbc59c0158224eded0b80a85cf1a..3df721563e05b82ee7a34c41a3b89a25125674a7 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/InheritedTestCase.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/InheritedTestCase.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'OneTestCase.php';
-
 class InheritedTestCase extends OneTestCase
 {
     public function test2()
diff --git a/core/vendor/phpunit/phpunit/tests/_files/IniTest.php b/core/vendor/phpunit/phpunit/tests/_files/IniTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..5846abf55e635fc3b6d18b42b18bebbed43e5319
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/IniTest.php
@@ -0,0 +1,8 @@
+<?php
+class IniTest extends PHPUnit_Framework_TestCase
+{
+    public function testIni()
+    {
+        $this->assertEquals('application/x-test', ini_get('default_mimetype'));
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/JsonData/arrayObject.js b/core/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.js
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/JsonData/arrayObject.js
rename to core/vendor/phpunit/phpunit/tests/_files/JsonData/arrayObject.js
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/JsonData/simpleObject.js b/core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.js
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/JsonData/simpleObject.js
rename to core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject.js
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/JsonData/simpleObject2.js b/core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/JsonData/simpleObject2.js
rename to core/vendor/phpunit/phpunit/tests/_files/JsonData/simpleObject2.js
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/MockRunner.php b/core/vendor/phpunit/phpunit/tests/_files/MockRunner.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/MockRunner.php
rename to core/vendor/phpunit/phpunit/tests/_files/MockRunner.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/MultiDependencyTest.php b/core/vendor/phpunit/phpunit/tests/_files/MultiDependencyTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/MultiDependencyTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/MultiDependencyTest.php
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassExtendedTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassExtendedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0954cba9f4d3e694ee43b76ab8648327e84fb3d
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassExtendedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageClassExtendedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass<extended>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..63912c0898e50f79676e7eeecf81abe3c24f7897
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageClassTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageClassTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageCoversClassPublicTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageCoversClassPublicTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassPublicTest.php
diff --git a/core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageCoversClassTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
similarity index 100%
rename from core/vendor/phpunit/php-code-coverage/Tests/_files/NamespaceCoverageCoversClassTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageCoversClassTest.php
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageMethodTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageMethodTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..35dfb8b1dab52aa2902cf9ab4587aba4de720c24
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageMethodTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageMethodTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::publicMethod
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPrivateTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPrivateTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..552c9ec50435c27c340567c57ccdef1c0f50db44
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotPrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!private>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotProtectedTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotProtectedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..33fc8c72c751ea598d64888f1cefbe3849bba376
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!protected>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPublicTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPublicTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..ccbc5009c154f51624ca92988e6cd5c966d493aa
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageNotPublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageNotPublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<!public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePrivateTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePrivateTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..cce7ba9d66dcb9b7142430e95df59edc0f68976d
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePrivateTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoveragePrivateTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<private>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageProtectedTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageProtectedTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..dbbcc1c31cff0252251840db6ea254606eb9d26d
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoverageProtectedTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoverageProtectedTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<protected>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePublicTest.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePublicTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..bf1bff8c4c84c8c0a2b7ef35043720fdf858bd9a
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveragePublicTest.php
@@ -0,0 +1,12 @@
+<?php
+class NamespaceCoveragePublicTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers Foo\CoveredClass::<public>
+     */
+    public function testSomething()
+    {
+        $o = new Foo\CoveredClass;
+        $o->publicMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveredClass.php b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveredClass.php
new file mode 100644
index 0000000000000000000000000000000000000000..5bd0ddfb2377e31645cf68084d0cd272a82a87ee
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NamespaceCoveredClass.php
@@ -0,0 +1,38 @@
+<?php
+namespace Foo;
+
+class CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        $this->protectedMethod();
+    }
+}
+
+class CoveredClass extends CoveredParentClass
+{
+    private function privateMethod()
+    {
+    }
+
+    protected function protectedMethod()
+    {
+        parent::protectedMethod();
+        $this->privateMethod();
+    }
+
+    public function publicMethod()
+    {
+        parent::publicMethod();
+        $this->protectedMethod();
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/NoArgTestCaseTest.php b/core/vendor/phpunit/phpunit/tests/_files/NoArgTestCaseTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/NoArgTestCaseTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/NoArgTestCaseTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/NoTestCaseClass.php b/core/vendor/phpunit/phpunit/tests/_files/NoTestCaseClass.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/NoTestCaseClass.php
rename to core/vendor/phpunit/phpunit/tests/_files/NoTestCaseClass.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/NoTestCases.php b/core/vendor/phpunit/phpunit/tests/_files/NoTestCases.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/NoTestCases.php
rename to core/vendor/phpunit/phpunit/tests/_files/NoTestCases.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/NonStatic.php b/core/vendor/phpunit/phpunit/tests/_files/NonStatic.php
similarity index 75%
rename from core/vendor/phpunit/phpunit/Tests/_files/NonStatic.php
rename to core/vendor/phpunit/phpunit/tests/_files/NonStatic.php
index 5355b3ccbc1095a14f034f5c9199a2d0f68cc0a1..23d7ef7dc94c69dfc5f81aee3b7a88978e59d9d0 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/NonStatic.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/NonStatic.php
@@ -3,6 +3,6 @@ class NonStatic
 {
     public function suite()
     {
-        return NULL;
+        return null;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/tests/_files/NotExistingCoveredElementTest.php b/core/vendor/phpunit/phpunit/tests/_files/NotExistingCoveredElementTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..be07ef45e730567ff3abb738e5307cfe766c7733
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/NotExistingCoveredElementTest.php
@@ -0,0 +1,24 @@
+<?php
+class NotExistingCoveredElementTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @covers NotExistingClass
+     */
+    public function testOne()
+    {
+    }
+
+    /**
+     * @covers NotExistingClass::notExistingMethod
+     */
+    public function testTwo()
+    {
+    }
+
+    /**
+     * @covers NotExistingClass::<public>
+     */
+    public function testThree()
+    {
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/NotPublicTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/NotPublicTestCase.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/NotPublicTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/NotPublicTestCase.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/NotVoidTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/NotVoidTestCase.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/NotVoidTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/NotVoidTestCase.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/NothingTest.php b/core/vendor/phpunit/phpunit/tests/_files/NothingTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/NothingTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/NothingTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/OneTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/OneTestCase.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/OneTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/OneTestCase.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/OutputTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/OutputTestCase.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/OutputTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/OutputTestCase.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/OverrideTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/OverrideTestCase.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/Tests/_files/OverrideTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/OverrideTestCase.php
index 63ca294dd7d0f2f8f7a86790c89b2335930427ff..fcc276c50fe4c6d22187add57ac77d91d4c39f57 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/OverrideTestCase.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/OverrideTestCase.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'OneTestCase.php';
-
 class OverrideTestCase extends OneTestCase
 {
     public function testCase($arg = '')
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/RequirementsClassDocBlockTest.php b/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
similarity index 82%
rename from core/vendor/phpunit/phpunit/Tests/_files/RequirementsClassDocBlockTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
index ffe25224e52a3feb5d4cdacc9abdbff9218035ee..537603e8f83a1eb9546249a5cf74b7d9fd96900b 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/RequirementsClassDocBlockTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/RequirementsClassDocBlockTest.php
@@ -2,7 +2,8 @@
 
 /**
  * @requires PHP 5.3
- * @requires PHPUnit 3.8
+ * @requires PHPUnit 4.0
+ * @requires OS Linux
  * @requires function testFuncClass
  * @requires extension testExtClass
  */
@@ -11,6 +12,7 @@ class RequirementsClassDocBlockTest {
     /**
      * @requires PHP 5.4
      * @requires PHPUnit 3.7
+     * @requires OS WINNT
      * @requires function testFuncMethod
      * @requires extension testExtMethod
      */
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/RequirementsTest.php b/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
similarity index 78%
rename from core/vendor/phpunit/phpunit/Tests/_files/RequirementsTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
index 1ac6a06c4114a833a041274a61ab671bb3aba9d5..76355c279492887ad6678878921ad8d51a3f4d73 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/RequirementsTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php
@@ -70,9 +70,17 @@ public function testTen()
     {
     }
 
+    /**
+     * @requires OS Linux
+     */
+    public function testEleven()
+    {
+    }
+
     /**
      * @requires PHP 99-dev
      * @requires PHPUnit 9-dev
+     * @requires OS DOESNOTEXIST
      * @requires function testFuncOne
      * @requires function testFuncTwo
      * @requires extension testExtOne
@@ -96,6 +104,13 @@ public function testExistingExtension()
     {
     }
 
+    /**
+     * @requires OS .*
+     */
+    public function testExistingOs()
+    {
+    }
+
     /**
      * @requires PHPUnit 1111111
      */
@@ -109,4 +124,19 @@ public function testAlwaysSkip()
     public function testAlwaysSkip2()
     {
     }
+
+    /**
+     * @requires OS DOESNOTEXIST
+     */
+    public function testAlwaysSkip3()
+    {
+    }
+
+    /**
+     * @requires	  extension	  spl	  
+     * @requires	  OS	  .*	      
+     */
+    public function testSpace()
+    {
+    }
 }
diff --git a/core/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php b/core/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d97d7803dc5a528fd8e91ed42407b73d4bc80f4
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/SampleArrayAccess.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Sample class that implements ArrayAccess copied from
+ * http://www.php.net/manual/en/class.arrayaccess.php
+ * with some minor changes
+ * This class required for PHPUnit_Framework_Constraint_ArrayHasKey testing
+ */
+
+class SampleArrayAccess implements ArrayAccess
+{
+    private $container;
+
+    public function __construct() {
+        $this->container = array();
+    }
+    public function offsetSet($offset, $value) {
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+    public function offsetExists($offset) {
+        return isset($this->container[$offset]);
+    }
+    public function offsetUnset($offset) {
+        unset($this->container[$offset]);
+    }
+    public function offsetGet($offset) {
+        return isset($this->container[$offset]) ? $this->container[$offset] : null;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/SampleClass.php b/core/vendor/phpunit/phpunit/tests/_files/SampleClass.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/SampleClass.php
rename to core/vendor/phpunit/phpunit/tests/_files/SampleClass.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/SelectorAssertionsFixture.html b/core/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/SelectorAssertionsFixture.html
rename to core/vendor/phpunit/phpunit/tests/_files/SelectorAssertionsFixture.html
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/Singleton.php b/core/vendor/phpunit/phpunit/tests/_files/Singleton.php
similarity index 75%
rename from core/vendor/phpunit/phpunit/Tests/_files/Singleton.php
rename to core/vendor/phpunit/phpunit/tests/_files/Singleton.php
index 77240867c0647a345fb9aa30a5eb65e6f49228e7..2509efb3350c7fe2ad2632775140ff2a67cbd5c9 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/Singleton.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/Singleton.php
@@ -1,7 +1,7 @@
 <?php
 class Singleton
 {
-    private static $uniqueInstance = NULL;
+    private static $uniqueInstance = null;
 
     protected function __construct()
     {
@@ -13,7 +13,7 @@ private final function __clone()
 
     public static function getInstance()
     {
-        if (self::$uniqueInstance === NULL) {
+        if (self::$uniqueInstance === null) {
             self::$uniqueInstance = new Singleton;
         }
 
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/StackTest.php b/core/vendor/phpunit/phpunit/tests/_files/StackTest.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/StackTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/StackTest.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/Struct.php b/core/vendor/phpunit/phpunit/tests/_files/Struct.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/Struct.php
rename to core/vendor/phpunit/phpunit/tests/_files/Struct.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/Success.php b/core/vendor/phpunit/phpunit/tests/_files/Success.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/Success.php
rename to core/vendor/phpunit/phpunit/tests/_files/Success.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/TemplateMethodsTest.php b/core/vendor/phpunit/phpunit/tests/_files/TemplateMethodsTest.php
similarity index 92%
rename from core/vendor/phpunit/phpunit/Tests/_files/TemplateMethodsTest.php
rename to core/vendor/phpunit/phpunit/tests/_files/TemplateMethodsTest.php
index 8977956d5141aa8786afab4c84f4c47c515c75f0..d6b1364f2469d5029e1b7d9c860b3859a2c8a3d8 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/TemplateMethodsTest.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/TemplateMethodsTest.php
@@ -19,13 +19,13 @@ protected function assertPreConditions()
     public function testOne()
     {
         print __METHOD__ . "\n";
-        $this->assertTrue(TRUE);
+        $this->assertTrue(true);
     }
 
     public function testTwo()
     {
         print __METHOD__ . "\n";
-        $this->assertTrue(FALSE);
+        $this->assertTrue(false);
     }
 
     protected function assertPostConditions()
@@ -49,4 +49,3 @@ protected function onNotSuccessfulTest(Exception $e)
         throw $e;
     }
 }
-?>
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/TestIterator.php b/core/vendor/phpunit/phpunit/tests/_files/TestIterator.php
similarity index 95%
rename from core/vendor/phpunit/phpunit/Tests/_files/TestIterator.php
rename to core/vendor/phpunit/phpunit/tests/_files/TestIterator.php
index c834efbb287aa2cb52cf50aaa96fe5b333de8f4d..01135e3b39a1b085a5374ab3b55f3f71b52034ee 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/TestIterator.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/TestIterator.php
@@ -2,7 +2,7 @@
 class TestIterator implements Iterator
 {
     protected $array;
-    protected $position;
+    protected $position = 0;
 
     public function __construct($array = array())
     {
diff --git a/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php b/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php
new file mode 100644
index 0000000000000000000000000000000000000000..bae3655fea6f96b646ec4506f6ca6ade1cd2ced3
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/TestIterator2.php
@@ -0,0 +1,35 @@
+<?php
+class TestIterator2 implements Iterator {
+
+    protected $data;
+
+    public function __construct(array $array)
+    {
+        $this->data = $array;
+    }
+
+    public function current()
+    {
+        return current($this->data);
+    }
+
+    public function next()
+    {
+        next($this->data);
+    }
+
+    public function key()
+    {
+        return key($this->data);
+    }
+
+    public function valid()
+    {
+        return key($this->data) !== null;
+    }
+
+    public function rewind()
+    {
+        reset($this->data);
+    }
+}
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ThrowExceptionTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/ThrowExceptionTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/ThrowExceptionTestCase.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/ThrowNoExceptionTestCase.php b/core/vendor/phpunit/phpunit/tests/_files/ThrowNoExceptionTestCase.php
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/ThrowNoExceptionTestCase.php
rename to core/vendor/phpunit/phpunit/tests/_files/ThrowNoExceptionTestCase.php
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/WasRun.php b/core/vendor/phpunit/phpunit/tests/_files/WasRun.php
similarity index 64%
rename from core/vendor/phpunit/phpunit/Tests/_files/WasRun.php
rename to core/vendor/phpunit/phpunit/tests/_files/WasRun.php
index 8e4612b225f859e567f05c2c9646c23a070302d4..4221b6dd7773db9f5a28ecc06b4cdfc8aaff5766 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/WasRun.php
+++ b/core/vendor/phpunit/phpunit/tests/_files/WasRun.php
@@ -1,10 +1,10 @@
 <?php
 class WasRun extends PHPUnit_Framework_TestCase
 {
-    public $wasRun = FALSE;
+    public $wasRun = false;
 
     protected function runTest()
     {
-        $this->wasRun = TRUE;
+        $this->wasRun = true;
     }
 }
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/bar.xml b/core/vendor/phpunit/phpunit/tests/_files/bar.xml
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/bar.xml
rename to core/vendor/phpunit/phpunit/tests/_files/bar.xml
diff --git a/core/vendor/phpunit/phpunit/tests/_files/configuration.custom-printer.xml b/core/vendor/phpunit/phpunit/tests/_files/configuration.custom-printer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a5a1f1d99a612ba3ba89ceb2030813caa7b7871
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/_files/configuration.custom-printer.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit printerFile="CustomPrinter.php" printerClass="CustomPrinter" />
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/configuration.xml b/core/vendor/phpunit/phpunit/tests/_files/configuration.xml
similarity index 92%
rename from core/vendor/phpunit/phpunit/Tests/_files/configuration.xml
rename to core/vendor/phpunit/phpunit/tests/_files/configuration.xml
index 46bc45161d73837c471a6ea2e71794c89235aa05..32e232c49c92e1fe8ad6a885066b5a8609d017c9 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/configuration.xml
+++ b/core/vendor/phpunit/phpunit/tests/_files/configuration.xml
@@ -5,6 +5,7 @@
          bootstrap="/path/to/bootstrap.php"
          cacheTokens="false"
          colors="false"
+         stderr="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
@@ -16,7 +17,10 @@
          timeoutForSmallTests="1"
          timeoutForMediumTests="10"
          timeoutForLargeTests="60"
-         strict="false"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         beStrictAboutOutputDuringTests="false"
+         beStrictAboutTestSize="false"
+         checkForUnintentionallyCoveredCode="false"
          verbose="false">
   <testsuites>
     <testsuite name="My Test Suite">
@@ -76,9 +80,7 @@
   </listeners>
 
   <logging>
-    <log type="coverage-html" target="/tmp/report"
-         charset="UTF-8" highlight="false"
-         lowUpperBound="35" highLowerBound="70"/>
+    <log type="coverage-html" target="/tmp/report" lowUpperBound="50" highLowerBound="90"/>
     <log type="coverage-clover" target="/tmp/clover.xml"/>
     <log type="json" target="/tmp/logfile.json"/>
     <log type="plain" target="/tmp/logfile.txt"/>
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/configuration_xinclude.xml b/core/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
similarity index 67%
rename from core/vendor/phpunit/phpunit/Tests/_files/configuration_xinclude.xml
rename to core/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
index 50faa81546d9e2d2964d9b48353719aa30d62e77..902706c341513b5bc672116d87fb04051dfc82be 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/configuration_xinclude.xml
+++ b/core/vendor/phpunit/phpunit/tests/_files/configuration_xinclude.xml
@@ -5,6 +5,7 @@
          bootstrap="/path/to/bootstrap.php"
          cacheTokens="false"
          colors="false"
+         stderr="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
@@ -17,32 +18,32 @@
          timeoutForMediumTests="10"
          timeoutForLargeTests="60"
          strict="false"
-		 verbose="false">
-		 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-			 href="configuration.xml"
-			 parse="xml"
-			 xpointer="xpointer(/phpunit/testsuites)" />
+         verbose="false">
+         <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+             href="configuration.xml"
+             parse="xml"
+             xpointer="xpointer(/phpunit/testsuites)" />
 
   <groups>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-	  	href="configuration.xml"
-		parse="xml"
-		xpointer="xpointer(/phpunit/groups/*)" />
+          href="configuration.xml"
+        parse="xml"
+        xpointer="xpointer(/phpunit/groups/*)" />
   </groups>
 
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-	  href="configuration.xml"
-	  parse="xml"
-	  xpointer="xpointer(/phpunit/filter)" />
+      href="configuration.xml"
+      parse="xml"
+      xpointer="xpointer(/phpunit/filter)" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-	  href="configuration.xml"
-	  parse="xml"
-	  xpointer="xpointer(/phpunit/listeners)" />
+      href="configuration.xml"
+      parse="xml"
+      xpointer="xpointer(/phpunit/listeners)" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-	  href="configuration.xml"
-	  parse="xml"
-	  xpointer="xpointer(/phpunit/logging)" />
+      href="configuration.xml"
+      parse="xml"
+      xpointer="xpointer(/phpunit/logging)" />
 
   <php>
     <includePath>.</includePath>
@@ -61,8 +62,8 @@
   </php>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-	  href="configuration.xml"
-	  parse="xml"
-	  xpointer="xpointer(/phpunit/selenium)" />
+      href="configuration.xml"
+      parse="xml"
+      xpointer="xpointer(/phpunit/selenium)" />
 </phpunit>
 
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/expectedFileFormat.txt b/core/vendor/phpunit/phpunit/tests/_files/expectedFileFormat.txt
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/expectedFileFormat.txt
rename to core/vendor/phpunit/phpunit/tests/_files/expectedFileFormat.txt
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/foo.xml b/core/vendor/phpunit/phpunit/tests/_files/foo.xml
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/foo.xml
rename to core/vendor/phpunit/phpunit/tests/_files/foo.xml
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/structureAttributesAreSameButValuesAreNot.xml b/core/vendor/phpunit/phpunit/tests/_files/structureAttributesAreSameButValuesAreNot.xml
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/structureAttributesAreSameButValuesAreNot.xml
rename to core/vendor/phpunit/phpunit/tests/_files/structureAttributesAreSameButValuesAreNot.xml
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/structureExpected.xml b/core/vendor/phpunit/phpunit/tests/_files/structureExpected.xml
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/structureExpected.xml
rename to core/vendor/phpunit/phpunit/tests/_files/structureExpected.xml
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/structureIgnoreTextNodes.xml b/core/vendor/phpunit/phpunit/tests/_files/structureIgnoreTextNodes.xml
similarity index 95%
rename from core/vendor/phpunit/phpunit/Tests/_files/structureIgnoreTextNodes.xml
rename to core/vendor/phpunit/phpunit/tests/_files/structureIgnoreTextNodes.xml
index 177e2bfdcca2f107e0f9a7c5f5a9ef458cd64c5f..0771b60ca373fb8a6c28ad8fff384dbae0921a5e 100644
--- a/core/vendor/phpunit/phpunit/Tests/_files/structureIgnoreTextNodes.xml
+++ b/core/vendor/phpunit/phpunit/tests/_files/structureIgnoreTextNodes.xml
@@ -1,13 +1,13 @@
 <text:p xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0">
   <draw:frame xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" svg:width="12.567708175cm" svg:height="16.848541467cm" draw:style-name="Frame">
     <draw:text-box>
-	textnode
+    textnode
       <draw:frame svg:width="12.567708175cm" svg:height="15.848541467cm" draw:style-name="Image">
         <draw:image xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="Pictures/kristian.jpg"/> textnode
       </draw:frame>
-	  textnode
+      textnode
       <text:p text:style-name="Text">Image <text:sequence xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" text:ref-name="refImage1" style:num-format="1" text:formula="ooow:Image+1" text:name="Image">1</text:sequence>: Dette er en test caption</text:p>
-	  textnode
+      textnode
     </draw:text-box>
   </draw:frame>
 </text:p>
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/structureIsSameButDataIsNot.xml b/core/vendor/phpunit/phpunit/tests/_files/structureIsSameButDataIsNot.xml
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/structureIsSameButDataIsNot.xml
rename to core/vendor/phpunit/phpunit/tests/_files/structureIsSameButDataIsNot.xml
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/structureWrongNumberOfAttributes.xml b/core/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfAttributes.xml
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/structureWrongNumberOfAttributes.xml
rename to core/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfAttributes.xml
diff --git a/core/vendor/phpunit/phpunit/Tests/_files/structureWrongNumberOfNodes.xml b/core/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfNodes.xml
similarity index 100%
rename from core/vendor/phpunit/phpunit/Tests/_files/structureWrongNumberOfNodes.xml
rename to core/vendor/phpunit/phpunit/tests/_files/structureWrongNumberOfNodes.xml
diff --git a/core/vendor/phpunit/phpunit/tests/bootstrap-travis.php b/core/vendor/phpunit/phpunit/tests/bootstrap-travis.php
new file mode 100644
index 0000000000000000000000000000000000000000..bce481877742abe69961aecddad1556534f8108b
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/bootstrap-travis.php
@@ -0,0 +1,4 @@
+<?php
+
+ini_set('precision', 14);
+ini_set('serialize_precision', 14);
diff --git a/core/vendor/phpunit/phpunit/tests/bootstrap.php b/core/vendor/phpunit/phpunit/tests/bootstrap.php
new file mode 100644
index 0000000000000000000000000000000000000000..bde92694852f4830642cb5ba8a77672dc1a365a5
--- /dev/null
+++ b/core/vendor/phpunit/phpunit/tests/bootstrap.php
@@ -0,0 +1,10 @@
+<?php
+require __DIR__ . '/../vendor/autoload.php';
+
+if (!ini_get('date.timezone') && !defined('HHVM_VERSION')) {
+  echo PHP_EOL . 'Error: PHPUnit\'s test suite requires the "date.timezone" runtime configuration to be set. Please check your php.ini.' . PHP_EOL;
+  exit(1);
+}
+
+ini_set('precision', 14);
+ini_set('serialize_precision', 14);
diff --git a/core/vendor/sebastian/comparator/.gitignore b/core/vendor/sebastian/comparator/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..a0b0abd5f2d1080e474b267d75869e82d28aed74
--- /dev/null
+++ b/core/vendor/sebastian/comparator/.gitignore
@@ -0,0 +1,5 @@
+/composer.lock
+/composer.phar
+/phpunit.xml
+/.idea
+/vendor
diff --git a/core/vendor/sebastian/comparator/.travis.yml b/core/vendor/sebastian/comparator/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4309f78c6113f4075d49d7831477131aea500e68
--- /dev/null
+++ b/core/vendor/sebastian/comparator/.travis.yml
@@ -0,0 +1,17 @@
+language: php
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+notifications:
+  email: false
+  irc: "irc.freenode.org#phpunit"
diff --git a/core/vendor/sebastian/comparator/LICENSE b/core/vendor/sebastian/comparator/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..0b41d32a027543795e2e811008df2b109c0ce2ed
--- /dev/null
+++ b/core/vendor/sebastian/comparator/LICENSE
@@ -0,0 +1,33 @@
+Comparator
+
+Copyright (c) 2002-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/core/vendor/sebastian/comparator/README.md b/core/vendor/sebastian/comparator/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3921493ef7d4d84809a90b3ab9203389a642d88c
--- /dev/null
+++ b/core/vendor/sebastian/comparator/README.md
@@ -0,0 +1,38 @@
+[![Build Status](https://travis-ci.org/sebastianbergmann/comparator.svg?branch=master)](https://travis-ci.org/sebastianbergmann/comparator)
+
+# Comparator
+
+This component provides the functionality to compare PHP values for equality.
+
+## Usage
+
+```php
+<?php
+use SebastianBergmann\Comparator\Factory;
+use SebastianBergmann\Comparator\ComparisonFailure;
+
+$date1 = new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York'));
+$date2 = new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago'));
+
+$factory = new Factory;
+$comparator = $factory->getComparatorFor($date1, $date2);
+
+try {
+    $comparator->assertEquals($date1, $date2);
+    print "Dates match";
+}
+
+catch (ComparisonFailure $failure) {
+    print "Dates don't match";
+}
+```
+
+## Installation
+
+To add Comparator as a local, per-project dependency to your project, simply add a dependency on `sebastian/comparator` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Comparator 1.0:
+
+    {
+        "require": {
+            "sebastian/comparator": "1.0.*"
+        }
+    }
diff --git a/core/vendor/sebastian/comparator/build.xml b/core/vendor/sebastian/comparator/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..552ebce68eeb2ff31a5a4d4c253eeea4b758fcc6
--- /dev/null
+++ b/core/vendor/sebastian/comparator/build.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="comparator">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <tstamp>
+   <format property="thirty.days.ago" pattern="MM/dd/yyyy hh:mm aa" offset="-30" unit="day"/>
+  </tstamp>
+  <delete>
+   <fileset dir="${basedir}">
+    <include name="composer.phar" />
+    <date datetime="${thirty.days.ago}" when="before"/>
+   </fileset>
+  </delete>
+
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+
+ <target name="phpab" description="Generate autoloader script">
+  <exec executable="phpab">
+   <arg value="--output" />
+   <arg path="tests/autoload.php" />
+   <arg path="tests" />
+  </exec>
+ </target>
+</project>
diff --git a/core/vendor/sebastian/comparator/composer.json b/core/vendor/sebastian/comparator/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..6bfd2d8cd5016a2f189be80f2dbdfbfa59ca4d47
--- /dev/null
+++ b/core/vendor/sebastian/comparator/composer.json
@@ -0,0 +1,44 @@
+{
+    "name": "sebastian/comparator",
+    "description": "Provides the functionality to compare PHP values for equality",
+    "keywords": ["comparator","compare","equality"],
+    "homepage": "http://www.github.com/sebastianbergmann/comparator",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        },
+        {
+            "name": "Jeff Welch",
+            "email": "whatthejeff@gmail.com"
+        },
+        {
+            "name": "Volker Dusch",
+            "email": "github@wallbash.com"
+        },
+        {
+            "name": "Bernhard Schussek",
+            "email": "bschussek@2bepublished.at"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "sebastian/diff": "~1.1",
+        "sebastian/exporter": "~1.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.1"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
+
diff --git a/core/vendor/sebastian/comparator/phpunit.xml.dist b/core/vendor/sebastian/comparator/phpunit.xml.dist
new file mode 100644
index 0000000000000000000000000000000000000000..4b7c2d01241f148906745d353051806e54667d35
--- /dev/null
+++ b/core/vendor/sebastian/comparator/phpunit.xml.dist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="tests/bootstrap.php"
+         strict="true"
+         verbose="true">
+ <testsuites>
+  <testsuite name="Comparator">
+   <directory>tests</directory>
+  </testsuite>
+ </testsuites>
+ <filter>
+  <whitelist addUncoveredFilesFromWhitelist="true">
+   <directory>src</directory>
+  </whitelist>
+ </filter>
+</phpunit>
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Array.php b/core/vendor/sebastian/comparator/src/ArrayComparator.php
similarity index 63%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Array.php
rename to core/vendor/sebastian/comparator/src/ArrayComparator.php
index ebbf928afd7bd5071ac9e3b69d76643f002dbe39..9c048e95c49a3b0c94145fbcc13089645fe9b97a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Array.php
+++ b/core/vendor/sebastian/comparator/src/ArrayComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares arrays for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_Array extends PHPUnit_Framework_Comparator
+class ArrayComparator extends Comparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -79,11 +77,12 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @param  array $processed
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE, array &$processed = array())
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
     {
         if ($canonicalize) {
             sort($expected);
@@ -92,80 +91,79 @@ public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FAL
 
         $remaining = $actual;
         $expString = $actString = "Array (\n";
-        $equal = TRUE;
+        $equal     = true;
 
         foreach ($expected as $key => $value) {
             unset($remaining[$key]);
 
             if (!array_key_exists($key, $actual)) {
                 $expString .= sprintf(
-                  "    %s => %s\n",
-
-                  PHPUnit_Util_Type::export($key),
-                  PHPUnit_Util_Type::shortenedExport($value)
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $this->exporter->shortenedExport($value)
                 );
-                $equal = FALSE;
+
+                $equal = false;
+
                 continue;
             }
 
             try {
-                $this->factory->getComparatorFor($value, $actual[$key])->assertEquals($value, $actual[$key], $delta, $canonicalize, $ignoreCase, $processed);
-                $expString .= sprintf(
-                  "    %s => %s\n",
+                $comparator = $this->factory->getComparatorFor($value, $actual[$key]);
+                $comparator->assertEquals($value, $actual[$key], $delta, $canonicalize, $ignoreCase, $processed);
 
-                  PHPUnit_Util_Type::export($key),
-                  PHPUnit_Util_Type::shortenedExport($value)
+                $expString .= sprintf(
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $this->exporter->shortenedExport($value)
                 );
                 $actString .= sprintf(
-                  "    %s => %s\n",
-
-                  PHPUnit_Util_Type::export($key),
-                  PHPUnit_Util_Type::shortenedExport($actual[$key])
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $this->exporter->shortenedExport($actual[$key])
                 );
-            }
-
-            catch (PHPUnit_Framework_ComparisonFailure $e) {
+            } catch (ComparisonFailure $e) {
                 $expString .= sprintf(
-                  "    %s => %s\n",
-
-                  PHPUnit_Util_Type::export($key),
-                  $e->getExpectedAsString()
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $e->getExpectedAsString()
                     ? $this->indent($e->getExpectedAsString())
-                    : PHPUnit_Util_Type::shortenedExport($e->getExpected())
+                    : $this->exporter->shortenedExport($e->getExpected())
                 );
-                $actString .= sprintf(
-                  "    %s => %s\n",
 
-                  PHPUnit_Util_Type::export($key),
-                  $e->getActualAsString()
+                $actString .= sprintf(
+                    "    %s => %s\n",
+                    $this->exporter->export($key),
+                    $e->getActualAsString()
                     ? $this->indent($e->getActualAsString())
-                    : PHPUnit_Util_Type::shortenedExport($e->getActual())
+                    : $this->exporter->shortenedExport($e->getActual())
                 );
-                $equal = FALSE;
+
+                $equal = false;
             }
         }
 
         foreach ($remaining as $key => $value) {
             $actString .= sprintf(
-              "    %s => %s\n",
-
-              PHPUnit_Util_Type::export($key),
-              PHPUnit_Util_Type::shortenedExport($value)
+                "    %s => %s\n",
+                $this->exporter->export($key),
+                $this->exporter->shortenedExport($value)
             );
-            $equal = FALSE;
+
+            $equal = false;
         }
 
         $expString .= ')';
         $actString .= ')';
 
         if (!$equal) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              $expString,
-              $actString,
-              FALSE,
-             'Failed asserting that two arrays are equal.'
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $expString,
+                $actString,
+                false,
+                'Failed asserting that two arrays are equal.'
             );
         }
     }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator.php b/core/vendor/sebastian/comparator/src/Comparator.php
similarity index 78%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator.php
rename to core/vendor/sebastian/comparator/src/Comparator.php
index 2cdc21c070342de061910a569c9e7563519445c2..4d2716a5396a47ae6798b099f3004292a8c9c428 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator.php
+++ b/core/vendor/sebastian/comparator/src/Comparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,37 +34,48 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
+use SebastianBergmann\Exporter\Exporter;
+
 /**
  * Abstract base class for comparators which compare values for equality.
  *
- * @package    PHPUnit
+ * @package    Comparator
  * @subpackage Framework
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-abstract class PHPUnit_Framework_Comparator
+abstract class Comparator
 {
     /**
-     * @var PHPUnit_Framework_ComparatorFactory
+     * @var Factory
      */
     protected $factory;
 
     /**
-     * @param PHPUnit_Framework_ComparatorFactory $factory
+     * @var Exporter
+     */
+    protected $exporter;
+
+    public function __construct()
+    {
+        $this->exporter = new Exporter;
+    }
+
+    /**
+     * @param Factory $factory
      */
-    public function setFactory(PHPUnit_Framework_ComparatorFactory $factory)
+    public function setFactory(Factory $factory)
     {
         $this->factory = $factory;
     }
@@ -89,9 +100,9 @@ abstract public function accepts($expected, $actual);
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    abstract public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE);
+    abstract public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false);
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/ComparisonFailure.php b/core/vendor/sebastian/comparator/src/ComparisonFailure.php
similarity index 83%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/ComparisonFailure.php
rename to core/vendor/sebastian/comparator/src/ComparisonFailure.php
index 7d8f128af270ac7800d3dbe3014d4931d3e63375..e1e053d5c1c5ead0e1cd2c254a3d4ed221200494 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/ComparisonFailure.php
+++ b/core/vendor/sebastian/comparator/src/ComparisonFailure.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,29 +34,29 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 2.0.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
+use SebastianBergmann\Diff\Differ;
+
 /**
  * Thrown when an assertion for string equality failed.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 2.0.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_ComparisonFailure extends PHPUnit_Framework_AssertionFailedError
+class ComparisonFailure extends \RuntimeException
 {
     /**
      * Expected value of the retrieval which does not match $actual.
@@ -105,7 +105,7 @@ class PHPUnit_Framework_ComparisonFailure extends PHPUnit_Framework_AssertionFai
      * @param string $message A string which is prefixed on all returned lines
      *                        in the difference output.
      */
-    public function __construct($expected, $actual, $expectedAsString, $actualAsString, $identical = FALSE, $message = '')
+    public function __construct($expected, $actual, $expectedAsString, $actualAsString, $identical = false, $message = '')
     {
         $this->expected         = $expected;
         $this->actual           = $actual;
@@ -151,9 +151,13 @@ public function getExpectedAsString()
      */
     public function getDiff()
     {
-        return $this->actualAsString || $this->expectedAsString
-          ? PHPUnit_Util_Diff::diff($this->expectedAsString, $this->actualAsString)
-          : '';
+        if (!$this->actualAsString && !$this->expectedAsString) {
+            return '';
+        }
+
+        $differ = new Differ("\n--- Expected\n+++ Actual\n");
+
+        return $differ->diff($this->expectedAsString, $this->actualAsString);
     }
 
     /**
diff --git a/core/vendor/sebastian/comparator/src/DOMNodeComparator.php b/core/vendor/sebastian/comparator/src/DOMNodeComparator.php
new file mode 100644
index 0000000000000000000000000000000000000000..f69bc8fbc768f06c6050c6184537b0e4889beb95
--- /dev/null
+++ b/core/vendor/sebastian/comparator/src/DOMNodeComparator.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Comparator
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use DOMDocument;
+use DOMNode;
+
+/**
+ * Compares DOMNode instances for equality.
+ *
+ * @package    Comparator
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+class DOMNodeComparator extends ObjectComparator
+{
+    /**
+     * Returns whether the comparator can compare two values.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual The second value to compare
+     * @return boolean
+     */
+    public function accepts($expected, $actual)
+    {
+        return $expected instanceof DOMNode && $actual instanceof DOMNode;
+    }
+
+    /**
+     * Asserts that two values are equal.
+     *
+     * @param  mixed $expected The first value to compare
+     * @param  mixed $actual The second value to compare
+     * @param  float $delta The allowed numerical distance between two values to
+     *                      consider them equal
+     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
+     *                             comparison
+     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
+     *                           ignored when comparing string values
+     * @throws ComparisonFailure Thrown when the comparison
+     *                           fails. Contains information about the
+     *                           specific errors that lead to the failure.
+     */
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
+    {
+        $expectedAsString = $this->nodeToText($expected, true, $ignoreCase);
+        $actualAsString   = $this->nodeToText($actual, true, $ignoreCase);
+
+        if ($expectedAsString !== $actualAsString) {
+            if ($expected instanceof DOMDocument) {
+                $type = 'documents';
+            } else {
+                $type = 'nodes';
+            }
+
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $expectedAsString,
+                $actualAsString,
+                false,
+                sprintf("Failed asserting that two DOM %s are equal.\n", $type)
+            );
+        }
+    }
+
+    /**
+     * Returns the normalized, whitespace-cleaned, and indented textual
+     * representation of a DOMNode.
+     *
+     * @param  DOMNode $node
+     * @param  boolean $canonicalize
+     * @param  boolean $ignoreCase
+     * @return string
+     */
+    private function nodeToText(DOMNode $node, $canonicalize, $ignoreCase)
+    {
+        if ($canonicalize) {
+            $document = new DOMDocument;
+            $document->loadXML($node->C14N());
+
+            $node = $document;
+        }
+
+        if ($node instanceof DOMDocument) {
+            $document = $node;
+        } else {
+            $document = $node->ownerDocument;
+        }
+
+        $document->formatOutput = true;
+        $document->normalizeDocument();
+
+        if ($node instanceof DOMDocument) {
+            $text = $node->saveXML();
+        } else {
+            $text = $document->saveXML($node);
+        }
+
+        if ($ignoreCase) {
+            $text = strtolower($text);
+        }
+
+        return $text;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/DOMDocument.php b/core/vendor/sebastian/comparator/src/DateTimeComparator.php
similarity index 61%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/DOMDocument.php
rename to core/vendor/sebastian/comparator/src/DateTimeComparator.php
index 620834a94c32eddbdfb4930b396f69d13621d864..ed2e2ba5bf93ecbd7e8c68e5adb4a4c65e0921e3 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/DOMDocument.php
+++ b/core/vendor/sebastian/comparator/src/DateTimeComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
- * Compares DOMDocument instances for equality.
+ * Compares DateTime instances for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_DOMDocument extends PHPUnit_Framework_Comparator_Object
+class DateTimeComparator extends ObjectComparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -65,7 +63,7 @@ class PHPUnit_Framework_Comparator_DOMDocument extends PHPUnit_Framework_Compara
      */
     public function accepts($expected, $actual)
     {
-        return $expected instanceof DOMDocument && $actual instanceof DOMDocument;
+        return $expected instanceof \DateTime && $actual instanceof \DateTime;
     }
 
     /**
@@ -79,36 +77,42 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
-        if ($expected->C14N() !== $actual->C14N()) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              $this->domToText($expected),
-              $this->domToText($actual),
-              FALSE,
-              'Failed asserting that two DOM documents are equal.'
+        $delta = new \DateInterval(sprintf('PT%sS', abs($delta)));
+
+        $expectedLower = clone $expected;
+        $expectedUpper = clone $expected;
+
+        if ($actual < $expectedLower->sub($delta) ||
+            $actual > $expectedUpper->add($delta)) {
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $this->dateTimeToString($expected),
+                $this->dateTimeToString($actual),
+                false,
+                'Failed asserting that two DateTime objects are equal.'
             );
         }
     }
 
     /**
-     * Returns the normalized, whitespace-cleaned, and indented textual
-     * representation of a DOMDocument.
+     * Returns an ISO 8601 formatted string representation of a datetime or
+     * 'Invalid DateTime object' if the provided DateTime was not properly
+     * initialized.
      *
-     * @param DOMDocument $document
+     * @param \DateTime $datetime
      * @return string
      */
-    protected function domToText(DOMDocument $document)
+    protected function dateTimeToString(\DateTime $datetime)
     {
-        $document->formatOutput = TRUE;
-        $document->normalizeDocument();
+        $string = $datetime->format(\DateTime::ISO8601);
 
-        return $document->saveXML();
+        return $string ? $string : 'Invalid DateTime object';
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Double.php b/core/vendor/sebastian/comparator/src/DoubleComparator.php
similarity index 81%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Double.php
rename to core/vendor/sebastian/comparator/src/DoubleComparator.php
index 6c1f406000b72d65da2e926f5a9a46330b5afb28..9e06ab79ea6e9bdc383de05ba92f08a1b35f7619 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Double.php
+++ b/core/vendor/sebastian/comparator/src/DoubleComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares doubles for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_Double extends PHPUnit_Framework_Comparator_Numeric
+class DoubleComparator extends NumericComparator
 {
     /**
      * Smallest value available in PHP.
@@ -86,11 +84,11 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         if ($delta == 0) {
             $delta = self::EPSILON;
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Exception.php b/core/vendor/sebastian/comparator/src/ExceptionComparator.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Exception.php
rename to core/vendor/sebastian/comparator/src/ExceptionComparator.php
index 0315495307d11eba390836920476929ef775c5f1..e45e5660967c0ff59ab78d634ed4b54745f949b5 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Exception.php
+++ b/core/vendor/sebastian/comparator/src/ExceptionComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares Exception instances for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_Exception extends PHPUnit_Framework_Comparator_Object
+class ExceptionComparator extends ObjectComparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -65,7 +63,7 @@ class PHPUnit_Framework_Comparator_Exception extends PHPUnit_Framework_Comparato
      */
     public function accepts($expected, $actual)
     {
-        return $expected instanceof Exception && $actual instanceof Exception;
+        return $expected instanceof \Exception && $actual instanceof \Exception;
     }
 
     /**
@@ -83,8 +81,8 @@ protected function toArray($object)
             $array['file'],
             $array['line'],
             $array['trace'],
-            $array['string'], // some internal property of Exception
-            $array['xdebug_message'] // some internal property added by XDebug
+            $array['string'],
+            $array['xdebug_message']
         );
 
         return $array;
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/ComparatorFactory.php b/core/vendor/sebastian/comparator/src/Factory.php
similarity index 58%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/ComparatorFactory.php
rename to core/vendor/sebastian/comparator/src/Factory.php
index 2aa7be5cf16854d1afa778c25eed65d6f7291cc9..054ff421e33c8eedf279331e45e1071bd96f71b1 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/ComparatorFactory.php
+++ b/core/vendor/sebastian/comparator/src/Factory.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,68 +34,48 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Factory for comparators which compare values for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_ComparatorFactory
+class Factory
 {
     /**
-     * @var array
-     */
-    protected $comparators = array();
-
-    /**
-     * @var PHPUnit_Framework_ComparatorFactory
+     * @var Comparator[]
      */
-    private static $defaultInstance = NULL;
+    private $comparators = array();
 
     /**
      * Constructs a new factory.
      */
     public function __construct()
     {
-        $this->register(new PHPUnit_Framework_Comparator_Type);
-        $this->register(new PHPUnit_Framework_Comparator_Scalar);
-        $this->register(new PHPUnit_Framework_Comparator_Numeric);
-        $this->register(new PHPUnit_Framework_Comparator_Double);
-        $this->register(new PHPUnit_Framework_Comparator_Array);
-        $this->register(new PHPUnit_Framework_Comparator_Resource);
-        $this->register(new PHPUnit_Framework_Comparator_Object);
-        $this->register(new PHPUnit_Framework_Comparator_Exception);
-        $this->register(new PHPUnit_Framework_Comparator_SplObjectStorage);
-        $this->register(new PHPUnit_Framework_Comparator_DOMDocument);
-        $this->register(new PHPUnit_Framework_Comparator_MockObject);
-    }
-
-    /**
-     * Returns the default instance.
-     *
-     * @return PHPUnit_Framework_ComparatorFactory
-     */
-    public static function getDefaultInstance()
-    {
-        if (self::$defaultInstance === NULL) {
-            self::$defaultInstance = new PHPUnit_Framework_ComparatorFactory;
-        }
-
-        return self::$defaultInstance;
+        $this->register(new TypeComparator);
+        $this->register(new ScalarComparator);
+        $this->register(new NumericComparator);
+        $this->register(new DoubleComparator);
+        $this->register(new ArrayComparator);
+        $this->register(new ResourceComparator);
+        $this->register(new ObjectComparator);
+        $this->register(new ExceptionComparator);
+        $this->register(new SplObjectStorageComparator);
+        $this->register(new DOMNodeComparator);
+        $this->register(new MockObjectComparator);
+        $this->register(new DateTimeComparator);
     }
 
     /**
@@ -103,8 +83,7 @@ public static function getDefaultInstance()
      *
      * @param  mixed $expected The first value to compare
      * @param  mixed $actual The second value to compare
-     * @return PHPUnit_Framework_Comparator
-     * @throws PHPUnit_Framework_Exception
+     * @return Comparator
      */
     public function getComparatorFor($expected, $actual)
     {
@@ -113,13 +92,6 @@ public function getComparatorFor($expected, $actual)
                 return $comparator;
             }
         }
-
-        throw new PHPUnit_Framework_Exception(
-          sprintf(
-            'No comparator is registered for comparing the types "%s" and "%s"',
-            gettype($expected), gettype($actual)
-          )
-        );
     }
 
     /**
@@ -130,11 +102,12 @@ public function getComparatorFor($expected, $actual)
      * existing comparators, meaning that its accept() method will be tested
      * before those of the other comparators.
      *
-     * @param  PHPUnit_Framework_Comparator $comparator The registered comparator
+     * @param Comparator $comparator The registered comparator
      */
-    public function register(PHPUnit_Framework_Comparator $comparator)
+    public function register(Comparator $comparator)
     {
         array_unshift($this->comparators, $comparator);
+
         $comparator->setFactory($this);
     }
 
@@ -143,9 +116,9 @@ public function register(PHPUnit_Framework_Comparator $comparator)
      *
      * This comparator will no longer be returned by getInstance().
      *
-     * @param  PHPUnit_Framework_Comparator $comparator The unregistered comparator
+     * @param Comparator $comparator The unregistered comparator
      */
-    public function unregister(PHPUnit_Framework_Comparator $comparator)
+    public function unregister(Comparator $comparator)
     {
         foreach ($this->comparators as $key => $_comparator) {
             if ($comparator === $_comparator) {
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/MockObject.php b/core/vendor/sebastian/comparator/src/MockObjectComparator.php
similarity index 75%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/MockObject.php
rename to core/vendor/sebastian/comparator/src/MockObjectComparator.php
index 4ae8bdf8420c048d9a0da266d9867b9e9bdf0789..d9275edc36832cf3b5863c926591854269f73509 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/MockObject.php
+++ b/core/vendor/sebastian/comparator/src/MockObjectComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,38 +34,36 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares PHPUnit_Framework_MockObject_MockObject instances for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_MockObject extends PHPUnit_Framework_Comparator_Object
+class MockObjectComparator extends ObjectComparator
 {
     /**
      * Returns whether the comparator can compare two values.
      *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
+     * @param  mixed   $expected The first value to compare
+     * @param  mixed   $actual   The second value to compare
      * @return boolean
      */
     public function accepts($expected, $actual)
     {
-        return $expected instanceof PHPUnit_Framework_MockObject_MockObject && $actual instanceof PHPUnit_Framework_MockObject_MockObject;
+        return $expected instanceof \PHPUnit_Framework_MockObject_MockObject && $actual instanceof \PHPUnit_Framework_MockObject_MockObject;
     }
 
     /**
@@ -83,4 +81,4 @@ protected function toArray($object)
 
         return $array;
     }
-}
+}
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Numeric.php b/core/vendor/sebastian/comparator/src/NumericComparator.php
similarity index 69%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Numeric.php
rename to core/vendor/sebastian/comparator/src/NumericComparator.php
index 63c2847d837abbb40adc63430c66b5083d250eda..51b8de9c1c2b5cc5c0075066d400750bc49fc490 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Numeric.php
+++ b/core/vendor/sebastian/comparator/src/NumericComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,28 +34,27 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Alexander <iam.asm89@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares numerical values for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
  * @author     Alexander <iam.asm89@gmail.com>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_Numeric extends PHPUnit_Framework_Comparator_Scalar
+class NumericComparator extends ScalarComparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -67,7 +66,10 @@ class PHPUnit_Framework_Comparator_Numeric extends PHPUnit_Framework_Comparator_
     public function accepts($expected, $actual)
     {
         // all numerical values, but not if one of them is a double
-        return is_numeric($expected) && is_numeric($actual) && !(is_double($expected) || is_double($actual));
+        // or both of them are strings
+        return is_numeric($expected) && is_numeric($actual) &&
+               !(is_double($expected) || is_double($actual)) &&
+               !(is_string($expected) && is_string($actual));
     }
 
     /**
@@ -81,31 +83,30 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         if (is_infinite($actual) && is_infinite($expected)) {
             return;
         }
 
-        if ((is_infinite($actual) XOR is_infinite($expected)) ||
-            (is_nan($actual) OR is_nan($expected)) ||
+        if ((is_infinite($actual) xor is_infinite($expected)) ||
+            (is_nan($actual) or is_nan($expected)) ||
             abs($actual - $expected) > $delta) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              '',
-              '',
-              FALSE,
-              sprintf(
-                'Failed asserting that %s matches expected %s.',
-
-                PHPUnit_Util_Type::export($actual),
-                PHPUnit_Util_Type::export($expected)
-              )
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                '',
+                '',
+                false,
+                sprintf(
+                    'Failed asserting that %s matches expected %s.',
+                    $this->exporter->export($actual),
+                    $this->exporter->export($expected)
+                )
             );
         }
     }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Object.php b/core/vendor/sebastian/comparator/src/ObjectComparator.php
similarity index 64%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Object.php
rename to core/vendor/sebastian/comparator/src/ObjectComparator.php
index 8e564730ad54718c64619421de540e309b11b3d1..3da5231626b01acd4a50a9cdc30bda0bdc76c52e 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Object.php
+++ b/core/vendor/sebastian/comparator/src/ObjectComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares objects for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_Object extends PHPUnit_Framework_Comparator_Array
+class ObjectComparator extends ArrayComparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -79,31 +77,31 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @param  array $processed
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE, array &$processed = array())
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false, array &$processed = array())
     {
         if (get_class($actual) !== get_class($expected)) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              PHPUnit_Util_Type::export($expected),
-              PHPUnit_Util_Type::export($actual),
-              FALSE,
-              sprintf(
-                '%s is not instance of expected class "%s".',
-
-                PHPUnit_Util_Type::export($actual),
-                get_class($expected)
-              )
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $this->exporter->export($expected),
+                $this->exporter->export($actual),
+                false,
+                sprintf(
+                    '%s is not instance of expected class "%s".',
+                    $this->exporter->export($actual),
+                    get_class($expected)
+                )
             );
         }
 
         // don't compare twice to allow for cyclic dependencies
-        if (in_array(array($actual, $expected), $processed, TRUE) ||
-            in_array(array($expected, $actual), $processed, TRUE)) {
+        if (in_array(array($actual, $expected), $processed, true) ||
+            in_array(array($expected, $actual), $processed, true)) {
             return;
         }
 
@@ -114,18 +112,23 @@ public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FAL
         // CAUTION: this conditional clause is not tested
         if ($actual !== $expected) {
             try {
-                parent::assertEquals($this->toArray($expected), $this->toArray($actual), $delta, $canonicalize, $ignoreCase, $processed);
-            }
-
-            catch (PHPUnit_Framework_ComparisonFailure $e) {
-                throw new PHPUnit_Framework_ComparisonFailure(
-                  $expected,
-                  $actual,
-                  // replace "Array" with "MyClass object"
-                  substr_replace($e->getExpectedAsString(), get_class($expected) . ' Object', 0, 5),
-                  substr_replace($e->getActualAsString(), get_class($actual) . ' Object', 0, 5),
-                  FALSE,
-                  'Failed asserting that two objects are equal.'
+                parent::assertEquals(
+                    $this->toArray($expected),
+                    $this->toArray($actual),
+                    $delta,
+                    $canonicalize,
+                    $ignoreCase,
+                    $processed
+                );
+            } catch (ComparisonFailure $e) {
+                throw new ComparisonFailure(
+                    $expected,
+                    $actual,
+                    // replace "Array" with "MyClass object"
+                    substr_replace($e->getExpectedAsString(), get_class($expected) . ' Object', 0, 5),
+                    substr_replace($e->getActualAsString(), get_class($actual) . ' Object', 0, 5),
+                    false,
+                    'Failed asserting that two objects are equal.'
                 );
             }
         }
@@ -140,6 +143,6 @@ public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FAL
      */
     protected function toArray($object)
     {
-        return PHPUnit_Util_Type::toArray($object);
+        return $this->exporter->toArray($object);
     }
 }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Resource.php b/core/vendor/sebastian/comparator/src/ResourceComparator.php
similarity index 76%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Resource.php
rename to core/vendor/sebastian/comparator/src/ResourceComparator.php
index 440fd7e8db61383511fdf3b3b2042e02763d15b0..38578a11392f74d863c7d41e3980cb2a17c1de5a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Resource.php
+++ b/core/vendor/sebastian/comparator/src/ResourceComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares resources for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_Resource extends PHPUnit_Framework_Comparator
+class ResourceComparator extends Comparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -79,18 +77,18 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         if ($actual != $expected) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              PHPUnit_Util_Type::export($expected),
-              PHPUnit_Util_Type::export($actual)
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                $this->exporter->export($expected),
+                $this->exporter->export($actual)
             );
         }
     }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Scalar.php b/core/vendor/sebastian/comparator/src/ScalarComparator.php
similarity index 66%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Scalar.php
rename to core/vendor/sebastian/comparator/src/ScalarComparator.php
index 451341d0e73f8003929ea1458881b4fce63a3bab..26f13fc38920dc5641ce17207732b9739c29780c 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Scalar.php
+++ b/core/vendor/sebastian/comparator/src/ScalarComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares scalar or NULL values for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_Scalar extends PHPUnit_Framework_Comparator
+class ScalarComparator extends Comparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -66,11 +64,11 @@ class PHPUnit_Framework_Comparator_Scalar extends PHPUnit_Framework_Comparator
      */
     public function accepts($expected, $actual)
     {
-        return ((is_scalar($expected) XOR NULL === $expected) &&
-                 (is_scalar($actual) XOR NULL === $actual))
-          // allow comparison between strings and objects featuring __toString()
-          || (is_string($expected) && is_object($actual) && method_exists($actual, '__toString'))
-          || (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
+        return ((is_scalar($expected) xor null === $expected) &&
+               (is_scalar($actual) xor null === $actual))
+               // allow comparison between strings and objects featuring __toString()
+               || (is_string($expected) && is_object($actual) && method_exists($actual, '__toString'))
+               || (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
     }
 
     /**
@@ -84,11 +82,11 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         $expectedToCompare = $expected;
         $actualToCompare = $actual;
@@ -107,29 +105,28 @@ public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FAL
 
         if ($expectedToCompare != $actualToCompare) {
             if (is_string($expected) && is_string($actual)) {
-                throw new PHPUnit_Framework_ComparisonFailure(
-                  $expected,
-                  $actual,
-                  PHPUnit_Util_Type::export($expected),
-                  PHPUnit_Util_Type::export($actual),
-                  FALSE,
-                  'Failed asserting that two strings are equal.'
+                throw new ComparisonFailure(
+                    $expected,
+                    $actual,
+                    $this->exporter->export($expected),
+                    $this->exporter->export($actual),
+                    false,
+                    'Failed asserting that two strings are equal.'
                 );
             }
 
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              // no diff is required
-              '',
-              '',
-              FALSE,
-              sprintf(
-                'Failed asserting that %s matches expected %s.',
-
-                PHPUnit_Util_Type::export($actual),
-                PHPUnit_Util_Type::export($expected)
-              )
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                // no diff is required
+                '',
+                '',
+                false,
+                sprintf(
+                    'Failed asserting that %s matches expected %s.',
+                    $this->exporter->export($actual),
+                    $this->exporter->export($expected)
+                )
             );
         }
     }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/SplObjectStorage.php b/core/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
similarity index 67%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/SplObjectStorage.php
rename to core/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
index e2ecd392949e5598170ee3f05e6c25d506e50d63..2ff0828e91e771606aacf451efc2ba9a2808e834 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/SplObjectStorage.php
+++ b/core/vendor/sebastian/comparator/src/SplObjectStorageComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
- * Compares SplObjectStorage instances for equality.
+ * Compares \SplObjectStorage instances for equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_SplObjectStorage extends PHPUnit_Framework_Comparator
+class SplObjectStorageComparator extends Comparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -65,7 +63,7 @@ class PHPUnit_Framework_Comparator_SplObjectStorage extends PHPUnit_Framework_Co
      */
     public function accepts($expected, $actual)
     {
-        return $expected instanceof SplObjectStorage && $actual instanceof SplObjectStorage;
+        return $expected instanceof \SplObjectStorage && $actual instanceof \SplObjectStorage;
     }
 
     /**
@@ -79,34 +77,34 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         foreach ($actual as $object) {
             if (!$expected->contains($object)) {
-                throw new PHPUnit_Framework_ComparisonFailure(
-                  $expected,
-                  $actual,
-                  PHPUnit_Util_Type::export($expected),
-                  PHPUnit_Util_Type::export($actual),
-                  FALSE,
-                  'Failed asserting that two objects are equal.'
+                throw new ComparisonFailure(
+                    $expected,
+                    $actual,
+                    $this->exporter->export($expected),
+                    $this->exporter->export($actual),
+                    false,
+                    'Failed asserting that two objects are equal.'
                 );
             }
         }
 
         foreach ($expected as $object) {
             if (!$actual->contains($object)) {
-                throw new PHPUnit_Framework_ComparisonFailure(
-                  $expected,
-                  $actual,
-                  PHPUnit_Util_Type::export($expected),
-                  PHPUnit_Util_Type::export($actual),
-                  FALSE,
-                  'Failed asserting that two objects are equal.'
+                throw new ComparisonFailure(
+                    $expected,
+                    $actual,
+                    $this->exporter->export($expected),
+                    $this->exporter->export($actual),
+                    false,
+                    'Failed asserting that two objects are equal.'
                 );
             }
         }
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Type.php b/core/vendor/sebastian/comparator/src/TypeComparator.php
similarity index 72%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Type.php
rename to core/vendor/sebastian/comparator/src/TypeComparator.php
index 7e6e59c74a762a59f4bb9701706f13e78c0c3092..3c4e87023c6045c2857034e7883848645d3d6451 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Comparator/Type.php
+++ b/core/vendor/sebastian/comparator/src/TypeComparator.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,27 +34,25 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
+namespace SebastianBergmann\Comparator;
+
 /**
  * Compares values for type equality.
  *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
+ * @package    Comparator
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
-class PHPUnit_Framework_Comparator_Type extends PHPUnit_Framework_Comparator
+class TypeComparator extends Comparator
 {
     /**
      * Returns whether the comparator can compare two values.
@@ -65,7 +63,7 @@ class PHPUnit_Framework_Comparator_Type extends PHPUnit_Framework_Comparator
      */
     public function accepts($expected, $actual)
     {
-        return TRUE;
+        return true;
     }
 
     /**
@@ -79,26 +77,25 @@ public function accepts($expected, $actual)
      *                             comparison
      * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
      *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
+     * @throws ComparisonFailure Thrown when the comparison
      *                           fails. Contains information about the
      *                           specific errors that lead to the failure.
      */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+    public function assertEquals($expected, $actual, $delta = 0.0, $canonicalize = false, $ignoreCase = false)
     {
         if (gettype($expected) != gettype($actual)) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              // we don't need a diff
-              '',
-              '',
-              FALSE,
-              sprintf(
-                '%s does not match expected type "%s".',
-
-                PHPUnit_Util_Type::shortenedExport($actual),
-                gettype($expected)
-              )
+            throw new ComparisonFailure(
+                $expected,
+                $actual,
+                // we don't need a diff
+                '',
+                '',
+                false,
+                sprintf(
+                    '%s does not match expected type "%s".',
+                    $this->exporter->shortenedExport($actual),
+                    gettype($expected)
+                )
             );
         }
     }
diff --git a/core/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php b/core/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b03a5393ed4d579d9c93ca02577443295bc712b7
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/DateTimeComparatorTest.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * Comparator
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use DateTime;
+use DateTimeZone;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\DateTimeComparator
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+class DateTimeComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new DateTimeComparator;
+    }
+
+    public function acceptsFailsProvider()
+    {
+        $datetime = new DateTime;
+
+        return array(
+          array($datetime, null),
+          array(null, $datetime),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York'))
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:13:25', new DateTimeZone('America/New_York')),
+            10
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:14:40', new DateTimeZone('America/New_York')),
+            65
+          ),
+          array(
+            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29', new DateTimeZone('America/New_York'))
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/Chicago'))
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 03:13:49', new DateTimeZone('America/Chicago')),
+            15
+          ),
+          array(
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago'))
+          ),
+          array(
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 23:01:30', new DateTimeZone('America/Chicago')),
+            100
+          ),
+          array(
+            new DateTime('@1364616000'),
+            new DateTime('2013-03-29 23:00:00', new DateTimeZone('America/Chicago'))
+          ),
+          array(
+            new DateTime('2013-03-29T05:13:35-0500'),
+            new DateTime('2013-03-29T04:13:35-0600')
+          )
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        return array(
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York'))
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 03:13:35', new DateTimeZone('America/New_York')),
+            3500
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 05:13:35', new DateTimeZone('America/New_York')),
+            3500
+          ),
+          array(
+            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York'))
+          ),
+          array(
+            new DateTime('2013-03-29', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            43200
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+          ),
+          array(
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-29 04:13:35', new DateTimeZone('America/Chicago')),
+            3500
+          ),
+          array(
+            new DateTime('2013-03-30', new DateTimeZone('America/New_York')),
+            new DateTime('2013-03-30', new DateTimeZone('America/Chicago'))
+          ),
+          array(
+            new DateTime('2013-03-29T05:13:35-0600'),
+            new DateTime('2013-03-29T04:13:35-0600')
+          ),
+          array(
+            new DateTime('2013-03-29T05:13:35-0600'),
+            new DateTime('2013-03-29T05:13:35-0500')
+          ),
+        );
+    }
+
+    /**
+     * @covers  ::accepts
+     */
+    public function testAcceptsSucceeds()
+    {
+        $this->assertTrue(
+          $this->comparator->accepts(
+            new DateTime,
+            new DateTime
+          )
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $delta = 0.0)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, $delta);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $delta = 0.0)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure',
+          'Failed asserting that two DateTime objects are equal.'
+        );
+        $this->comparator->assertEquals($expected, $actual, $delta);
+    }
+}
diff --git a/core/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php b/core/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..f5750da4b3da4be4df6572cf6e24b8cb80dec7d8
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/ExceptionComparatorTest.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Comparator
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use \Exception;
+use \RuntimeException;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\ExceptionComparator
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+class ExceptionComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new ExceptionComparator;
+        $this->comparator->setFactory(new Factory);
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array(new Exception, new Exception),
+          array(new RuntimeException, new RuntimeException),
+          array(new Exception, new RuntimeException)
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(new Exception, null),
+          array(null, new Exception),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        $exception1 = new Exception;
+        $exception2 = new Exception;
+
+        $exception3 = new RunTimeException('Error', 100);
+        $exception4 = new RunTimeException('Error', 100);
+
+        return array(
+          array($exception1, $exception1),
+          array($exception1, $exception2),
+          array($exception3, $exception3),
+          array($exception3, $exception4)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $typeMessage = 'not instance of expected class';
+        $equalMessage = 'Failed asserting that two objects are equal.';
+
+        $exception1 = new Exception('Error', 100);
+        $exception2 = new Exception('Error', 101);
+        $exception3 = new Exception('Errors', 101);
+
+        $exception4 = new RunTimeException('Error', 100);
+        $exception5 = new RunTimeException('Error', 101);
+
+        return array(
+          array($exception1, $exception2, $equalMessage),
+          array($exception1, $exception3, $equalMessage),
+          array($exception1, $exception4, $typeMessage),
+          array($exception2, $exception3, $equalMessage),
+          array($exception4, $exception5, $equalMessage)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $message)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
+        );
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/core/vendor/sebastian/comparator/tests/FactoryTest.php b/core/vendor/sebastian/comparator/tests/FactoryTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ae4c72f13ec422890421e365477dbde715433ef
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/FactoryTest.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Comparator
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\Factory
+ *
+ * @package    Comparator
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+class FactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function instanceProvider()
+    {
+        $tmpfile = tmpfile();
+
+        return array(
+            array(NULL, NULL, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(NULL, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(TRUE, NULL, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(TRUE, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(FALSE, FALSE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(TRUE, FALSE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(FALSE, TRUE, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array('', '', 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array('0', '0', 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array('0', 0, 'SebastianBergmann\\Comparator\\NumericComparator'),
+            array(0, '0', 'SebastianBergmann\\Comparator\\NumericComparator'),
+            array(0, 0, 'SebastianBergmann\\Comparator\\NumericComparator'),
+            array(1.0, 0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
+            array(0, 1.0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
+            array(1.0, 1.0, 'SebastianBergmann\\Comparator\\DoubleComparator'),
+            array(array(1), array(1), 'SebastianBergmann\\Comparator\\ArrayComparator'),
+            array($tmpfile, $tmpfile, 'SebastianBergmann\\Comparator\\ResourceComparator'),
+            array(new \stdClass, new \stdClass, 'SebastianBergmann\\Comparator\\ObjectComparator'),
+            array(new \DateTime, new \DateTime, 'SebastianBergmann\\Comparator\\DateTimeComparator'),
+            array(new \SplObjectStorage, new \SplObjectStorage, 'SebastianBergmann\\Comparator\\SplObjectStorageComparator'),
+            array(new \Exception, new \Exception, 'SebastianBergmann\\Comparator\\ExceptionComparator'),
+            array(new \DOMDocument, new \DOMDocument, 'SebastianBergmann\\Comparator\\DOMNodeComparator'),
+            // mixed types
+            array($tmpfile, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(array(1), $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array($tmpfile, '1', 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array('1', $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array($tmpfile, new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new \stdClass, $tmpfile, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new \stdClass, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(array(1), new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new \stdClass, '1', 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array('1', new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new ClassWithToString, '1', 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array('1', new ClassWithToString, 'SebastianBergmann\\Comparator\\ScalarComparator'),
+            array(1.0, new \stdClass, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(new \stdClass, 1.0, 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(1.0, array(1), 'SebastianBergmann\\Comparator\\TypeComparator'),
+            array(array(1), 1.0, 'SebastianBergmann\\Comparator\\TypeComparator'),
+        );
+    }
+
+    /**
+     * @dataProvider instanceProvider
+     * @covers       ::getComparatorFor
+     * @covers       ::__construct
+     */
+    public function testGetComparatorFor($a, $b, $expected)
+    {
+        $factory = new Factory;
+        $actual = $factory->getComparatorFor($a, $b);
+        $this->assertInstanceOf($expected, $actual);
+    }
+
+    /**
+     * @covers ::register
+     */
+    public function testRegister()
+    {
+        $comparator = new TestClassComparator;
+
+        $factory = new Factory;
+        $factory->register($comparator);
+
+        $a = new TestClass;
+        $b = new TestClass;
+        $expected = 'SebastianBergmann\\Comparator\\TestClassComparator';
+        $actual = $factory->getComparatorFor($a, $b);
+
+        $factory->unregister($comparator);
+        $this->assertInstanceOf($expected, $actual);
+    }
+
+    /**
+     * @covers ::unregister
+     */
+    public function testUnregister()
+    {
+        $comparator = new TestClassComparator;
+
+        $factory = new Factory;
+        $factory->register($comparator);
+        $factory->unregister($comparator);
+
+        $a = new TestClass;
+        $b = new TestClass;
+        $expected = 'SebastianBergmann\\Comparator\\ObjectComparator';
+        $actual = $factory->getComparatorFor($a, $b);
+
+        $this->assertInstanceOf($expected, $actual);
+    }
+}
diff --git a/core/vendor/sebastian/comparator/tests/ResourceComparatorTest.php b/core/vendor/sebastian/comparator/tests/ResourceComparatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..9e7b148c23b6fee39da929b2980d4595694c65f3
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/ResourceComparatorTest.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Comparator
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\ResourceComparator
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+class ResourceComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new ResourceComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        $tmpfile1 = tmpfile();
+        $tmpfile2 = tmpfile();
+
+        return array(
+          array($tmpfile1, $tmpfile1),
+          array($tmpfile2, $tmpfile2),
+          array($tmpfile1, $tmpfile2)
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        $tmpfile1 = tmpfile();
+
+        return array(
+          array($tmpfile1, null),
+          array(null, $tmpfile1),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        $tmpfile1 = tmpfile();
+        $tmpfile2 = tmpfile();
+
+        return array(
+          array($tmpfile1, $tmpfile1),
+          array($tmpfile2, $tmpfile2)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $tmpfile1 = tmpfile();
+        $tmpfile2 = tmpfile();
+
+        return array(
+          array($tmpfile1, $tmpfile2),
+          array($tmpfile2, $tmpfile1)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual)
+    {
+        $this->setExpectedException('SebastianBergmann\\Comparator\\ComparisonFailure');
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/core/vendor/sebastian/comparator/tests/ScalarComparatorTest.php b/core/vendor/sebastian/comparator/tests/ScalarComparatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..95209c8a3e08e13b47878aabff590cf9583c9b52
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/ScalarComparatorTest.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * Comparator
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\ScalarComparator
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+class ScalarComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new ScalarComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array("string", "string"),
+          array(new ClassWithToString, "string"),
+          array("string", new ClassWithToString),
+          array("string", null),
+          array(false, "string"),
+          array(false, true),
+          array(null, false),
+          array(null, null),
+          array("10", 10),
+          array("", false),
+          array("1", true),
+          array(1, true),
+          array(0, false),
+          array(0.1, "0.1")
+        );
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(array(), array()),
+          array("string", array()),
+          array(new ClassWithToString, new ClassWithToString),
+          array(false, new ClassWithToString),
+          array(tmpfile(), tmpfile())
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array("string", "string"),
+          array(new ClassWithToString, new ClassWithToString),
+          array("string representation", new ClassWithToString),
+          array(new ClassWithToString, "string representation"),
+          array("string", "STRING", true),
+          array("STRING", "string", true),
+          array("String Representation", new ClassWithToString, true),
+          array(new ClassWithToString, "String Representation", true),
+          array("10", 10),
+          array("", false),
+          array("1", true),
+          array(1, true),
+          array(0, false),
+          array(0.1, "0.1"),
+          array(false, null),
+          array(false, false),
+          array(true, true),
+          array(null, null)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $stringException = 'Failed asserting that two strings are equal.';
+        $otherException = 'matches expected';
+
+        return array(
+          array("string", "other string", $stringException),
+          array("string", "STRING", $stringException),
+          array("STRING", "string", $stringException),
+          array("string", "other string", $stringException),
+          array(new ClassWithToString, "does not match", $otherException),
+          array("does not match", new ClassWithToString, $otherException),
+          array("10", 25, $otherException),
+          array("1", false, $otherException),
+          array("", true, $otherException),
+          array(false, true, $otherException),
+          array(true, false, $otherException),
+          array(null, true, $otherException),
+          array(0, true, $otherException)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual, $ignoreCase = false)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual, 0.0, false, $ignoreCase);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual, $message)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure', $message
+        );
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/core/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php b/core/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..00b2d66ab3d60f578372ee024ff7970cf03ee5c6
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/SplObjectStorageComparatorTest.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Comparator
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use SplObjectStorage;
+use stdClass;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\SplObjectStorageComparator
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+class SplObjectStorageComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new SplObjectStorageComparator;
+    }
+
+    public function acceptsFailsProvider()
+    {
+        return array(
+          array(new SplObjectStorage, new stdClass),
+          array(new stdClass, new SplObjectStorage),
+          array(new stdClass, new stdClass)
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        $object1 = new stdClass();
+        $object2 = new stdClass();
+
+        $storage1 = new SplObjectStorage();
+        $storage2 = new SplObjectStorage();
+
+        $storage3 = new SplObjectStorage();
+        $storage3->attach($object1);
+        $storage3->attach($object2);
+
+        $storage4 = new SplObjectStorage();
+        $storage4->attach($object2);
+        $storage4->attach($object1);
+
+        return array(
+          array($storage1, $storage1),
+          array($storage1, $storage2),
+          array($storage3, $storage3),
+          array($storage3, $storage4)
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        $object1 = new stdClass;
+        $object2 = new stdClass;
+
+        $storage1 = new SplObjectStorage;
+
+        $storage2 = new SplObjectStorage;
+        $storage2->attach($object1);
+
+        $storage3 = new SplObjectStorage;
+        $storage3->attach($object2);
+        $storage3->attach($object1);
+
+        return array(
+          array($storage1, $storage2),
+          array($storage1, $storage3),
+          array($storage2, $storage3),
+        );
+    }
+
+    /**
+     * @covers  ::accepts
+     */
+    public function testAcceptsSucceeds()
+    {
+        $this->assertTrue(
+          $this->comparator->accepts(
+            new SplObjectStorage,
+            new SplObjectStorage
+          )
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsFailsProvider
+     */
+    public function testAcceptsFails($expected, $actual)
+    {
+        $this->assertFalse(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual)
+    {
+        $this->setExpectedException(
+          'SebastianBergmann\\Comparator\\ComparisonFailure',
+          'Failed asserting that two objects are equal.'
+        );
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/core/vendor/sebastian/comparator/tests/TypeComparatorTest.php b/core/vendor/sebastian/comparator/tests/TypeComparatorTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..94f0d0b3b52ab3291a0c4153b51df64f2b4bb62c
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/TypeComparatorTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Comparator
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+use stdClass;
+
+/**
+ * @coversDefaultClass SebastianBergmann\Comparator\TypeComparator
+ *
+ * @package    Comparator
+ * @author     Jeff Welch <whatthejeff@gmail.com>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+class TypeComparatorTest extends \PHPUnit_Framework_TestCase
+{
+    private $comparator;
+
+    protected function setUp()
+    {
+        $this->comparator = new TypeComparator;
+    }
+
+    public function acceptsSucceedsProvider()
+    {
+        return array(
+          array(true, 1),
+          array(false, array(1)),
+          array(null, new stdClass),
+          array(1.0, 5),
+          array("", "")
+        );
+    }
+
+    public function assertEqualsSucceedsProvider()
+    {
+        return array(
+          array(true, true),
+          array(true, false),
+          array(false, false),
+          array(null, null),
+          array(new stdClass, new stdClass),
+          array(0, 0),
+          array(1.0, 2.0),
+          array("hello", "world"),
+          array("", ""),
+          array(array(), array(1,2,3))
+        );
+    }
+
+    public function assertEqualsFailsProvider()
+    {
+        return array(
+          array(true, null),
+          array(null, false),
+          array(1.0, 0),
+          array(new stdClass, array()),
+          array("1", 1)
+        );
+    }
+
+    /**
+     * @covers       ::accepts
+     * @dataProvider acceptsSucceedsProvider
+     */
+    public function testAcceptsSucceeds($expected, $actual)
+    {
+        $this->assertTrue(
+          $this->comparator->accepts($expected, $actual)
+        );
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsSucceedsProvider
+     */
+    public function testAssertEqualsSucceeds($expected, $actual)
+    {
+        $exception = null;
+
+        try {
+            $this->comparator->assertEquals($expected, $actual);
+        }
+
+        catch (ComparisonFailure $exception) {
+        }
+
+        $this->assertNull($exception, 'Unexpected ComparisonFailure');
+    }
+
+    /**
+     * @covers       ::assertEquals
+     * @dataProvider assertEqualsFailsProvider
+     */
+    public function testAssertEqualsFails($expected, $actual)
+    {
+        $this->setExpectedException('SebastianBergmann\\Comparator\\ComparisonFailure', 'does not match expected type');
+        $this->comparator->assertEquals($expected, $actual);
+    }
+}
diff --git a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Autoload.php.in b/core/vendor/sebastian/comparator/tests/_files/ClassWithToString.php
similarity index 68%
rename from core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Autoload.php.in
rename to core/vendor/sebastian/comparator/tests/_files/ClassWithToString.php
index fe019c061dfb911c41f0ce8d82f7a2203d68ab6d..38ece4e65cc9e488e7c8f2bc551e618ae2c2a813 100644
--- a/core/vendor/phpunit/phpunit-mock-objects/PHPUnit/Framework/MockObject/Autoload.php.in
+++ b/core/vendor/sebastian/comparator/tests/_files/ClassWithToString.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,32 +34,19 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
+ * @package    Comparator
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      File available since Release 1.1.0
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
-spl_autoload_register(
-  function ($class)
-  {
-      static $classes = NULL;
-      static $path = NULL;
+namespace SebastianBergmann\Comparator;
 
-      if ($classes === NULL) {
-          $classes = array(
-            ___CLASSLIST___
-          );
-
-          $path = dirname(dirname(dirname(__FILE__)));
-      }
-
-      $cn = strtolower($class);
-
-      if (isset($classes[$cn])) {
-          require $path . $classes[$cn];
-      }
-  }
-);
+class ClassWithToString
+{
+    public function __toString()
+    {
+        return 'string representation';
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert/Functions.php.in b/core/vendor/sebastian/comparator/tests/_files/TestClass.php
similarity index 82%
rename from core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert/Functions.php.in
rename to core/vendor/sebastian/comparator/tests/_files/TestClass.php
index 6063abafa3a42d99a08a30f94fbac554d9ab056b..a0f711d2434e9084db09df68eab76687caa915eb 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Framework/Assert/Functions.php.in
+++ b/core/vendor/sebastian/comparator/tests/_files/TestClass.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,11 +34,14 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @package    Comparator
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.5.0
- */{functions}
+ * @link       http://www.github.com/sebastianbergmann/comparator
+ */
+
+namespace SebastianBergmann\Comparator;
+
+class TestClass {
+}
diff --git a/core/vendor/phpunit/phpunit/phpunit.php b/core/vendor/sebastian/comparator/tests/_files/TestClassComparator.php
old mode 100755
new mode 100644
similarity index 76%
rename from core/vendor/phpunit/phpunit/phpunit.php
rename to core/vendor/sebastian/comparator/tests/_files/TestClassComparator.php
index e3ecc8622e6fc506a2aa979815240ff3629a955d..fbfc92a40e8e6dc9bbb220e00bebaf57d229c7a1
--- a/core/vendor/phpunit/phpunit/phpunit.php
+++ b/core/vendor/sebastian/comparator/tests/_files/TestClassComparator.php
@@ -1,8 +1,8 @@
-#!/usr/bin/env php
 <?php
-/* PHPUnit
+/**
+ * Comparator
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,14 +33,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Comparator
+ * @author     Bernhard Schussek <bschussek@2bepublished.at>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/comparator
  */
 
-define('PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main');
+namespace SebastianBergmann\Comparator;
 
-if (strpos('@php_bin@', '@php_bin') === 0) {
-    require dirname(__FILE__) . DIRECTORY_SEPARATOR . 'PHPUnit' . DIRECTORY_SEPARATOR . 'Autoload.php';
-} else {
-    require '@php_dir@' . DIRECTORY_SEPARATOR . 'PHPUnit' . DIRECTORY_SEPARATOR . 'Autoload.php';
+class TestClassComparator extends ObjectComparator {
 }
-
-PHPUnit_TextUI_Command::main();
diff --git a/core/vendor/sebastian/comparator/tests/autoload.php b/core/vendor/sebastian/comparator/tests/autoload.php
new file mode 100644
index 0000000000000000000000000000000000000000..90f3c6f96776c79e3616cabdc0c62651540791e4
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/autoload.php
@@ -0,0 +1,22 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'sebastianbergmann\\comparator\\classwithtostring' => '/_files/ClassWithToString.php',
+                'sebastianbergmann\\comparator\\factorytest' => '/FactoryTest.php',
+                'sebastianbergmann\\comparator\\testclass' => '/_files/TestClass.php',
+                'sebastianbergmann\\comparator\\testclasscomparator' => '/_files/TestClassComparator.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    }
+);
+// @codeCoverageIgnoreEnd
diff --git a/core/vendor/sebastian/comparator/tests/bootstrap.php b/core/vendor/sebastian/comparator/tests/bootstrap.php
new file mode 100644
index 0000000000000000000000000000000000000000..890e43892d730adfca647632b7631dae7da9a28b
--- /dev/null
+++ b/core/vendor/sebastian/comparator/tests/bootstrap.php
@@ -0,0 +1,3 @@
+<?php
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/autoload.php';
diff --git a/core/vendor/sebastian/diff/.gitignore b/core/vendor/sebastian/diff/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..d0fc438d7263ad146c7d6460668cc721bfcadcd0
--- /dev/null
+++ b/core/vendor/sebastian/diff/.gitignore
@@ -0,0 +1,9 @@
+phpunit.xml
+composer.lock
+composer.phar
+vendor/
+cache.properties
+build/SebastianBergmann
+build/LICENSE
+build/README.md
+build/*.tgz
diff --git a/core/vendor/sebastian/diff/.travis.yml b/core/vendor/sebastian/diff/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..ab6ffb817b318f580024b41ee0932e7c80fd833f
--- /dev/null
+++ b/core/vendor/sebastian/diff/.travis.yml
@@ -0,0 +1,12 @@
+language: php
+
+before_script:
+    - composer install --prefer-source
+
+php:
+  - 5.4
+  - 5.3
+
+notifications:
+  email: false
+  irc: "irc.freenode.org#phpunit"
diff --git a/core/vendor/sebastian/diff/LICENSE b/core/vendor/sebastian/diff/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..3b0a4ebaddde88de02133d1bc5b46fb5907d016f
--- /dev/null
+++ b/core/vendor/sebastian/diff/LICENSE
@@ -0,0 +1,33 @@
+Diff
+
+Copyright (c) 2002-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/core/vendor/sebastian/diff/README.md b/core/vendor/sebastian/diff/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..d1e24b4babf27596aaff1ca791071985ab7aea0b
--- /dev/null
+++ b/core/vendor/sebastian/diff/README.md
@@ -0,0 +1,137 @@
+# Diff
+
+Diff implementation for PHP, factored out of PHPUnit into a stand-alone component.
+
+## Installation
+
+You can use [Composer](http://getcomposer.org/) or the [PEAR Installer](http://pear.php.net/manual/en/guide.users.commandline.cli.php) to download and install this package as well as its dependencies.
+
+### Composer
+
+To add this package as a local, per-project dependency to your project, simply add a dependency on `sebastian/diff` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Diff:
+
+    {
+        "require": {
+            "sebastian/diff": "*"
+        }
+    }
+
+### PEAR Installer
+
+The following two commands (which you may have to run as `root`) are all that is required to install this package using the PEAR Installer:
+
+    pear config-set auto_discover 1
+    pear install pear.phpunit.de/Diff
+
+### Usage
+
+The `Differ` class can be used to generate a textual representation of the difference between two strings:
+
+```php
+use SebastianBergmann\Diff\Differ;
+
+$differ = new Differ;
+print $differ->diff('foo', 'bar');
+```
+
+The code above yields the output below:
+
+    --- Original
+    +++ New
+    @@ @@
+    -foo
+    +bar
+
+The `Parser` class can be used to parse a unified diff into an object graph:
+
+```php
+use SebastianBergmann\Diff\Parser;
+use SebastianBergmann\Git;
+
+$git = new Git('/usr/local/src/money');
+
+$diff = $git->getDiff(
+  '948a1a07768d8edd10dcefa8315c1cbeffb31833',
+  'c07a373d2399f3e686234c4f7f088d635eb9641b'
+);
+
+$parser = new Parser;
+
+print_r($parser->parse($diff));
+```
+
+The code above yields the output below:
+
+    Array
+    (
+        [0] => SebastianBergmann\Diff\Diff Object
+            (
+                [from:SebastianBergmann\Diff\Diff:private] => a/tests/MoneyTest.php
+                [to:SebastianBergmann\Diff\Diff:private] => b/tests/MoneyTest.php
+                [chunks:SebastianBergmann\Diff\Diff:private] => Array
+                    (
+                        [0] => SebastianBergmann\Diff\Chunk Object
+                            (
+                                [start:SebastianBergmann\Diff\Chunk:private] => 87
+                                [startRange:SebastianBergmann\Diff\Chunk:private] => 7
+                                [end:SebastianBergmann\Diff\Chunk:private] => 87
+                                [endRange:SebastianBergmann\Diff\Chunk:private] => 7
+                                [lines:SebastianBergmann\Diff\Chunk:private] => Array
+                                    (
+                                        [0] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::add
+                                            )
+
+                                        [1] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>      * @covers SebastianBergmann\Money\Money::newMoney
+                                            )
+
+                                        [2] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>      */
+                                            )
+
+                                        [3] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 2
+                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyWithSameCurrencyObjectCanBeAdded()
+                                            )
+
+                                        [4] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 1
+                                                [content:SebastianBergmann\Diff\Line:private] =>     public function testAnotherMoneyObjectWithSameCurrencyCanBeAdded()
+                                            )
+
+                                        [5] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>     {
+                                            )
+
+                                        [6] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>         $a = new Money(1, new Currency('EUR'));
+                                            )
+
+                                        [7] => SebastianBergmann\Diff\Line Object
+                                            (
+                                                [type:SebastianBergmann\Diff\Line:private] => 3
+                                                [content:SebastianBergmann\Diff\Line:private] =>         $b = new Money(2, new Currency('EUR'));
+                                            )
+
+                                    )
+
+                            )
+
+                    )
+
+            )
+
+    )
diff --git a/core/vendor/sebastian/diff/build.xml b/core/vendor/sebastian/diff/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8f21ec6253acaf31b155f1efd22afa88a7b68770
--- /dev/null
+++ b/core/vendor/sebastian/diff/build.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="diff" default="build">
+ <property name="php" value="php"/>
+ <property name="phpunit" value="phpunit"/>
+
+ <target name="build" depends="prepare,lint,phpunit"/>
+
+ <target name="clean" description="Cleanup build artifacts">
+ </target>
+
+ <target name="prepare" depends="clean,phpab" description="Prepare for build">
+ </target>
+
+ <target name="phpab" description="Generate autoloader script">
+  <exec executable="phpab">
+   <arg value="--output" />
+   <arg path="src/autoload.php" />
+   <arg path="src" />
+  </exec>
+ </target>
+
+ <target name="lint">
+  <apply executable="${php}" failonerror="true">
+   <arg value="-l" />
+
+   <fileset dir="${basedir}/src">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+
+   <fileset dir="${basedir}/tests">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+  </apply>
+ </target>
+
+ <target name="phpunit" description="Run unit tests with PHPUnit">
+  <condition property="phpunit_cmd" value="${php} ${phpunit}" else="${phpunit}">
+   <not>
+    <equals arg1="${phpunit}" arg2="phpunit" />
+   </not>
+  </condition>
+
+  <exec executable="${phpunit_cmd}" failonerror="true"/>
+ </target>
+
+ <target name="pear">
+  <mkdir dir="${basedir}/build/SebastianBergmann/Diff"/>
+
+  <copy todir="${basedir}/build/SebastianBergmann/Diff">
+   <fileset dir="${basedir}/src"/>
+  </copy>
+
+  <copy file="LICENSE" todir="${basedir}/build"/>
+  <copy file="README.md" todir="${basedir}/build"/>
+
+  <exec executable="pear" dir="${basedir}/build">
+   <arg value="package" />
+  </exec>
+
+  <delete dir="${basedir}/build/SebastianBergmann"/>
+  <delete file="${basedir}/build/LICENSE"/>
+  <delete file="${basedir}/build/README.md"/>
+ </target>
+</project>
diff --git a/core/vendor/sebastian/diff/build/package.xml b/core/vendor/sebastian/diff/build/package.xml
new file mode 100644
index 0000000000000000000000000000000000000000..17a78b496ed0366ebad3b9ec57a739d0271a9cc7
--- /dev/null
+++ b/core/vendor/sebastian/diff/build/package.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.10" version="2.0"
+  xmlns="http://pear.php.net/dtd/package-2.0"
+  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+                      http://pear.php.net/dtd/tasks-1.0.xsd
+                      http://pear.php.net/dtd/package-2.0
+                      http://pear.php.net/dtd/package-2.0.xsd">
+ <name>Diff</name>
+ <channel>pear.phpunit.de</channel>
+ <summary>Diff implementation</summary>
+ <description>Diff implementation</description>
+ <lead>
+  <name>Sebastian Bergmann</name>
+  <user>sebastian</user>
+  <email>sebastian@phpunit.de</email>
+  <active>yes</active>
+ </lead>
+ <date>2013-08-03</date>
+ <version>
+  <release>1.1.0</release>
+  <api>1.1.0</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license>The BSD 3-Clause License</license>
+ <notes>http://github.com/sebastianbergmann/diff/tree</notes>
+ <contents>
+  <dir name="/">
+   <dir name="SebastianBergmann">
+    <dir name="Diff">
+     <file baseinstalldir="/" name="autoload.php" role="php"/>
+     <file baseinstalldir="/" name="Chunk.php" role="php"/>
+     <file baseinstalldir="/" name="Differ.php" role="php"/>
+     <file baseinstalldir="/" name="Diff.php" role="php"/>
+     <file baseinstalldir="/" name="Line.php" role="php"/>
+     <file baseinstalldir="/" name="Parser.php" role="php"/>
+    </dir>
+   </dir>
+   <file baseinstalldir="/" name="LICENSE" role="doc"/>
+   <file baseinstalldir="/" name="README.md" role="doc"/>
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.3.3</min>
+   </php>
+   <pearinstaller>
+    <min>1.9.4</min>
+   </pearinstaller>
+  </required>
+ </dependencies>
+ <phprelease/>
+</package>
diff --git a/core/vendor/sebastian/diff/composer.json b/core/vendor/sebastian/diff/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..c2054b0e0855a3469ae76ab39b1c018623ef0310
--- /dev/null
+++ b/core/vendor/sebastian/diff/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "sebastian/diff",
+    "description": "Diff implementation",
+    "keywords": ["diff"],
+    "homepage": "http://www.github.com/sebastianbergmann/diff",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        },
+        {
+            "name": "Kore Nordmann",
+            "email": "mail@kore-nordmann.de"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1-dev"
+        }
+    }
+}
diff --git a/core/vendor/sebastian/diff/phpunit.xml.dist b/core/vendor/sebastian/diff/phpunit.xml.dist
new file mode 100644
index 0000000000000000000000000000000000000000..157fb2d1e3a28d257477b2475d71298ccbac600c
--- /dev/null
+++ b/core/vendor/sebastian/diff/phpunit.xml.dist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="src/autoload.php">
+ <testsuites>
+  <testsuite name="Diff">
+   <directory>./tests</directory>
+  </testsuite>
+ </testsuites>
+ <filter>
+  <whitelist addUncoveredFilesFromWhitelist="true">
+   <directory>./src</directory>
+   <exclude>
+    <file>./src/autoload.php</file>
+   </exclude>
+  </whitelist>
+ </filter>
+</phpunit>
diff --git a/core/vendor/phpunit/phpunit/Tests/Util/ClassTest.php b/core/vendor/sebastian/diff/src/Chunk.php
similarity index 63%
rename from core/vendor/phpunit/phpunit/Tests/Util/ClassTest.php
rename to core/vendor/sebastian/diff/src/Chunk.php
index 9b0f3ccafee64c3d701dbfe77ee5a9dd5db844e3..95b9df67df1d7c69dfbb64b43639a1fa306edb08 100644
--- a/core/vendor/phpunit/phpunit/Tests/Util/ClassTest.php
+++ b/core/vendor/sebastian/diff/src/Chunk.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PHPUnit
+ * Diff
  *
  * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
@@ -34,51 +34,68 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
+ * @package    Diff
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Ben Selby <benmatselby@gmail.com>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
  * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.5.6
+ * @link       http://www.github.com/sebastianbergmann/diff
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-
-require_once 'PHPUnit/Util/Class.php';
+namespace SebastianBergmann\Diff;
 
 /**
- *
- *
- * @package    PHPUnit
+ * @package    Diff
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Ben Selby <benmatselby@gmail.com>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
  * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.5.6
+ * @link       http://www.github.com/sebastianbergmann/diff
  */
-class Util_ClassTest extends PHPUnit_Framework_TestCase
+class Chunk
 {
-    /**
-     * Test that if a dynamic variable is defined on a class then
-     * the $attribute variable will be NULL, but the variable defined
-     * will be a public one so we are safe to return it
-     *
-     * Currently $attribute is NULL but we try and call isPublic() on it.
-     * This breaks for php 5.2.10
-     *
-     * @covers PHPUnit_Util_Class::getObjectAttribute
-     *
-     * @return void
-     */
-    public function testGetObjectAttributeCanHandleDynamicVariables()
+    private $start;
+    private $startRange;
+    private $end;
+    private $endRange;
+    private $lines;
+
+    public function __construct($start = null, $startRange = 1, $end = null, $endRange = 1, array $lines = array())
     {
-        $attributeName = '_variable';
-        $object = new stdClass();
-        $object->$attributeName = 'Test';
+        $this->start      = (int) $start;
+        $this->startRange = (int) $startRange;
+        $this->end        = (int) $end;
+        $this->endRange   = (int) $endRange;
+        $this->lines      = $lines;
+    }
+
+    public function getStart()
+    {
+        return $this->start;
+    }
+
+    public function getStartRange()
+    {
+        return $this->startRange;
+    }
 
-        $actual = PHPUnit_Util_Class::getObjectAttribute($object, $attributeName);
-        $this->assertEquals('Test', $actual);
+    public function getEnd()
+    {
+        return $this->end;
+    }
+
+    public function getEndRange()
+    {
+        return $this->endRange;
+    }
+
+    public function getLines()
+    {
+        return $this->lines;
+    }
+
+    public function setLines(array $lines)
+    {
+        $this->lines = $lines;
     }
 }
diff --git a/core/vendor/sebastian/diff/src/Diff.php b/core/vendor/sebastian/diff/src/Diff.php
new file mode 100644
index 0000000000000000000000000000000000000000..363a42a7b133d75e8865d12a434ee3f8375e85b4
--- /dev/null
+++ b/core/vendor/sebastian/diff/src/Diff.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Diff
+ *
+ * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+
+namespace SebastianBergmann\Diff;
+
+/**
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class Diff
+{
+    private $from;
+    private $to;
+    private $chunks;
+
+    public function __construct($from, $to, array $chunks = array())
+    {
+        $this->from   = $from;
+        $this->to     = $to;
+        $this->chunks = $chunks;
+    }
+
+    public function getFrom()
+    {
+        return $this->from;
+    }
+
+    public function getTo()
+    {
+        return $this->to;
+    }
+
+    public function getChunks()
+    {
+        return $this->chunks;
+    }
+
+    public function setChunks(array $chunks)
+    {
+        $this->chunks = $chunks;
+    }
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Diff.php b/core/vendor/sebastian/diff/src/Differ.php
similarity index 90%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Diff.php
rename to core/vendor/sebastian/diff/src/Differ.php
index e2c70529b00b960cba342141ca5e849c4c9bd82f..5e0488e8f60765d38da6d5c16d7ab896a528233a 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Diff.php
+++ b/core/vendor/sebastian/diff/src/Differ.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PHPUnit
+ * Diff
  *
  * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
@@ -34,30 +34,43 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Util
+ * @package    Diff
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Kore Nordmann <mail@kore-nordmann.de>
  * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.4.0
+ * @link       http://www.github.com/sebastianbergmann/diff
  */
 
+namespace SebastianBergmann\Diff;
+
 /**
  * Diff implementation.
  *
- * @package    PHPUnit
- * @subpackage Util
+ * @package    Diff
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Kore Nordmann <mail@kore-nordmann.de>
  * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.4.0
+ * @link       http://www.github.com/sebastianbergmann/diff
  */
-class PHPUnit_Util_Diff
+class Differ
 {
+    /**
+     * @var string
+     */
+    private $header;
+
+    /**
+     * Constructor
+     *
+     * @param string $header
+     */
+    public function __construct($header = "--- Original\n+++ New\n")
+    {
+        $this->header = $header;
+    }
+
     /**
      * Returns the diff between two arrays or strings as string.
      *
@@ -65,10 +78,10 @@ class PHPUnit_Util_Diff
      * @param  array|string $to
      * @return string
      */
-    public static function diff($from, $to)
+    public function diff($from, $to)
     {
-        $buffer= "--- Expected\n+++ Actual\n";
-        $diff  = self::diffToArray($from,$to);
+        $buffer = $this->header;
+        $diff   = $this->diffToArray($from,$to);
 
         $inOld = FALSE;
         $i     = 0;
@@ -94,7 +107,6 @@ public static function diff($from, $to)
 
         $start = isset($old[0]) ? $old[0] : 0;
         $end   = count($diff);
-        $i     = 0;
 
         if ($tmp = array_search($end, $old)) {
             $end = $tmp;
@@ -133,7 +145,7 @@ public static function diff($from, $to)
     /**
      * Returns the diff between two arrays or strings as array.
      *
-     * every array-entry containts two elements:
+     * Each array element contains two elements:
      *   - [0] => string $token
      *   - [1] => 2|1|0
      *
@@ -145,7 +157,7 @@ public static function diff($from, $to)
      * @param  array|string $to
      * @return array
      */
-    public static function diffToArray($from, $to)
+    public function diffToArray($from, $to)
     {
         preg_match_all('(\r\n|\r|\n)', $from, $fromMatches);
         preg_match_all('(\r\n|\r|\n)', $to, $toMatches);
@@ -184,12 +196,11 @@ public static function diffToArray($from, $to)
             }
         }
 
-        $common = self::longestCommonSubsequence(
+        $common = $this->longestCommonSubsequence(
           array_values($from), array_values($to)
         );
 
         $diff = array();
-        $line = 0;
 
         if (isset($fromMatches[0]) && $toMatches[0] &&
             count($fromMatches[0]) === count($toMatches[0]) &&
@@ -243,7 +254,7 @@ public static function diffToArray($from, $to)
      * @param  array $to
      * @return array
      */
-    protected static function longestCommonSubsequence(array $from, array $to)
+    private function longestCommonSubsequence(array $from, array $to)
     {
         $common     = array();
         $matrix     = array();
diff --git a/core/vendor/sebastian/diff/src/Line.php b/core/vendor/sebastian/diff/src/Line.php
new file mode 100644
index 0000000000000000000000000000000000000000..80065749e049f65457bcba62ddea7078c1960e76
--- /dev/null
+++ b/core/vendor/sebastian/diff/src/Line.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Diff
+ *
+ * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+
+namespace SebastianBergmann\Diff;
+
+/**
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class Line
+{
+    const ADDED = 1;
+    const REMOVED = 2;
+    const UNCHANGED = 3;
+
+    private $type;
+    private $content;
+
+    public function __construct($type = self::UNCHANGED, $content = null)
+    {
+        $this->type    = $type;
+        $this->content = $content;
+    }
+
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    public function getType()
+    {
+        return $this->type;
+    }
+}
diff --git a/core/vendor/sebastian/diff/src/Parser.php b/core/vendor/sebastian/diff/src/Parser.php
new file mode 100644
index 0000000000000000000000000000000000000000..6164e519ec9ea2c7de4fd0e042baaa59e4976850
--- /dev/null
+++ b/core/vendor/sebastian/diff/src/Parser.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Diff
+ *
+ * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+
+namespace SebastianBergmann\Diff;
+
+/**
+ * Unified diff parser.
+ *
+ * @package    Diff
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Kore Nordmann <mail@kore-nordmann.de>
+ * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/diff
+ */
+class Parser
+{
+    public function parse($string)
+    {
+        $lines     = preg_split('(\r\n|\r|\n)', $string);
+        $lineCount = count($lines);
+        $diffs     = array();
+        $diff      = null;
+        $collected = array();
+        
+        for ($i = 0; $i < $lineCount; ++$i) {
+            if (preg_match('(^---\\s+(?P<file>\\S+))', $lines[$i], $fromMatch) &&
+                preg_match('(^\\+\\+\\+\\s+(?P<file>\\S+))', $lines[$i + 1], $toMatch)) {
+                if ($diff !== null) {
+                    $this->parseFileDiff($diff, $collected);
+                    $diffs[]   = $diff;
+                    $collected = array();
+                }
+
+                $diff = new Diff($fromMatch['file'], $toMatch['file']);
+                ++$i;
+            } else {
+                $collected[] = $lines[$i];
+            }
+        }
+
+        if (count($collected) && ($diff !== null)) {
+            $this->parseFileDiff($diff, $collected);
+            $diffs[] = $diff;
+        }
+
+        return $diffs;
+    }
+
+    private function parseFileDiff(Diff $diff, array $lines)
+    {
+        $chunks = array();
+
+        while (count($lines)) {
+            while (!preg_match('(^@@\\s+-(?P<start>\\d+)(?:,\\s*(?P<startrange>\\d+))?\\s+\\+(?P<end>\\d+)(?:,\\s*(?P<endrange>\\d+))?\\s+@@)', $last = array_shift($lines), $match)) {
+                if ($last === null) {
+                    break 2;
+                }
+            }
+
+            $chunk = new Chunk(
+                $match['start'],
+                isset($match['startrange']) ? max(1, $match['startrange']) : 1,
+                $match['end'],
+                isset($match['endrange']) ? max(1, $match['endrange']) : 1
+            );
+
+            $diffLines = array();
+            $last      = null;
+
+            while (count($lines) &&
+                  (preg_match('(^(?P<type>[+ -])(?P<line>.*))', $last = array_shift($lines), $match) ||
+                  (strpos($last, '\\ No newline at end of file' ) === 0))) {
+                if (count($match)) {
+                    $type = Line::UNCHANGED;
+
+                    if ($match['type'] == '+') {
+                        $type = Line::ADDED;
+                    } else if ($match['type'] == '-') {
+                        $type = Line::REMOVED;
+                    }
+
+                    $diffLines[] = new Line($type, $match['line']);
+                }
+            }
+
+            $chunk->setLines($diffLines);
+
+            $chunks[] = $chunk;
+
+            if ($last !== null) {
+                array_unshift($lines, $last);
+            }
+        }
+        
+        $diff->setChunks($chunks);
+    }
+}
diff --git a/core/vendor/sebastian/diff/src/autoload.php b/core/vendor/sebastian/diff/src/autoload.php
new file mode 100644
index 0000000000000000000000000000000000000000..1c39a2373dbd6e1548051d7263c08394f72215f0
--- /dev/null
+++ b/core/vendor/sebastian/diff/src/autoload.php
@@ -0,0 +1,23 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'sebastianbergmann\\diff\\chunk' => '/Chunk.php',
+                'sebastianbergmann\\diff\\diff' => '/Diff.php',
+                'sebastianbergmann\\diff\\differ' => '/Differ.php',
+                'sebastianbergmann\\diff\\line' => '/Line.php',
+                'sebastianbergmann\\diff\\parser' => '/Parser.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    }
+);
+// @codeCoverageIgnoreEnd
\ No newline at end of file
diff --git a/core/vendor/phpunit/phpunit/Tests/Util/DiffTest.php b/core/vendor/sebastian/diff/tests/DifferTest.php
similarity index 50%
rename from core/vendor/phpunit/phpunit/Tests/Util/DiffTest.php
rename to core/vendor/sebastian/diff/tests/DifferTest.php
index 92b0cf00c37fa458ba397740d899627575b2ca56..10a9a3f6ea8ccfe1e500388c6647d6c202919efa 100644
--- a/core/vendor/phpunit/phpunit/Tests/Util/DiffTest.php
+++ b/core/vendor/sebastian/diff/tests/DifferTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * PHPUnit
+ * Diff
  *
  * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
@@ -34,235 +34,228 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
+ * @package    Diff
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       http://www.github.com/sebastianbergmann/diff
  */
 
-/**
- *
- *
- * @package    PHPUnit
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class Util_DiffTest extends PHPUnit_Framework_TestCase
+namespace SebastianBergmann\Diff;
+
+class DifferTest extends \PHPUnit_Framework_TestCase
 {
     const REMOVED = 2;
     const ADDED = 1;
     const OLD = 0;
 
+    private $diff;
+
+    protected function setUp()
+    {
+        $this->differ = new Differ;
+    }
+
     /**
-     * @covers PHPUnit_Util_Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorMessage()
     {
         $this->assertEquals(
-          "--- Expected\n+++ Actual\n@@ @@\n-a\n+b\n",
-          PHPUnit_Util_Diff::diff('a', 'b')
+          "--- Original\n+++ New\n@@ @@\n-a\n+b\n",
+          $this->differ->diff('a', 'b')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorMessage_toArray()
     {
-        $diff = array();
-        $diff[] = array('a', self::REMOVED);
-        $diff[] = array('b', self::ADDED);
+        $expected = array();
+        $expected[] = array('a', self::REMOVED);
+        $expected[] = array('b', self::ADDED);
 
-        $this->assertEquals(
-          $diff,
-          PHPUnit_Util_Diff::diffToArray('a', 'b')
-        );
+        $this->assertEquals($expected, $this->differ->diffToArray('a', 'b'));
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorStartSame()
     {
         $this->assertEquals(
-          "--- Expected\n+++ Actual\n@@ @@\n-ba\n+bc\n",
-          PHPUnit_Util_Diff::diff('ba', 'bc')
+          "--- Original\n+++ New\n@@ @@\n-ba\n+bc\n",
+          $this->differ->diff('ba', 'bc')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorStartSame_toArray()
     {
-        $diff = array();
-        $diff[] = array('ba', self::REMOVED);
-        $diff[] = array('bc', self::ADDED);
+        $expected = array();
+        $expected[] = array('ba', self::REMOVED);
+        $expected[] = array('bc', self::ADDED);
 
-        $this->assertEquals(
-          $diff,
-          PHPUnit_Util_Diff::diffToArray('ba', 'bc')
-        );
+        $this->assertEquals($expected, $this->differ->diffToArray('ba', 'bc'));
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorEndSame()
     {
         $this->assertEquals(
-          "--- Expected\n+++ Actual\n@@ @@\n-ab\n+cb\n",
-          PHPUnit_Util_Diff::diff('ab', 'cb')
+          "--- Original\n+++ New\n@@ @@\n-ab\n+cb\n",
+          $this->differ->diff('ab', 'cb')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorEndSame_toArray()
     {
-        $diff = array();
-        $diff[] = array('ab', self::REMOVED);
-        $diff[] = array('cb', self::ADDED);
+        $expected = array();
+        $expected[] = array('ab', self::REMOVED);
+        $expected[] = array('cb', self::ADDED);
 
-        $this->assertEquals(
-          $diff,
-          PHPUnit_Util_Diff::diffToArray('ab', 'cb')
-        );
+        $this->assertEquals($expected, $this->differ->diffToArray('ab', 'cb'));
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorStartAndEndSame()
     {
         $this->assertEquals(
-          "--- Expected\n+++ Actual\n@@ @@\n-abc\n+adc\n",
-          PHPUnit_Util_Diff::diff('abc', 'adc')
+          "--- Original\n+++ New\n@@ @@\n-abc\n+adc\n",
+          $this->differ->diff('abc', 'adc')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorStartAndEndSame_toArray()
     {
-        $diff = array();
-        $diff[] = array('abc', self::REMOVED);
-        $diff[] = array('adc', self::ADDED);
+        $expected = array();
+        $expected[] = array('abc', self::REMOVED);
+        $expected[] = array('adc', self::ADDED);
 
         $this->assertEquals(
-          $diff,
-          PHPUnit_Util_Diff::diffToArray('abc', 'adc')
+          $expected, $this->differ->diffToArray('abc', 'adc')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorStartSameComplete()
     {
         $this->assertEquals(
-          "--- Expected\n+++ Actual\n@@ @@\n-ab\n+abc\n",
-          PHPUnit_Util_Diff::diff('ab', 'abc')
+          "--- Original\n+++ New\n@@ @@\n-ab\n+abc\n",
+          $this->differ->diff('ab', 'abc')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorStartSameComplete_toArray()
     {
-        $diff = array();
-        $diff[] = array('ab', self::REMOVED);
-        $diff[] = array('abc', self::ADDED);
+        $expected = array();
+        $expected[] = array('ab', self::REMOVED);
+        $expected[] = array('abc', self::ADDED);
 
-        $this->assertEquals(
-          $diff,
-          PHPUnit_Util_Diff::diffToArray('ab', 'abc')
-        );
+        $this->assertEquals($expected, $this->differ->diffToArray('ab', 'abc'));
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorEndSameComplete()
     {
         $this->assertEquals(
-          "--- Expected\n+++ Actual\n@@ @@\n-bc\n+abc\n",
-          PHPUnit_Util_Diff::diff('bc', 'abc')
+          "--- Original\n+++ New\n@@ @@\n-bc\n+abc\n",
+          $this->differ->diff('bc', 'abc')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorEndSameComplete_toArray()
     {
-        $diff = array();
-        $diff[] = array('bc', self::REMOVED);
-        $diff[] = array('abc', self::ADDED);
+        $expected = array();
+        $expected[] = array('bc', self::REMOVED);
+        $expected[] = array('abc', self::ADDED);
 
-        $this->assertEquals(
-          $diff,
-          PHPUnit_Util_Diff::diffToArray('bc', 'abc')
-        );
+        $this->assertEquals($expected, $this->differ->diffToArray('bc', 'abc'));
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorOverlapingMatches()
     {
         $this->assertEquals(
-          "--- Expected\n+++ Actual\n@@ @@\n-abc\n+abbc\n",
-          PHPUnit_Util_Diff::diff('abc', 'abbc')
+          "--- Original\n+++ New\n@@ @@\n-abc\n+abbc\n",
+          $this->differ->diff('abc', 'abbc')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorOverlapingMatches_toArray()
     {
-        $diff = array();
-        $diff[] = array('abc', self::REMOVED);
-        $diff[] = array('abbc', self::ADDED);
+        $expected = array();
+        $expected[] = array('abc', self::REMOVED);
+        $expected[] = array('abbc', self::ADDED);
 
         $this->assertEquals(
-          $diff,
-          PHPUnit_Util_Diff::diffToArray('abc', 'abbc')
+          $expected, $this->differ->diffToArray('abc', 'abbc')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diff
+     * @covers SebastianBergmann\Diff\Differ::diff
      */
     public function testComparisonErrorOverlapingMatches2()
     {
         $this->assertEquals(
-          "--- Expected\n+++ Actual\n@@ @@\n-abcdde\n+abcde\n",
-          PHPUnit_Util_Diff::diff('abcdde', 'abcde')
+          "--- Original\n+++ New\n@@ @@\n-abcdde\n+abcde\n",
+          $this->differ->diff('abcdde', 'abcde')
         );
     }
 
     /**
-     * @covers PHPUnit_Util_Diff::diffToArray
+     * @covers SebastianBergmann\Diff\Differ::diffToArray
      */
     public function testComparisonErrorOverlapingMatches2_toArray()
     {
-        $diff = array();
-        $diff[] = array('abcdde', self::REMOVED);
-        $diff[] = array('abcde', self::ADDED);
+        $expected = array();
+        $expected[] = array('abcdde', self::REMOVED);
+        $expected[] = array('abcde', self::ADDED);
+
+        $this->assertEquals(
+          $expected, $this->differ->diffToArray('abcdde', 'abcde')
+        );
+    }
+
+    /**
+     * @covers SebastianBergmann\Diff\Differ::diff
+     */
+    public function testCustomHeader()
+    {
+        $differ = new Differ('CUSTOM HEADER');
 
         $this->assertEquals(
-          $diff,
-          PHPUnit_Util_Diff::diffToArray('abcdde', 'abcde')
+          "CUSTOM HEADER@@ @@\n-a\n+b\n",
+          $differ->diff('a', 'b')
         );
     }
 }
diff --git a/core/vendor/sebastian/environment/.gitignore b/core/vendor/sebastian/environment/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..57948548db71f8485d47268a49b1ddbddd8e6499
--- /dev/null
+++ b/core/vendor/sebastian/environment/.gitignore
@@ -0,0 +1,5 @@
+/.idea
+/vendor
+/composer.lock
+/composer.phar
+/phpunit.xml
diff --git a/core/vendor/sebastian/environment/.travis.yml b/core/vendor/sebastian/environment/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..76a9bde4beae0cb90735637be06ad4d07a943033
--- /dev/null
+++ b/core/vendor/sebastian/environment/.travis.yml
@@ -0,0 +1,16 @@
+language: php
+
+before_script:
+  - composer self-update
+  - composer install --no-interaction --prefer-source --dev
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+notifications:
+  email: false
diff --git a/core/vendor/sebastian/environment/LICENSE b/core/vendor/sebastian/environment/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..f2eec040989b0e95256ffe396941fd4e587dc0cd
--- /dev/null
+++ b/core/vendor/sebastian/environment/LICENSE
@@ -0,0 +1,33 @@
+Environment
+
+Copyright (c) 2014, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/core/vendor/sebastian/environment/README.md b/core/vendor/sebastian/environment/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..5f3cb3b911bc7ee88445b957c013e34a10f19a64
--- /dev/null
+++ b/core/vendor/sebastian/environment/README.md
@@ -0,0 +1,72 @@
+# Environment
+
+This component provides functionality that helps writing PHP code that has runtime-specific (PHP / HHVM) execution paths.
+
+[![Latest Stable Version](https://poser.pugx.org/sebastian/environment/v/stable.png)](https://packagist.org/packages/sebastian/environment)
+[![Build Status](https://travis-ci.org/sebastianbergmann/environment.png?branch=master)](https://travis-ci.org/sebastianbergmann/environment)
+
+## Installation
+
+To add Environment as a local, per-project dependency to your project, simply add a dependency on `sebastian/environment` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Environment 1.0:
+
+    {
+        "require": {
+            "sebastian/environment": "1.0.*"
+        }
+    }
+
+## Usage
+
+```php
+<?php
+use SebastianBergmann\Environment\Runtime;
+
+$runtime = new Runtime;
+
+var_dump($runtime->getNameWithVersion());
+var_dump($runtime->getName());
+var_dump($runtime->getVersion());
+var_dump($runtime->getBinary());
+var_dump($runtime->isHHVM());
+var_dump($runtime->isPHP());
+var_dump($runtime->hasXdebug());
+var_dump($runtime->canCollectCodeCoverage());
+```
+
+### Output on PHP
+
+    $ php --version
+    PHP 5.5.8 (cli) (built: Jan  9 2014 08:33:30)
+    Copyright (c) 1997-2013 The PHP Group
+    Zend Engine v2.5.0, Copyright (c) 1998-2013 Zend Technologies
+        with Xdebug v2.2.3, Copyright (c) 2002-2013, by Derick Rethans
+
+
+    $ php example.php
+    string(9) "PHP 5.5.8"
+    string(3) "PHP"
+    string(5) "5.5.8"
+    string(14) "'/usr/bin/php'"
+    bool(false)
+    bool(true)
+    bool(true)
+    bool(true)
+
+### Output on HHVM
+
+    $ hhvm --version
+    HipHop VM 2.4.0-dev (rel)
+    Compiler: heads/master-0-ga98e57cabee7e7f0d14493ab17d5c7ab0157eb98
+    Repo schema: 8d6e69287c41c1f09bb4d327421720d1922cfc67
+
+
+    $ hhvm example.php
+    string(14) "HHVM 2.4.0-dev"
+    string(4) "HHVM"
+    string(9) "2.4.0-dev"
+    string(42) "'/usr/local/src/hhvm/hphp/hhvm/hhvm' --php"
+    bool(true)
+    bool(false)
+    bool(false)
+    bool(true)
+
diff --git a/core/vendor/sebastian/environment/build.xml b/core/vendor/sebastian/environment/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9cd898538a3f2d30a13110f81f36d23ac0c40484
--- /dev/null
+++ b/core/vendor/sebastian/environment/build.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="environment">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+</project>
diff --git a/core/vendor/sebastian/environment/composer.json b/core/vendor/sebastian/environment/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..2bfbe7bfcf26ea3bc969c8976e018f3c3f9e06f1
--- /dev/null
+++ b/core/vendor/sebastian/environment/composer.json
@@ -0,0 +1,30 @@
+{
+    "name": "sebastian/environment",
+    "description": "Provides functionality to handle HHVM/PHP environments",
+    "keywords": ["environment","hhvm","xdebug"],
+    "homepage": "http://www.github.com/sebastianbergmann/environment",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        }
+    ],
+    "minimum-stability": "dev",
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.0.*@dev"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/core/vendor/sebastian/environment/phpunit.xml.dist b/core/vendor/sebastian/environment/phpunit.xml.dist
new file mode 100644
index 0000000000000000000000000000000000000000..f5acecb7c5cd4ab164ecb3b309374b4db8aef5d1
--- /dev/null
+++ b/core/vendor/sebastian/environment/phpunit.xml.dist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         strict="true"
+         verbose="true">
+ <testsuites>
+  <testsuite name="Environment">
+   <directory>tests</directory>
+  </testsuite>
+ </testsuites>
+ <filter>
+  <whitelist addUncoveredFilesFromWhitelist="true">
+   <directory>src</directory>
+  </whitelist>
+ </filter>
+</phpunit>
diff --git a/core/vendor/sebastian/environment/src/Runtime.php b/core/vendor/sebastian/environment/src/Runtime.php
new file mode 100644
index 0000000000000000000000000000000000000000..b241ca0d7c97324ab1a4ab04dca462896fb0037a
--- /dev/null
+++ b/core/vendor/sebastian/environment/src/Runtime.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Environment
+ *
+ * Copyright (c) 2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Environment
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/environment
+ */
+
+namespace SebastianBergmann\Environment;
+
+/**
+ * Utility class for HHVM/PHP environment handling.
+ *
+ * @package    Environment
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/environment
+ */
+class Runtime
+{
+    /**
+     * @var string
+     */
+    private static $binary;
+
+    /**
+     * Returns true when the runtime used is HHVM or
+     * the runtime used is PHP + Xdebug.
+     *
+     * @return boolean
+     */
+    public function canCollectCodeCoverage()
+    {
+        return $this->isHHVM() || $this->hasXdebug();
+    }
+
+    /**
+     * Returns the path to the binary of the current runtime.
+     * Appends ' --php' to the path when the runtime is HHVM.
+     *
+     * @return string
+     */
+    public function getBinary()
+    {
+        // HHVM
+        if (self::$binary === null && $this->isHHVM()) {
+            if ((self::$binary = getenv('PHP_BINARY')) === false) {
+                self::$binary = PHP_BINARY;
+            }
+
+            self::$binary = escapeshellarg(self::$binary) . ' --php';
+        }
+
+        // PHP >= 5.4.0
+        if (self::$binary === null && defined('PHP_BINARY')) {
+            self::$binary = escapeshellarg(PHP_BINARY);
+        }
+
+        // PHP < 5.4.0
+        if (self::$binary === null) {
+            if (PHP_SAPI == 'cli' && isset($_SERVER['_'])) {
+                if (strpos($_SERVER['_'], 'phpunit') !== false) {
+                    $file = file($_SERVER['_']);
+
+                    if (strpos($file[0], ' ') !== false) {
+                        $tmp = explode(' ', $file[0]);
+                        self::$binary = escapeshellarg(trim($tmp[1]));
+                    } else {
+                        self::$binary = escapeshellarg(ltrim(trim($file[0]), '#!'));
+                    }
+                } elseif (strpos(basename($_SERVER['_']), 'php') !== false) {
+                    self::$binary = escapeshellarg($_SERVER['_']);
+                }
+            }
+        }
+
+        if (self::$binary === null) {
+            $possibleBinaryLocations = array(
+                PHP_BINDIR . '/php',
+                PHP_BINDIR . '/php-cli.exe',
+                PHP_BINDIR . '/php.exe'
+            );
+
+            foreach ($possibleBinaryLocations as $binary) {
+                if (is_readable($binary)) {
+                    self::$binary = escapeshellarg($binary);
+                    break;
+                }
+            }
+        }
+
+        if (self::$binary === null) {
+            self::$binary = 'php';
+        }
+
+        return self::$binary;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNameWithVersion()
+    {
+        return $this->getName() . ' ' . $this->getVersion();
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        if ($this->isHHVM()) {
+            return 'HHVM';
+        } else {
+            return 'PHP';
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getVendorUrl()
+    {
+        if ($this->isHHVM()) {
+            return 'http://hhvm.com/';
+        } else {
+            return 'http://php.net/';
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion()
+    {
+        if ($this->isHHVM()) {
+            return HHVM_VERSION;
+        } else {
+            return PHP_VERSION;
+        }
+    }
+
+    /**
+     * Returns true when the runtime used is PHP and Xdebug is loaded.
+     *
+     * @return boolean
+     */
+    public function hasXdebug()
+    {
+        return $this->isPHP() && extension_loaded('xdebug');
+    }
+
+    /**
+     * Returns true when the runtime used is HHVM.
+     *
+     * @return boolean
+     */
+    public function isHHVM()
+    {
+        return defined('HHVM_VERSION');
+    }
+
+    /**
+     * Returns true when the runtime used is PHP.
+     *
+     * @return boolean
+     */
+    public function isPHP()
+    {
+        return !$this->isHHVM();
+    }
+}
diff --git a/core/vendor/sebastian/environment/tests/RuntimeTest.php b/core/vendor/sebastian/environment/tests/RuntimeTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..e86d6fa88cdc3d7d31521f7b9b841bcfd20ca860
--- /dev/null
+++ b/core/vendor/sebastian/environment/tests/RuntimeTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Environment
+ *
+ * Copyright (c) 2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Environment
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       http://www.github.com/sebastianbergmann/environment
+ */
+
+namespace SebastianBergmann\Environment;
+
+use PHPUnit_Framework_TestCase;
+
+class RuntimeTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \SebastianBergmann\Environment\Runtime
+     */
+    private $env;
+
+    protected function setUp()
+    {
+        $this->env = new Runtime;
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::canCollectCodeCoverage
+     * @uses   \SebastianBergmann\Environment\Runtime::hasXdebug
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
+     */
+    public function testAbilityToCollectCodeCoverageCanBeAssessed()
+    {
+        $this->assertInternalType('boolean', $this->env->canCollectCodeCoverage());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getBinary
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testBinaryCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getBinary());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testCanBeDetected()
+    {
+        $this->assertInternalType('boolean', $this->env->isHHVM());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::isPHP
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testCanBeDetected2()
+    {
+        $this->assertInternalType('boolean', $this->env->isPHP());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::hasXdebug
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
+     */
+    public function testXdebugCanBeDetected()
+    {
+        $this->assertInternalType('boolean', $this->env->hasXdebug());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getNameWithVersion
+     * @uses   \SebastianBergmann\Environment\Runtime::getName
+     * @uses   \SebastianBergmann\Environment\Runtime::getVersion
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     * @uses   \SebastianBergmann\Environment\Runtime::isPHP
+     */
+    public function testNameAndVersionCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getNameWithVersion());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getName
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testNameCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getName());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getVersion
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testVersionCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getVersion());
+    }
+
+    /**
+     * @covers \SebastianBergmann\Environment\Runtime::getVendorUrl
+     * @uses   \SebastianBergmann\Environment\Runtime::isHHVM
+     */
+    public function testVendorUrlCanBeRetrieved()
+    {
+        $this->assertInternalType('string', $this->env->getVendorUrl());
+    }
+}
diff --git a/core/vendor/sebastian/exporter/.gitignore b/core/vendor/sebastian/exporter/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..055c2a769d032d91128f66f4f1d6e7506db63922
--- /dev/null
+++ b/core/vendor/sebastian/exporter/.gitignore
@@ -0,0 +1,8 @@
+phpunit.xml
+composer.lock
+composer.phar
+vendor/
+cache.properties
+build/LICENSE
+build/README.md
+build/*.tgz
diff --git a/core/vendor/sebastian/exporter/.travis.yml b/core/vendor/sebastian/exporter/.travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..cef9dc918cf23ca9c7ae253c96b20c7d8445133d
--- /dev/null
+++ b/core/vendor/sebastian/exporter/.travis.yml
@@ -0,0 +1,21 @@
+language: php
+
+before_script:
+    - composer install --prefer-source
+
+php:
+  - 5.3.3
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+
+notifications:
+  email: false
+  irc: "irc.freenode.org#phpunit"
+
diff --git a/core/vendor/sebastian/exporter/LICENSE b/core/vendor/sebastian/exporter/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..d7f5e45f72551f59cf933714828250a3ea95aa31
--- /dev/null
+++ b/core/vendor/sebastian/exporter/LICENSE
@@ -0,0 +1,33 @@
+Exporter
+
+Copyright (c) 2002-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/core/vendor/sebastian/exporter/README.md b/core/vendor/sebastian/exporter/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..8885f309c826199d98d4655cb4967b00583b6ebf
--- /dev/null
+++ b/core/vendor/sebastian/exporter/README.md
@@ -0,0 +1,181 @@
+Exporter
+========
+
+[![Build Status](https://secure.travis-ci.org/sebastianbergmann/exporter.png?branch=master)](https://travis-ci.org/sebastianbergmann/exporter)
+
+This component provides the functionality to export PHP variables for visualization.
+
+## Usage
+
+Exporting:
+
+```php
+<?php
+use SebastianBergmann\Exporter\Exporter;
+
+/*
+Exception Object &0000000078de0f0d000000002003a261 (
+    'message' => ''
+    'string' => ''
+    'code' => 0
+    'file' => '/home/sebastianbergmann/test.php'
+    'line' => 34
+    'trace' => Array &0 ()
+    'previous' => null
+)
+*/
+
+print new Exporter(new Exception);
+```
+
+## Data Types
+
+Exporting simple types:
+
+```php
+<?php
+use SebastianBergmann\Exporter\Exporter;
+
+// 46
+print new Exporter(46);
+
+// 4.0
+print new Exporter(4.0);
+
+// 'hello, world!'
+print new Exporter('hello, world!');
+
+// false
+print new Exporter(false);
+
+// NAN
+print new Exporter(acos(8));
+
+// -INF
+print new Exporter(log(0));
+
+// null
+print new Exporter(null);
+
+// resource(13) of type (stream)
+print new Exporter(fopen('php://stderr', 'w'));
+
+// Binary String: 0x000102030405
+print new Exporter(chr(0) . chr(1) . chr(2) . chr(3) . chr(4) . chr(5));
+```
+
+Exporting complex types:
+
+```php
+<?php
+use SebastianBergmann\Exporter\Exporter;
+
+/*
+Array &0 (
+    0 => Array &1 (
+        0 => 1
+        1 => 2
+        2 => 3
+    )
+    1 => Array &2 (
+        0 => ''
+        1 => 0
+        2 => false
+    )
+)
+*/
+
+print new Exporter(array(array(1,2,3), array("",0,FALSE)));
+
+/*
+Array &0 (
+    'self' => Array &1 (
+        'self' => Array &1
+    )
+)
+*/
+
+$array = array();
+$array['self'] = &$array;
+print new Exporter($array);
+
+/*
+stdClass Object &0000000003a66dcc0000000025e723e2 (
+    'self' => stdClass Object &0000000003a66dcc0000000025e723e2
+)
+*/
+
+$obj = new stdClass();
+$obj->self = $obj;
+print new Exporter($obj);
+```
+
+Compact exports:
+
+```php
+<?php
+use SebastianBergmann\Exporter\Exporter;
+
+// Array ()
+$exporter = new Exporter(array());
+print $exporter->shortenedExport();
+
+// Array (...)
+$exporter = new Exporter(array(1,2,3,4,5));
+print $exporter->shortenedExport();
+
+// stdClass Object ()
+$exporter = new Exporter(new stdClass);
+print $exporter->shortenedExport();
+
+// Exception Object (...)
+$exporter = new Exporter(new Exception);
+print $exporter->shortenedExport();
+
+// this\nis\na\nsuper\nlong\nstring\nt...\nspace
+$exporter = new Exporter(
+<<<LONG_STRING
+this
+is
+a
+super
+long
+string
+that
+wraps
+a
+lot
+and
+eats
+up
+a
+lot
+of
+space
+LONG_STRING
+);
+print $exporter->shortenedExport();
+```
+
+## Installation
+
+There are two supported ways of installing Exporter.
+
+You can use the [PEAR Installer](http://pear.php.net/manual/en/guide.users.commandline.cli.php) or [Composer](http://getcomposer.org/) to download and install Exporter as well as its dependencies.
+
+### PEAR Installer
+
+The following two commands (which you may have to run as `root`) are all that is required to install Exporter using the PEAR Installer:
+
+    pear config-set auto_discover 1
+    pear install pear.phpunit.de/Exporter
+
+### Composer
+
+To add Exporter as a local, per-project dependency to your project, simply add a dependency on `sebastian/exporter` to your project's `composer.json` file. Here is a minimal example of a `composer.json` file that just defines a dependency on Exporter 1.0:
+
+    {
+        "require": {
+            "sebastian/exporter": "1.0.*"
+        }
+    }
diff --git a/core/vendor/sebastian/exporter/build.xml b/core/vendor/sebastian/exporter/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e774bb0a32acffe902ae06938897f555ad4aebe2
--- /dev/null
+++ b/core/vendor/sebastian/exporter/build.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="exporter">
+ <target name="clean" description="Cleanup build artifacts">
+  <delete dir="${basedir}/vendor"/>
+  <delete file="${basedir}/composer.lock"/>
+ </target>
+
+ <target name="composer" depends="clean" description="Install dependencies with Composer">
+  <get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" skipexisting="true"/>
+
+  <exec executable="php">
+   <arg value="composer.phar"/>
+   <arg value="install"/>
+  </exec>
+ </target>
+</project>
+
diff --git a/core/vendor/sebastian/exporter/composer.json b/core/vendor/sebastian/exporter/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..425f7e962a9c84d01e6d514e0844c1ce34695d2d
--- /dev/null
+++ b/core/vendor/sebastian/exporter/composer.json
@@ -0,0 +1,47 @@
+{
+    "name": "sebastian/exporter",
+    "description": "Provides the functionality to export PHP variables for visualization",
+    "keywords": ["exporter","export"],
+    "homepage": "http://www.github.com/sebastianbergmann/exporter",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de"
+        },
+        {
+            "name": "Jeff Welch",
+            "email": "whatthejeff@gmail.com"
+        },
+        {
+            "name": "Volker Dusch",
+            "email": "github@wallbash.com"
+        },
+        {
+            "name": "Adam Harvey",
+            "email": "aharvey@php.net"
+        },
+        {
+            "name": "Bernhard Schussek",
+            "email": "bschussek@2bepublished.at"
+        }
+    ],
+    "minimum-stability": "dev",
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.0.*@dev"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
+
diff --git a/core/vendor/sebastian/exporter/phpunit.xml.dist b/core/vendor/sebastian/exporter/phpunit.xml.dist
new file mode 100644
index 0000000000000000000000000000000000000000..15fb7481a2a0778fbff702522efa32462f51cbd6
--- /dev/null
+++ b/core/vendor/sebastian/exporter/phpunit.xml.dist
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
+         strict="true"
+         verbose="true">
+ <testsuites>
+  <testsuite name="Exporter">
+   <directory>tests</directory>
+  </testsuite>
+ </testsuites>
+ <filter>
+  <whitelist addUncoveredFilesFromWhitelist="true">
+   <directory>src</directory>
+  </whitelist>
+ </filter>
+</phpunit>
+
diff --git a/core/vendor/sebastian/exporter/src/Context.php b/core/vendor/sebastian/exporter/src/Context.php
new file mode 100644
index 0000000000000000000000000000000000000000..03bf54558bf5481a36c52f7066412ebe163f1f75
--- /dev/null
+++ b/core/vendor/sebastian/exporter/src/Context.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Exporter
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Exporter
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Adam Harvey <aharvey@php.net>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       https://github.com/sebastianbergmann/exporter
+ */
+
+namespace SebastianBergmann\Exporter;
+
+/**
+ * A context containing previously rendered arrays and objects when recursively
+ * exporting a value.
+ *
+ * @package    Exporter
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @author     Adam Harvey <aharvey@php.net>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       https://github.com/sebastianbergmann/exporter
+ */
+class Context {
+    /**
+     * Previously seen arrays.
+     *
+     * @var array[] $arrays
+     */
+    protected $arrays = array();
+
+    /**
+     * Previously seen objects.
+     *
+     * @var SplObjectStorage $objects
+     */
+    protected $objects;
+
+    /** Initialises the context. */
+    public function __construct()
+    {
+        $this->arrays = array();
+        $this->objects = new \SplObjectStorage;
+    }
+
+    /**
+     * Adds a value to the export context.
+     *
+     * @param mixed $value The value to add.
+     * @return mixed The ID of the stored value, either as a string or integer.
+     * @throws SebastianBergmann\Exporter\Exception Thrown if $value is not an array or object.
+     */
+    public function add(&$value)
+    {
+        if (is_array($value)) {
+            return $this->addArray($value);
+        }
+
+        else if (is_object($value)) {
+            return $this->addObject($value);
+        }
+
+        throw new ExporterException(
+          'Only arrays and objects are supported'
+        );
+    }
+
+    /**
+     * Checks if the given value exists within the context.
+     *
+     * @param mixed $value The value to check.
+     * @return mixed The string or integer ID of the stored value if it has
+     *               already been seen, or boolean false if the value is not
+     *               stored.
+     * @throws SebastianBergmann\Exporter\Exception Thrown if $value is not an array or object.
+     */
+    public function contains(&$value)
+    {
+        if (is_array($value)) {
+            return $this->containsArray($value);
+        }
+
+        else if (is_object($value)) {
+            return $this->containsObject($value);
+        }
+
+        throw new Exception(
+          'Only arrays and objects are supported'
+        );
+    }
+
+    /**
+     * Stores an array within the context.
+     *
+     * @param array $value The value to store.
+     * @return integer The internal ID of the array.
+     */
+    protected function addArray(array &$value)
+    {
+        if (($key = $this->containsArray($value)) !== FALSE) {
+            return $key;
+        }
+
+        $this->arrays[] = &$value;
+
+        return count($this->arrays) - 1;
+    }
+
+    /**
+     * Stores an object within the context.
+     *
+     * @param object $value
+     * @return string The ID of the object.
+     */
+    protected function addObject($value)
+    {
+        if (!$this->objects->contains($value)) {
+            $this->objects->attach($value);
+        }
+
+        return spl_object_hash($value);
+    }
+
+    /**
+     * Checks if the given array exists within the context.
+     *
+     * @param array $value The array to check.
+     * @return mixed The integer ID of the array if it exists, or boolean false
+     *               otherwise.
+     */
+    protected function containsArray(array &$value)
+    {
+        $keys = array_keys($this->arrays, $value, TRUE);
+        $gen = '_Exporter_Key_'.hash('sha512', microtime(TRUE));
+
+        foreach ($keys as $key) {
+            $this->arrays[$key][$gen] = $gen;
+
+            if (isset($value[$gen]) && $value[$gen] === $gen) {
+                unset($this->arrays[$key][$gen]);
+                return $key;
+            }
+
+            unset($this->arrays[$key][$gen]);
+        }
+
+        return FALSE;
+    }
+
+    /**
+     * Checks if the given object exists within the context.
+     *
+     * @param object $value The object to check.
+     * @return mixed The string ID of the object if it exists, or boolean false
+     *               otherwise.
+     */
+    protected function containsObject($value)
+    {
+        if ($this->objects->contains($value)) {
+            return spl_object_hash($value);
+        }
+
+        return FALSE;
+    }
+}
diff --git a/core/vendor/sebastian/exporter/src/Exception.php b/core/vendor/sebastian/exporter/src/Exception.php
new file mode 100644
index 0000000000000000000000000000000000000000..c198a38cc72619459f30e830fb325ead617a2f65
--- /dev/null
+++ b/core/vendor/sebastian/exporter/src/Exception.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Exporter
+ *
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package    Exporter
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       https://github.com/sebastianbergmann/exporter
+ */
+
+namespace SebastianBergmann\Exporter;
+
+/**
+ * Exception for Exporter runtime errors.
+ *
+ * @package    Exporter
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link       https://github.com/sebastianbergmann/exporter
+ */
+class Exception extends \RuntimeException
+{
+}
diff --git a/core/vendor/phpunit/phpunit/PHPUnit/Util/Type.php b/core/vendor/sebastian/exporter/src/Exporter.php
similarity index 51%
rename from core/vendor/phpunit/phpunit/PHPUnit/Util/Type.php
rename to core/vendor/sebastian/exporter/src/Exporter.php
index f162f33060d1ce39959fb007259c2d45b74681c8..b661f9eea2e93d9f4df0514c5157e4829c66b769 100644
--- a/core/vendor/phpunit/phpunit/PHPUnit/Util/Type.php
+++ b/core/vendor/sebastian/exporter/src/Exporter.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Exporter
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,51 +34,36 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
- * @subpackage Util
+ * @package    Exporter
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.0.0
+ * @link       https://github.com/sebastianbergmann/exporter
  */
 
+namespace SebastianBergmann\Exporter;
+
 /**
- * Utility class for textual type (and value) representation.
+ * A nifty utility for visualizing PHP variables.
+ *
+ * <code>
+ * <?php
+ * use SebastianBergmann\Exporter\Exporter;
  *
- * @package    PHPUnit
- * @subpackage Util
+ * $exporter = new Exporter;
+ * print $exporter->export(new Exception);
+ * </code>
+ *
+ * @package    Exporter
  * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.0.0
+ * @link       https://github.com/sebastianbergmann/exporter
  */
-class PHPUnit_Util_Type
+class Exporter
 {
-    public static function isType($type)
-    {
-        return in_array(
-          $type,
-          array(
-            'numeric',
-            'integer',
-            'int',
-            'float',
-            'string',
-            'boolean',
-            'bool',
-            'null',
-            'array',
-            'object',
-            'resource',
-            'scalar'
-          )
-        );
-    }
-
     /**
-     * Exports a value into a string
+     * Exports a value as a string
      *
      * The output of this method is similar to the output of print_r(), but
      * improved in various aspects:
@@ -90,14 +75,13 @@ public static function isType($type)
      *  - Carriage returns and newlines are normalized to \n
      *  - Recursion and repeated rendering is treated properly
      *
-     * @param  mixed $value The value to export
+     * @param  mixed   $value
      * @param  integer $indentation The indentation level of the 2nd+ line
      * @return string
-     * @since  Method available since Release 3.6.0
      */
-    public static function export($value, $indentation = 0)
+    public function export($value, $indentation = 0)
     {
-        return self::recursiveExport($value, $indentation);
+        return $this->recursiveExport($value, $indentation);
     }
 
     /**
@@ -105,13 +89,11 @@ public static function export($value, $indentation = 0)
      *
      * @param  mixed $value The value to export
      * @param  integer $indentation The indentation level of the 2nd+ line
-     * @param  array $processedObjects Contains all objects that were already
-     *                                 rendered
+     * @param  SebastianBergmann\Exporter\Context $processed Contains all objects and arrays that have previously been rendered
      * @return string
-     * @since  Method available since Release 3.6.0
-     * @see    PHPUnit_Util_Type::export
+     * @see    SebastianBergmann\Exporter\Exporter::export
      */
-    protected static function recursiveExport($value, $indentation, &$processedObjects = array())
+    protected function recursiveExport(&$value, $indentation, $processed = NULL)
     {
         if ($value === NULL) {
             return 'null';
@@ -125,6 +107,18 @@ protected static function recursiveExport($value, $indentation, &$processedObjec
             return 'false';
         }
 
+        if (is_float($value) && floatval(intval($value)) === $value) {
+            return "$value.0";
+        }
+
+        if (is_resource($value)) {
+            return sprintf(
+              'resource(%d) of type (%s)',
+              $value,
+              get_resource_type($value)
+            );
+        }
+
         if (is_string($value)) {
             // Match for most non printable chars somewhat taking multibyte chars into account
             if (preg_match('/[^\x09-\x0d\x20-\xff]/', $value)) {
@@ -136,99 +130,98 @@ protected static function recursiveExport($value, $indentation, &$processedObjec
                    "'";
         }
 
-        $origValue = $value;
+        $whitespace = str_repeat(' ', 4 * $indentation);
 
-        if (is_object($value)) {
-            if (in_array($value, $processedObjects, TRUE)) {
-                return sprintf(
-                  '%s Object (*RECURSION*)',
+        if (!$processed) {
+            $processed = new Context;
+        }
 
-                  get_class($value)
-                );
+        if (is_array($value)) {
+            if (($key = $processed->contains($value)) !== FALSE) {
+                return 'Array &' . $key;
             }
 
-            $processedObjects[] = $value;
+            $key = $processed->add($value);
+            $values = '';
+
+            if (count($value) > 0) {
+                foreach ($value as $k => $v) {
+                    $values .= sprintf(
+                      '%s    %s => %s' . "\n",
+                      $whitespace,
+                      $this->recursiveExport($k, $indentation),
+                      $this->recursiveExport($value[$k], $indentation + 1, $processed)
+                    );
+                }
 
-            // Convert object to array
-            $value = self::toArray($value);
+                $values = "\n" . $values . $whitespace;
+            }
+
+            return sprintf('Array &%s (%s)', $key, $values);
         }
 
-        if (is_array($value)) {
-            $whitespace = str_repeat('    ', $indentation);
-
-            // There seems to be no other way to check arrays for recursion
-            // http://www.php.net/manual/en/language.types.array.php#73936
-            preg_match_all('/\n            \[(\w+)\] => Array\s+\*RECURSION\*/', print_r($value, TRUE), $matches);
-            $recursiveKeys = array_unique($matches[1]);
-
-            // Convert to valid array keys
-            // Numeric integer strings are automatically converted to integers
-            // by PHP
-            foreach ($recursiveKeys as $key => $recursiveKey) {
-                if ((string)(integer)$recursiveKey === $recursiveKey) {
-                    $recursiveKeys[$key] = (integer)$recursiveKey;
-                }
+        if (is_object($value)) {
+            $class = get_class($value);
+
+            if ($hash = $processed->contains($value)) {
+                return sprintf('%s Object &%s', $class, $hash);
             }
 
-            $content = '';
+            $hash = $processed->add($value);
+            $values = '';
 
-            foreach ($value as $key => $val) {
-                if (in_array($key, $recursiveKeys, TRUE)) {
-                    $val = 'Array (*RECURSION*)';
-                }
+            $array = $this->toArray($value);
 
-                else {
-                    $val = self::recursiveExport($val, $indentation+1, $processedObjects);
+            if (count($array) > 0) {
+                foreach ($array as $k => $v) {
+                    $values .= sprintf(
+                      '%s    %s => %s' . "\n",
+                      $whitespace,
+                      $this->recursiveExport($k, $indentation),
+                      $this->recursiveExport($v, $indentation + 1, $processed)
+                    );
                 }
 
-                $content .=  $whitespace . '    ' . self::export($key) . ' => ' . $val . "\n";
-            }
-
-            if (strlen($content) > 0) {
-                $content = "\n" . $content . $whitespace;
+                $values = "\n" . $values . $whitespace;
             }
 
-            return sprintf(
-              "%s (%s)",
-
-              is_object($origValue) ? get_class($origValue) . ' Object' : 'Array',
-              $content
-            );
+            return sprintf('%s Object &%s (%s)', $class, $hash, $values);
         }
 
-        if (is_double($value) && (double)(integer)$value === $value) {
-            return $value . '.0';
-        }
-
-        return (string)$value;
+        return var_export($value, TRUE);
     }
 
     /**
      * Exports a value into a single-line string
      *
      * The output of this method is similar to the output of
-     * PHPUnit_Util_Type::export. This method guarantees thought that the
-     * result contains now newlines.
+     * SebastianBergmann\Exporter\Exporter::export. This method guarantees
+     * thought that the result contains now newlines.
      *
      * Newlines are replaced by the visible string '\n'. Contents of arrays
      * and objects (if any) are replaced by '...'.
      *
-     * @param  mixed $value The value to export
-     * @param  integer $indentation The indentation level of the 2nd+ line
+     * @param  mixed $value
      * @return string
-     * @see    PHPUnit_Util_Type::export
+     * @see    SebastianBergmann\Exporter\Exporter::export
      */
-    public static function shortenedExport($value)
+    public function shortenedExport($value)
     {
         if (is_string($value)) {
-            return self::shortenedString($value);
+            $string = $this->export($value);
+
+            if (strlen($string) > 40) {
+                $string = substr($string, 0, 30) . '...' . substr($string, -7);
+            }
+
+            return str_replace("\n", '\n', $string);
         }
 
         if (is_object($value)) {
             return sprintf(
               '%s Object (%s)',
               get_class($value),
-              count(self::toArray($value)) > 0 ? '...' : ''
+              count($this->toArray($value)) > 0 ? '...' : ''
             );
         }
 
@@ -239,40 +232,25 @@ public static function shortenedExport($value)
             );
         }
 
-        return self::export($value);
-    }
-
-    /**
-     * Shortens a string and converts all new lines to '\n'
-     *
-     * @param  string $string The string to shorten
-     * @param  integer $max The maximum length for the string
-     * @return string
-     */
-    public static function shortenedString($string, $maxLength = 40)
-    {
-        $string = self::export($string);
-
-        if (strlen($string) > $maxLength) {
-            $string = substr($string, 0, $maxLength - 10) . '...' . substr($string, -7);
-        }
-
-        return str_replace("\n", '\n', $string);
+        return $this->export($value);
     }
 
     /**
      * Converts an object to an array containing all of its private, protected
      * and public properties.
      *
-     * @param  object $object
+     * @param  mixed $value
      * @return array
-     * @since  Method available since Release 3.6.0
      */
-    public static function toArray($object)
+    public function toArray($value)
     {
+        if (!is_object($value)) {
+            return (array)$value;
+        }
+
         $array = array();
 
-        foreach ((array)$object as $key => $value) {
+        foreach ((array)$value as $key => $val) {
             // properties are transformed to keys in the following way:
 
             // private   $property => "\0Classname\0property"
@@ -283,17 +261,32 @@ public static function toArray($object)
                 $key = $matches[1];
             }
 
-            $array[$key] = $value;
+            // See https://github.com/php/php-src/commit/5721132
+            if ($key === "\0gcdata") {
+                continue;
+            }
+
+            $array[$key] = $val;
         }
 
         // Some internal classes like SplObjectStorage don't work with the
-        // above (fast) mechanism nor with reflection
+        // above (fast) mechanism nor with reflection in Zend.
         // Format the output similarly to print_r() in this case
-        if ($object instanceof SplObjectStorage) {
-            foreach ($object as $key => $value) {
-                $array[spl_object_hash($value)] = array(
-                    'obj' => $value,
-                    'inf' => $object->getInfo(),
+        if ($value instanceof \SplObjectStorage) {
+            // However, the fast method does work in HHVM, and exposes the
+            // internal implementation. Hide it again.
+            if (property_exists('\SplObjectStorage', '__storage')) {
+              unset($array['__storage']);
+            } else if (property_exists('\SplObjectStorage', 'storage')) {
+              unset($array['storage']);
+            }
+            if (property_exists('\SplObjectStorage', '__key')) {
+              unset($array['__key']);
+            }
+            foreach ($value as $key => $val) {
+                $array[spl_object_hash($val)] = array(
+                    'obj' => $val,
+                    'inf' => $value->getInfo(),
                 );
             }
         }
diff --git a/core/vendor/phpunit/phpunit/Tests/Util/TypeTest.php b/core/vendor/sebastian/exporter/tests/ExporterTest.php
similarity index 65%
rename from core/vendor/phpunit/phpunit/Tests/Util/TypeTest.php
rename to core/vendor/sebastian/exporter/tests/ExporterTest.php
index 7a7056ef434536f953346302d719664c8a52df59..99a357345053fd7d9543114d6a5461899c9675f3 100644
--- a/core/vendor/phpunit/phpunit/Tests/Util/TypeTest.php
+++ b/core/vendor/sebastian/exporter/tests/ExporterTest.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * PHPUnit
+ * Exporter
  *
- * Copyright (c) 2001-2013, Sebastian Bergmann <sebastian@phpunit.de>.
+ * Copyright (c) 2001-2014, Sebastian Bergmann <sebastian@phpunit.de>.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,50 +34,44 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * @package    PHPUnit
+ * @package    Exporter
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
+ * @link       https://github.com/sebastianbergmann/exporter
  */
 
-require_once 'PHPUnit/Framework/TestCase.php';
-
-require_once 'PHPUnit/Util/Type.php';
+namespace SebastianBergmann\Exporter;
 
 /**
- *
- *
- * @package    PHPUnit
+ * @package    Exporter
+ * @author     Sebastian Bergmann <sebastian@phpunit.de>
  * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2001-2013 Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright  2001-2014 Sebastian Bergmann <sebastian@phpunit.de>
  * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
+ * @link       https://github.com/sebastianbergmann/exporter
  */
-class Util_TypeTest extends PHPUnit_Framework_TestCase
+class ExporterTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * Removes spaces in front newlines
-     *
-     * @param  string $string
-     * @return string
-     */
-    public static function trimnl($string)
+    private $exporter;
+
+    protected function setUp()
     {
-        return preg_replace('/[ ]*\n/', "\n", $string);
+        $this->exporter = new Exporter;
     }
 
     public function exportProvider()
     {
-        $obj2 = new stdClass;
+        $obj2 = new \stdClass;
         $obj2->foo = 'bar';
 
-        $obj = new stdClass;
-        //@codingStandardsIgnoreStart 
+        $obj3 = (object)array(1,2,"Test\r\n",4,5,6,7,8);
+
+        $obj = new \stdClass;
+        //@codingStandardsIgnoreStart
         $obj->null = NULL;
-        //@codingStandardsIgnoreEnd 
+        //@codingStandardsIgnoreEnd
         $obj->boolean = TRUE;
         $obj->integer = 1;
         $obj->double = 1.2;
@@ -88,6 +82,10 @@ public function exportProvider()
         $obj->array = array('foo' => 'bar');
         $obj->self = $obj;
 
+        $storage = new \SplObjectStorage;
+        $storage->attach($obj2);
+        $storage->foo = $obj2;
+
         $array = array(
             0 => 0,
             'null' => NULL,
@@ -109,7 +107,24 @@ public function exportProvider()
             array(1, '1'),
             array(1.0, '1.0'),
             array(1.2, '1.2'),
+            array(fopen('php://memory', 'r'), 'resource(%d) of type (stream)'),
             array('1', "'1'"),
+            array(array(array(1,2,3), array(3,4,5)),
+<<<EOF
+Array &0 (
+    0 => Array &1 (
+        0 => 1
+        1 => 2
+        2 => 3
+    )
+    1 => Array &2 (
+        0 => 3
+        1 => 4
+        2 => 5
+    )
+)
+EOF
+            ),
             // \n\r and \r is converted to \n
             array("this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext",
 <<<EOF
@@ -126,10 +141,10 @@ public function exportProvider()
 text'
 EOF
             ),
-            array(new stdClass, 'stdClass Object ()'),
+            array(new \stdClass, 'stdClass Object &%x ()'),
             array($obj,
 <<<EOF
-stdClass Object (
+stdClass Object &%x (
     'null' => null
     'boolean' => true
     'integer' => 1
@@ -146,21 +161,21 @@ public function exportProvider()
 very
 long
 text'
-    'object' => stdClass Object (
+    'object' => stdClass Object &%x (
         'foo' => 'bar'
     )
-    'objectagain' => stdClass Object (*RECURSION*)
-    'array' => Array (
+    'objectagain' => stdClass Object &%x
+    'array' => Array &%d (
         'foo' => 'bar'
     )
-    'self' => stdClass Object (*RECURSION*)
+    'self' => stdClass Object &%x
 )
 EOF
             ),
-            array(array(), 'Array ()'),
+            array(array(), 'Array &%d ()'),
             array($array,
 <<<EOF
-Array (
+Array &%d (
     0 => 0
     'null' => null
     'boolean' => true
@@ -178,14 +193,65 @@ public function exportProvider()
 very
 long
 text'
-    'object' => stdClass Object (
+    'object' => stdClass Object &%x (
         'foo' => 'bar'
     )
-    'objectagain' => stdClass Object (*RECURSION*)
-    'array' => Array (
+    'objectagain' => stdClass Object &%x
+    'array' => Array &%d (
         'foo' => 'bar'
     )
-    'self' => Array (*RECURSION*)
+    'self' => Array &%d (
+        0 => 0
+        'null' => null
+        'boolean' => true
+        'integer' => 1
+        'double' => 1.2
+        'string' => '1'
+        'text' => 'this
+is
+a
+very
+very
+very
+very
+very
+very
+long
+text'
+        'object' => stdClass Object &%x
+        'objectagain' => stdClass Object &%x
+        'array' => Array &%d (
+            'foo' => 'bar'
+        )
+        'self' => Array &%d
+    )
+)
+EOF
+            ),
+            array($storage,
+<<<EOF
+SplObjectStorage Object &%x (
+    'foo' => stdClass Object &%x (
+        'foo' => 'bar'
+    )
+    '%x' => Array &0 (
+        'obj' => stdClass Object &%x
+        'inf' => null
+    )
+)
+EOF
+            ),
+            array($obj3,
+<<<EOF
+stdClass Object &%x (
+    0 => 1
+    1 => 2
+    2 => 'Test\n'
+    3 => 4
+    4 => 5
+    5 => 6
+    6 => 7
+    7 => 8
 )
 EOF
             ),
@@ -213,12 +279,14 @@ public function exportProvider()
      */
     public function testExport($value, $expected)
     {
-        $this->assertSame($expected, self::trimnl(PHPUnit_Util_Type::export($value)));
+        $this->assertStringMatchesFormat(
+          $expected, $this->trimnl($this->exporter->export($value))
+        );
     }
 
     public function shortenedExportProvider()
     {
-        $obj = new stdClass;
+        $obj = new \stdClass;
         $obj->foo = 'bar';
 
         $array = array(
@@ -234,7 +302,7 @@ public function shortenedExportProvider()
             array('1', "'1'"),
             // \n\r and \r is converted to \n
             array("this\nis\na\nvery\nvery\nvery\nvery\nvery\nvery\rlong\n\rtext", "'this\\nis\\na\\nvery\\nvery\\nvery\\nvery...g\\ntext'"),
-            array(new stdClass, 'stdClass Object ()'),
+            array(new \stdClass, 'stdClass Object ()'),
             array($obj, 'stdClass Object (...)'),
             array(array(), 'Array ()'),
             array($array, 'Array (...)'),
@@ -246,7 +314,10 @@ public function shortenedExportProvider()
      */
     public function testShortenedExport($value, $expected)
     {
-        $this->assertSame($expected, self::trimnl(PHPUnit_Util_Type::shortenedExport($value)));
+        $this->assertSame(
+          $expected,
+          $this->trimnl($this->exporter->shortenedExport($value))
+        );
     }
 
     public function provideNonBinaryMultibyteStrings()
@@ -264,6 +335,13 @@ public function provideNonBinaryMultibyteStrings()
      */
     public function testNonBinaryStringExport($value, $expectedLength)
     {
-        $this->assertRegExp("~'.{{$expectedLength}}'\$~s", PHPUnit_Util_Type::export($value));
+        $this->assertRegExp(
+          "~'.{{$expectedLength}}'\$~s", $this->exporter->export($value)
+        );
+    }
+
+    protected function trimnl($string)
+    {
+        return preg_replace('/[ ]*\n/', "\n", $string);
     }
 }
diff --git a/core/vendor/sebastian/version/.gitattributes b/core/vendor/sebastian/version/.gitattributes
new file mode 100644
index 0000000000000000000000000000000000000000..461090b7ecca054b69e8e69e0dbc0f5e4ad705bc
--- /dev/null
+++ b/core/vendor/sebastian/version/.gitattributes
@@ -0,0 +1 @@
+*.php diff=php
diff --git a/core/vendor/sebastian/version/.gitignore b/core/vendor/sebastian/version/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..7d07093152757bdf5ebe22df11ed10118a413a85
--- /dev/null
+++ b/core/vendor/sebastian/version/.gitignore
@@ -0,0 +1,10 @@
+build/api
+build/code-browser
+build/coverage
+build/logs
+build/pdepend
+build/phpdox
+build/SebastianBergmann
+build/*.tgz
+cache.properties
+/.idea
diff --git a/core/vendor/sebastian/version/ChangeLog.md b/core/vendor/sebastian/version/ChangeLog.md
new file mode 100644
index 0000000000000000000000000000000000000000..d01318e252870f14292f9d0d4d96b4bd555b124e
--- /dev/null
+++ b/core/vendor/sebastian/version/ChangeLog.md
@@ -0,0 +1,19 @@
+# Version 1.0
+
+This is the list of changes for the Version 1.0 release series.
+
+## Version 1.0.3
+
+* Only look for Git repository in the supplied path (and not in its parent directories).
+
+## Version 1.0.2
+
+* Errors from `exec()`uting the Git command are now suppressed.
+
+## Version 1.0.1
+
+* Fixed #2: `getVersion()` fails on Windows.
+
+## Version 1.0.0
+
+* Initial release.
diff --git a/core/vendor/sebastian/version/LICENSE b/core/vendor/sebastian/version/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..4f3c283e6d6050431512a50dd880c0588fe76f84
--- /dev/null
+++ b/core/vendor/sebastian/version/LICENSE
@@ -0,0 +1,33 @@
+Version
+
+Copyright (c) 2013-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+ * Neither the name of Sebastian Bergmann nor the names of his
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/core/vendor/sebastian/version/README.md b/core/vendor/sebastian/version/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3c72678bda2592bfe3a6b4360856d279addcfbd6
--- /dev/null
+++ b/core/vendor/sebastian/version/README.md
@@ -0,0 +1,46 @@
+# Version
+
+**Version** is a library that helps with managing the version number of Git-hosted PHP projects.
+
+## Installation
+
+### Composer
+
+Simply add a dependency on `sebastian/version` to your project's `composer.json` file if you use [Composer](http://getcomposer.org/) to manage the dependencies of your project.
+
+### PEAR Installer
+
+The following two commands (which you may have to run as `root`) are all that is required to install Version using the PEAR Installer:
+
+    pear config-set auto_discover 1
+    pear install pear.phpunit.de/Version
+
+## Usage
+
+The constructor of the `SebastianBergmann\Version` class expects two parameters:
+
+* `$release` is the version number of the latest release (`X.Y.Z`, for instance) or the name of the release series (`X.Y`) when no release has been made from that branch / for that release series yet.
+* `$path` is the path to the directory (or a subdirectory thereof) where the sourcecode of the project can be found. Simply passing `__DIR__` here usually suffices.
+
+Apart from the constructor, the `SebastianBergmann\Version` class has a single public method: `getVersion()`.
+
+Here is a contrived example that shows the basic usage:
+
+    <?php
+    $version = new SebastianBergmann\Version(
+      '3.7.10', '/usr/local/src/phpunit'
+    );
+
+    var_dump($version->getVersion());
+    ?>
+
+    string(18) "3.7.10-17-g00f3408"
+
+When a new release is prepared, the string that is passed to the constructor as the first argument needs to be updated.
+
+### How SebastianBergmann\Version::getVersion() works
+
+* If `$path` is not (part of) a Git repository and `$release` is in `X.Y.Z` format then `$release` is returned as-is.
+* If `$path` is not (part of) a Git repository and `$release` is in `X.Y` format then `$release` is returned suffixed with `-dev`.
+* If `$path` is (part of) a Git repository and `$release` is in `X.Y.Z` format then the output of `git describe --tags` is returned as-is.
+* If `$path` is (part of) a Git repository and `$release` is in `X.Y` format then a string is returned that begins with `X.Y` and ends with information from `git describe --tags`.
diff --git a/core/vendor/sebastian/version/build.xml b/core/vendor/sebastian/version/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..67f1d095ef4168f8ada996b474e48c1454abf453
--- /dev/null
+++ b/core/vendor/sebastian/version/build.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="version" default="build">
+ <property name="php" value="php"/>
+ <property name="phpunit" value="phpunit"/>
+
+ <target name="build" depends="prepare,lint,phpcs,phpunit"/>
+
+ <target name="clean" description="Cleanup build artifacts">
+ </target>
+
+ <target name="prepare" depends="clean,phpab" description="Prepare for build">
+ </target>
+
+ <target name="phpab" description="Generate autoloader script">
+  <exec executable="phpab">
+   <arg value="--output" />
+   <arg path="src/autoload.php" />
+   <arg path="src" />
+  </exec>
+ </target>
+
+ <target name="lint">
+  <apply executable="${php}" failonerror="true">
+   <arg value="-l" />
+
+   <fileset dir="${basedir}/src">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+
+   <fileset dir="${basedir}/tests">
+    <include name="**/*.php" />
+    <modified />
+   </fileset>
+  </apply>
+ </target>
+
+ <target name="phpcs" description="Find coding standard violations using PHP_CodeSniffer">
+  <exec executable="phpcs">
+   <arg value="--standard=PSR2" />
+   <arg value="--extensions=php" />
+   <arg value="--ignore=autoload.php" />
+   <arg path="${basedir}/src" />
+  </exec>
+ </target>
+
+ <target name="phpunit" description="Run unit tests with PHPUnit">
+  <condition property="phpunit_cmd" value="${php} ${phpunit}" else="${phpunit}">
+   <not>
+    <equals arg1="${phpunit}" arg2="phpunit" />
+   </not>
+  </condition>
+
+  <exec executable="${phpunit_cmd}" failonerror="true">
+   <arg value="--configuration" />
+   <arg path="${basedir}/build/phpunit.xml" />
+  </exec>
+ </target>
+
+ <target name="pear">
+  <mkdir dir="${basedir}/build/SebastianBergmann/Version"/>
+
+  <copy todir="${basedir}/build/SebastianBergmann/Version">
+   <fileset dir="${basedir}/src"/>
+  </copy>
+
+  <copy file="ChangeLog.md" todir="${basedir}/build"/>
+  <copy file="LICENSE" todir="${basedir}/build"/>
+  <copy file="README.md" todir="${basedir}/build"/>
+
+  <exec executable="pear" dir="${basedir}/build">
+   <arg value="package" />
+  </exec>
+
+  <delete dir="${basedir}/build/SebastianBergmann"/>
+  <delete file="${basedir}/build/ChangeLog.md"/>
+  <delete file="${basedir}/build/LICENSE"/>
+  <delete file="${basedir}/build/README.md"/>
+ </target>
+</project>
diff --git a/core/vendor/sebastian/version/build/package.xml b/core/vendor/sebastian/version/build/package.xml
new file mode 100644
index 0000000000000000000000000000000000000000..479da159367d36250ee180dfb9bfef5d0c31b3c0
--- /dev/null
+++ b/core/vendor/sebastian/version/build/package.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.4.10" version="2.0"
+  xmlns="http://pear.php.net/dtd/package-2.0"
+  xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+                      http://pear.php.net/dtd/tasks-1.0.xsd
+                      http://pear.php.net/dtd/package-2.0
+                      http://pear.php.net/dtd/package-2.0.xsd">
+ <name>Version</name>
+ <channel>pear.phpunit.de</channel>
+ <summary>Library that helps with managing the version number of Git-hosted PHP projects</summary>
+ <description>Library that helps with managing the version number of Git-hosted PHP projects</description>
+ <lead>
+  <name>Sebastian Bergmann</name>
+  <user>sb</user>
+  <email>sebastian@phpunit.de</email>
+  <active>yes</active>
+ </lead>
+ <date>2014-03-07</date>
+ <version>
+  <release>1.0.3</release>
+  <api>1.0.0</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license>The BSD 3-Clause License</license>
+ <notes>http://github.com/sebastianbergmann/version/tree</notes>
+ <contents>
+  <dir name="/">
+   <dir name="SebastianBergmann">
+    <dir name="Version">
+     <file baseinstalldir="/" name="autoload.php" role="php"/>
+     <file baseinstalldir="/" name="Version.php" role="php"/>
+    </dir>
+   </dir>
+   <file baseinstalldir="/" name="ChangeLog.md" role="doc"/>
+   <file baseinstalldir="/" name="LICENSE" role="doc"/>
+   <file baseinstalldir="/" name="README.md" role="doc"/>
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.3.3</min>
+   </php>
+   <pearinstaller>
+    <min>1.9.4</min>
+   </pearinstaller>
+  </required>
+ </dependencies>
+ <phprelease/>
+</package>
diff --git a/core/vendor/sebastian/version/build/phpunit.xml b/core/vendor/sebastian/version/build/phpunit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..508900bf52752d6f4fbbe01f2e3b8f6da9a2ec5e
--- /dev/null
+++ b/core/vendor/sebastian/version/build/phpunit.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="../tests/bootstrap.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         strict="true"
+         verbose="true">
+  <testsuites>
+    <testsuite name="Version">
+      <directory suffix="Test.php">../tests</directory>
+    </testsuite>
+  </testsuites>
+
+  <logging>
+    <log type="coverage-html" target="coverage" charset="UTF-8" highlight="true"
+         lowUpperBound="35" highLowerBound="70"/>
+    <log type="coverage-clover" target="logs/clover.xml"/>
+    <log type="junit" target="logs/junit.xml" logIncompleteSkipped="false"/>
+  </logging>
+
+  <filter>
+    <whitelist addUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">../src</directory>
+      <exclude>
+        <file>../src/autoload.php</file>
+      </exclude>
+    </whitelist>
+  </filter>
+</phpunit>
diff --git a/core/vendor/sebastian/version/composer.json b/core/vendor/sebastian/version/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..39d65697d67ea196b7c84e49a85e0eb2b004c093
--- /dev/null
+++ b/core/vendor/sebastian/version/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "sebastian/version",
+    "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+    "homepage": "https://github.com/sebastianbergmann/version",
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Sebastian Bergmann",
+            "email": "sebastian@phpunit.de",
+            "role": "lead"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/sebastianbergmann/version/issues"
+    },
+    "autoload": {
+        "classmap": [
+            "src/"
+        ]
+    }
+}
diff --git a/core/vendor/sebastian/version/src/Version.php b/core/vendor/sebastian/version/src/Version.php
new file mode 100644
index 0000000000000000000000000000000000000000..3aa589a77022c7daaad41d0442da1845d94aa87f
--- /dev/null
+++ b/core/vendor/sebastian/version/src/Version.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright (c) 2013-2014, Sebastian Bergmann <sebastian@phpunit.de>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in
+ *     the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the name of Sebastian Bergmann nor the names of his
+ *     contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package   Version
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2013-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link      http://github.com/sebastianbergmann/version
+ * @since     File available since Release 1.0.0
+ */
+
+namespace SebastianBergmann;
+
+/**
+ * @package   Version
+ * @author    Sebastian Bergmann <sebastian@phpunit.de>
+ * @copyright 2013-2014 Sebastian Bergmann <sebastian@phpunit.de>
+ * @license   http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
+ * @link      http://github.com/sebastianbergmann/version
+ * @since     Class available since Release 1.0.0
+ */
+class Version
+{
+    private $path;
+    private $release;
+    private $version;
+
+    /**
+     * @param string $release
+     * @param string $path
+     */
+    public function __construct($release, $path)
+    {
+        $this->release = $release;
+        $this->path    = $path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getVersion()
+    {
+        if ($this->version === null) {
+            if (count(explode('.', $this->release)) == 3) {
+                $this->version = $this->release;
+            } else {
+                $this->version = $this->release . '-dev';
+            }
+
+            $git = $this->getGitInformation($this->path);
+
+            if ($git) {
+                if (count(explode('.', $this->release)) == 3) {
+                    $this->version = $git;
+                } else {
+                    $git = explode('-', $git);
+
+                    $this->version = $this->release . '-' . $git[2];
+                }
+            }
+        }
+
+        return $this->version;
+    }
+
+    /**
+     * @param  string $path
+     * @return boolean|string
+     */
+    private function getGitInformation($path)
+    {
+        if (!is_dir($path . DIRECTORY_SEPARATOR . '.git')) {
+            return false;
+        }
+
+        $dir = getcwd();
+        chdir($path);
+        $result = @exec('git describe --tags 2>&1', $output, $returnCode);
+        chdir($dir);
+
+        if ($returnCode !== 0) {
+            return false;
+        }
+
+        return $result;
+    }
+}
diff --git a/core/vendor/sebastian/version/src/autoload.php b/core/vendor/sebastian/version/src/autoload.php
new file mode 100644
index 0000000000000000000000000000000000000000..93a266992f0f04cf388dd47faeda3d879e15c552
--- /dev/null
+++ b/core/vendor/sebastian/version/src/autoload.php
@@ -0,0 +1,19 @@
+<?php
+// @codingStandardsIgnoreFile
+// @codeCoverageIgnoreStart
+// this is an autogenerated file - do not edit
+spl_autoload_register(
+    function($class) {
+        static $classes = null;
+        if ($classes === null) {
+            $classes = array(
+                'sebastianbergmann\\version' => '/Version.php'
+            );
+        }
+        $cn = strtolower($class);
+        if (isset($classes[$cn])) {
+            require __DIR__ . $classes[$cn];
+        }
+    }
+);
+// @codeCoverageIgnoreEnd
\ No newline at end of file
diff --git a/core/vendor/sebastian/version/tests/bootstrap.php b/core/vendor/sebastian/version/tests/bootstrap.php
new file mode 100644
index 0000000000000000000000000000000000000000..d352bb04c7d0495870bcf5d7395738de64b82c4a
--- /dev/null
+++ b/core/vendor/sebastian/version/tests/bootstrap.php
@@ -0,0 +1,2 @@
+<?php
+require __DIR__ . '/../src/autoload.php';