Fix test bugs

1ukaz · Mar 6, 2018 · 3549f1f · 3549f1f
1 parent 0456d5a
commit 3549f1f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -71,7 +71,7 @@ install:
   - composer install -q -n --no-ansi --no-progress --dev --prefer-dist --no-suggest #--ignore-platform-reqs
   # We'll do this in future for the all 7.x series
   - |
-      if [ "${PHP_MAJOR}.${PHP_MINOR}" = "7.2" ] || [ "${PHP_MAJOR}.${PHP_MINOR}" = "7.3" ]; then
+      if [ "${PHP_MAJOR}.${PHP_MINOR}" = "7.3" ]; then
           composer remove -q -n --no-ansi --no-progress --dev doctrine/instantiator
           composer remove -q -n --no-ansi --no-progress --dev phpdocumentor/reflection-docblock
           composer remove -q -n --no-ansi --no-progress --dev phpunit/phpunit

diff --git a/tests/unit/Acl/Adapter/MemoryTest.php b/tests/unit/Acl/Adapter/MemoryTest.php
@@ -8,7 +8,6 @@
 use Phalcon\Test\Acl\TestResourceAware;
 use Phalcon\Test\Acl\TestRoleAware;
 use Phalcon\Test\Acl\TestRoleResourceAware;
-use PHPUnit_Framework_Exception;
 use Phalcon\Test\Module\UnitTest;
 use Phalcon\Acl\Adapter\Memory;
 
@@ -647,8 +646,7 @@ function () {
             },
             [
                 'throws' => [
-                    // We may need change this for all 7.x series
-                    PHP_VERSION_ID >= 70200 ? 'PHPUnit\Framework\Exception' : 'PHPUnit_Framework_Exception',
+                    \PHPUnit_Framework_Exception::class,
                     "You didn't provide any parameters when check Guests can update Post. We will use default action when no arguments."
                 ]
             ]