Merge branch 'release/1.2.6'

ray-di · Jul 16, 2014 · 52e9996 · 52e9996
2 parents 95a6107 + 0dcae3f
commit 52e9996
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 26 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,7 @@ before_install:
 
 script:
  - phpunit --coverage-text --coverage-clover=coverage.clover
- - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 --fixers=-psr0 .); if [[ $output ]]; then while read
+ - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 --fixers=-psr0 src); if [[ $output ]]; then while read
   -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
 
 after_script:

diff --git a/composer.lock b/composer.lock
diff --git a/src/Matcher.php b/src/Matcher.php
@@ -49,7 +49,7 @@ class Matcher extends AbstractMatcher implements Matchable
      *
      * @var Reader
      */
-    static private $annotationReader;
+    private static $annotationReader;
 
     /**
      * @var Reader

diff --git a/tests/CompilerTest.php b/tests/CompilerTest.php
@@ -11,7 +11,7 @@
 use PHPParser_PrettyPrinter_Default;
 use PHPParser_BuilderFactory;
 
-class BuilderTest extends \PHPUnit_Framework_TestCase
+class CompilerTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var Bind

diff --git a/tests/MatcherTest.php b/tests/MatcherTest.php
@@ -282,4 +282,11 @@ public function testIsLogicalXorTreeArgs()
         $result = $match($class, Matcher::TARGET_CLASS);
         $this->assertTrue($result);
     }
+
+    public function testSetAnnotationReader()
+    {
+        $reader = new Reader;
+        $result = $this->matcher->setAnnotationReader($reader);
+        $this->assertNull($result);
+    }
 }
diff --git a/tests/MethodInterceptorChangeArgumentTest.php b/tests/MethodInterceptorChangeArgumentTest.php
@@ -58,4 +58,3 @@ protected function setUp()
         $this->invocation = new ReflectiveMethodInvocation($target, $args);
     }
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,4 +58,3 @@ protected function setUp()
		$this->invocation = new ReflectiveMethodInvocation($target, $args);
		}
		}