EZP-29396: Remove unnecessary test cache decorator (#123)

* Remove unnecessary test cache decorator
* Changed PHPUnit version
* Add PHPUnit polyfill

.travis.yml

@@ -19,9 +19,9 @@ matrix:
         - php: 7.1
           env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="4.10.4" CORES_SETUP="single" SOLR_CORES="collection1"
         - php: 7.0
-          env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.4.2"  CORES_SETUP="dedicated"
+          env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.4.2"  CORES_SETUP="dedicated" COMPOSER_REQUIRE="ezsystems/ezpublish-kernel:~6.7.4@dev"
         - php: 7.1
-          env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.5.1"  CORES_SETUP="shared" COMPOSER_REQUIRE="ezsystems/ezpublish-kernel:~6.7.4@dev"
+          env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.5.1"  CORES_SETUP="shared"
         - php: 5.6
           env: TEST_CONFIG="phpunit-integration-legacy-solr.xml" SOLR_VERSION="6.6.0"  CORES_SETUP="single" SOLR_CORES="collection1"
 

composer.json

@@ -16,8 +16,8 @@
         "netgen/query-translator": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "matthiasnoback/symfony-dependency-injection-test": "~1.0"
+        "phpunit/phpunit": "^5.7||^7.0",
+        "matthiasnoback/symfony-dependency-injection-test": "~1.0||~3.0"
     },
     "autoload": {
         "psr-4": {

tests/bootstrap.php

@@ -23,3 +23,8 @@
 }
 
 $autoload = require_once $file;
+
+// Polyfill for PHPUnit 6.0 and up
+if (!class_exists('PHPUnit_Framework_Constraint', true)) {
+    class_alias('PHPUnit\Framework\Constraint\Constraint', 'PHPUnit_Framework_Constraint');
+}

tests/lib/Resources/config/multicore_dedicated.yml

@@ -11,7 +11,6 @@ parameters:
     languages:
         - eng-US
         - eng-GB
-    ezpublish.cache_pool.spi.cache.decorator.class: eZ\Publish\Core\Persistence\Cache\Tests\Helpers\IntegrationTestCacheServiceDecorator
     ignored_storage_files:
         -
             var/ezdemo_site/storage/images/design/plain-site/172-2-eng-US/eZ-Publish-Demo-Design-without-demo-content1.png
@@ -28,9 +27,6 @@ parameters:
     ezpublish.search.solr.main_translations_endpoint: null
 
 services:
-    ezpublish.cache_pool.spi.cache.decorator:
-        class: "%ezpublish.cache_pool.spi.cache.decorator.class%"
-
     ezpublish.spi.search_engine:
         alias: ezpublish.spi.search.solr
 

tests/lib/Resources/config/multicore_shared.yml

@@ -11,7 +11,6 @@ parameters:
     languages:
         - eng-US
         - eng-GB
-    ezpublish.cache_pool.spi.cache.decorator.class: eZ\Publish\Core\Persistence\Cache\Tests\Helpers\IntegrationTestCacheServiceDecorator
     ignored_storage_files:
         -
             var/ezdemo_site/storage/images/design/plain-site/172-2-eng-US/eZ-Publish-Demo-Design-without-demo-content1.png
@@ -25,9 +24,6 @@ parameters:
     ezpublish.search.solr.main_translations_endpoint: endpoint0
 
 services:
-    ezpublish.cache_pool.spi.cache.decorator:
-        class: "%ezpublish.cache_pool.spi.cache.decorator.class%"
-
     ezpublish.spi.search_engine:
         alias: ezpublish.spi.search.solr
 

tests/lib/Resources/config/single_core.yml

@@ -11,7 +11,6 @@ parameters:
     languages:
         - eng-US
         - eng-GB
-    ezpublish.cache_pool.spi.cache.decorator.class: eZ\Publish\Core\Persistence\Cache\Tests\Helpers\IntegrationTestCacheServiceDecorator
     ignored_storage_files:
         -
             var/ezdemo_site/storage/images/design/plain-site/172-2-eng-US/eZ-Publish-Demo-Design-without-demo-content1.png
@@ -24,9 +23,6 @@ parameters:
     ezpublish.search.solr.main_translations_endpoint: null
 
 services:
-    ezpublish.cache_pool.spi.cache.decorator:
-        class: "%ezpublish.cache_pool.spi.cache.decorator.class%"
-
     ezpublish.spi.search_engine:
         alias: ezpublish.spi.search.solr