Merge pull request #105 from gabbydgab/hot-fix/phpunit-deprecated-met…

…hods bumped phpunit to 5.7 and fixed deprecated methods
doctrine · Jan 3, 2017 · 1a4fb7e · 1a4fb7e
2 parents d741466 + 986054a
commit 1a4fb7e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
- - 5.5
  - 5.6
  - 7.0
  - hhvm

diff --git a/composer.json b/composer.json
@@ -13,10 +13,10 @@
  {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
  ],
  "require": {
- "php": "^5.5 || ^7.0"
+ "php": "^5.6 || ^7.0"
  },
  "require-dev": {
- "phpunit/phpunit": "~4.0",
+ "phpunit/phpunit": "^5.7",
  "doctrine/coding-standard": "~0.1@dev"
  },
  "autoload": {

diff --git a/tests/Doctrine/Tests/Common/Collections/Expr/CompositeExpressionTest.php b/tests/Doctrine/Tests/Common/Collections/Expr/CompositeExpressionTest.php
@@ -5,7 +5,7 @@
 use Doctrine\Common\Collections\Expr\CompositeExpression;
 use Doctrine\Common\Collections\Expr\ExpressionVisitor;
 use Doctrine\Common\Collections\Expr\Value;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 
 /**
  * @author Tobias Oberrauch <hello@tobiasoberrauch.com>
@@ -65,7 +65,7 @@ protected function createCompositeExpression()
  {
  $type = CompositeExpression::TYPE_AND;
  $expressions = array(
- $this->getMock('Doctrine\Common\Collections\Expr\Expression'),
+ $this->createMock('Doctrine\Common\Collections\Expr\Expression'),
  );
 
  $compositeExpression = new CompositeExpression($type, $expressions);
@@ -81,7 +81,7 @@ public function testGetExpressionList()
  $compositeExpression = $this->createCompositeExpression();
 
  $expectedExpressionList = array(
- $this->getMock('Doctrine\Common\Collections\Expr\Expression'),
+ $this->createMock('Doctrine\Common\Collections\Expr\Expression'),
  );
  $actualExpressionList = $compositeExpression->getExpressionList();