update v1.0.6

vendor/phpunit/phpunit/CODE_OF_CONDUCT.md

@@ -1,14 +1,28 @@
 # Contributor Code of Conduct
 
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
 
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
 
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+Examples of unacceptable behavior by participants include:
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
 
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org/), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)
+By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
 
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project maintainer at sebastian@phpunit.de. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.3.0, available at [http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

vendor/phpunit/phpunit/ChangeLog-4.8.md

@@ -2,6 +2,19 @@
 
 All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+## [4.8.23] - 2016-02-11
+
+### Fixed
+
+* Fixed [#2072](https://github.com/sebastianbergmann/phpunit/issues/2072): Paths in XML configuration file were not handled correctly when they have whitespace around them
+
+## [4.8.22] - 2016-02-02
+
+### Fixed
+
+* Fixed [#2050](https://github.com/sebastianbergmann/phpunit/issues/2050): `PHPUnit_Util_XML::load()` raises exception with empty message when XML string is empty
+* Fixed a bug in `PHPUnit_Runner_Version::series()`
+
 ## [4.8.21] - 2015-12-12
 
 ### Changed
@@ -156,6 +169,8 @@ New PHAR release due to updated dependencies
 * Made the argument check of `assertContains()` and `assertNotContains()` more strict to prevent undefined behavior such as [#1808](https://github.com/sebastianbergmann/phpunit/issues/1808)
 * Changed the name of the default group from `__nogroup__` to `default`
 
+[4.8.23]: https://github.com/sebastianbergmann/phpunit/compare/4.8.22...4.8.23
+[4.8.22]: https://github.com/sebastianbergmann/phpunit/compare/4.8.21...4.8.22
 [4.8.21]: https://github.com/sebastianbergmann/phpunit/compare/4.8.20...4.8.21
 [4.8.20]: https://github.com/sebastianbergmann/phpunit/compare/4.8.19...4.8.20
 [4.8.19]: https://github.com/sebastianbergmann/phpunit/compare/4.8.18...4.8.19

vendor/phpunit/phpunit/LICENSE

@@ -1,6 +1,6 @@
 PHPUnit
 
-Copyright (c) 2001-2015, Sebastian Bergmann <sebastian@phpunit.de>.
+Copyright (c) 2001-2016, Sebastian Bergmann <sebastian@phpunit.de>.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

vendor/phpunit/phpunit/phpunit.xsd

@@ -118,6 +118,7 @@
           <xs:enumeration value="coverage-text"/>
           <xs:enumeration value="coverage-clover"/>
           <xs:enumeration value="coverage-crap4j"/>
+          <xs:enumeration value="coverage-xml"/>
           <xs:enumeration value="json"/>
           <xs:enumeration value="plain"/>
           <xs:enumeration value="tap"/>

vendor/phpunit/phpunit/src/Framework/TestCase.php

@@ -2063,9 +2063,7 @@ abstract class PHPUnit_Framework_TestCase extends PHPUnit_Framework_Assert imple
                     $this->snapshot,
                     $this->createGlobalStateSnapshot($backupGlobals)
                 );
-            }
-
-            catch (PHPUnit_Framework_RiskyTestError $rte) {
+            } catch (PHPUnit_Framework_RiskyTestError $rte) {
                 // Intentionally left empty
             }
         }

vendor/phpunit/phpunit/src/Runner/Version.php

@@ -30,7 +30,7 @@ class PHPUnit_Runner_Version
         }
 
         if (self::$version === null) {
-            $version       = new SebastianBergmann\Version('4.8.21', dirname(dirname(__DIR__)));
+            $version       = new SebastianBergmann\Version('4.8.23', dirname(dirname(__DIR__)));
             self::$version = $version->getVersion();
         }
 
@@ -44,6 +44,12 @@ class PHPUnit_Runner_Version
      */
     public static function series()
     {
+        if (strpos(self::id(), '-')) {
+            $tmp = explode('-', self::id());
+
+            return $tmp[0];
+        }
+
         return implode('.', array_slice(explode('.', self::id()), 0, 2));
     }
 

vendor/phpunit/phpunit/src/Util/Configuration.php

@@ -1099,6 +1099,7 @@ class PHPUnit_Util_Configuration
 
         foreach ($this->xpath->query($query) as $file) {
             $filePath = (string) $file->textContent;
+
             if ($filePath) {
                 $files[] = $this->toAbsolutePath($filePath);
             }
@@ -1117,6 +1118,8 @@ class PHPUnit_Util_Configuration
      */
     protected function toAbsolutePath($path, $useIncludePath = false)
     {
+        $path = trim($path);
+
         if ($path[0] === '/') {
             return $path;
         }

vendor/phpunit/phpunit/src/Util/PHP/Default.php

@@ -33,7 +33,7 @@ class PHPUnit_Util_PHP_Default extends PHPUnit_Util_PHP
         $runtime = $runtime->getBinary() . $this->settingsToParameters($settings);
 
         if ('phpdbg' === PHP_SAPI) {
-            $runtime .= ' -qrr '.escapeshellarg(__DIR__ . '/eval-stdin.php');
+            $runtime .= ' -qrr ' . escapeshellarg(__DIR__ . '/eval-stdin.php');
         }
 
         $process = proc_open(

vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php

@@ -1,3 +1,3 @@
 <?php
 
-eval('?>'.file_get_contents('php://input'));
+eval('?>' . file_get_contents('php://input'));

vendor/phpunit/phpunit/src/Util/XML.php

@@ -100,6 +100,14 @@ class PHPUnit_Util_XML
             return $actual;
         }
 
+        if (!is_string($actual)) {
+            throw new PHPUnit_Framework_Exception('Could not load XML from ' . gettype($actual));
+        }
+
+        if ($actual === '') {
+            throw new PHPUnit_Framework_Exception('Could not load XML from empty string');
+        }
+
         // Required for XInclude on Windows.
         if ($xinclude) {
             $cwd = getcwd();
@@ -149,6 +157,9 @@ class PHPUnit_Util_XML
                     )
                 );
             } else {
+                if ($message === '') {
+                    $message = 'Could not load XML for unknown reason';
+                }
                 throw new PHPUnit_Framework_Exception($message);
             }
         }

vendor/phpunit/phpunit/tests/Util/ConfigurationTest.php

@@ -103,6 +103,7 @@ class Util_ConfigurationTest extends PHPUnit_Framework_TestCase
                 'file' =>
                 array(
                   0 => '/path/to/file',
+                  1 => '/path/to/file',
                 ),
               ),
               'exclude' =>

vendor/phpunit/phpunit/tests/Util/XMLTest.php

@@ -315,4 +315,31 @@ class Util_XMLTest extends PHPUnit_Framework_TestCase
 
         return $data;
     }
+
+    /**
+     * @expectedException PHPUnit_Framework_Exception
+     * @expectedExceptionMessage Could not load XML from empty string
+     */
+    public function testLoadEmptyString()
+    {
+        PHPUnit_Util_XML::load('');
+    }
+
+    /**
+     * @expectedException PHPUnit_Framework_Exception
+     * @expectedExceptionMessage Could not load XML from array
+     */
+    public function testLoadArray()
+    {
+        PHPUnit_Util_XML::load(array(1, 2, 3));
+    }
+
+    /**
+     * @expectedException PHPUnit_Framework_Exception
+     * @expectedExceptionMessage Could not load XML from boolean
+     */
+    public function testLoadBoolean()
+    {
+        PHPUnit_Util_XML::load(false);
+    }
 }

vendor/phpunit/phpunit/tests/_files/configuration.xml

@@ -45,6 +45,9 @@
     <blacklist>
       <directory suffix=".php">/path/to/files</directory>
       <file>/path/to/file</file>
+      <file>
+          /path/to/file
+      </file>
       <exclude>
         <directory suffix=".php">/path/to/files</directory>
         <file>/path/to/file</file>