Merge branch '6.13' into 7.2

ezpublishlegacy · Jul 12, 2018 · a3d65bf · a3d65bf
2 parents 0e9ef92 + 7e7b66a
commit a3d65bf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/phpunit-integration-legacy-elasticsearch.xml b/phpunit-integration-legacy-elasticsearch.xml
@@ -24,6 +24,8 @@
                @todo: Search service is used all over the place, so we must test
                       all services here.
           -->
+          <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+          <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
           <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
           <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
           <file>eZ/Publish/API/Repository/Tests/LanguageServiceTest.php</file>
@@ -54,8 +56,6 @@
           <file>eZ/Publish/API/Repository/Tests/SearchEngineIndexingTest.php</file>
           <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
           <file>eZ/Publish/API/Repository/Tests/FieldTypeServiceTest.php</file>
-          <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-          <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
     </testsuites>
     <filter>

diff --git a/phpunit-integration-legacy-solr.xml b/phpunit-integration-legacy-solr.xml
@@ -25,6 +25,8 @@
                  @todo: Search service is used all over the place, so we must test
                         all services here.
             -->
+            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
             <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LanguageServiceTest.php</file>
@@ -57,8 +59,6 @@
             <file>eZ/Publish/API/Repository/Tests/SearchEngineIndexingTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/FieldTypeServiceTest.php</file>
-            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
         <testsuite name="eZ\Publish\API\Repository\Tests\Regression">
             <directory>eZ/Publish/API/Repository/Tests/Regression/</directory>

diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml
@@ -17,6 +17,8 @@
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">
+            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
             <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/PermissionServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
@@ -54,8 +56,6 @@
             <file>eZ/Publish/API/Repository/Tests/FieldTypeServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/BookmarkServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/NotificationServiceTest.php</file>
-            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
         <testsuite name="eZ\Publish\API\Repository\Tests\Regression">
             <directory>eZ/Publish/API/Repository/Tests/Regression/</directory>

diff --git a/phpunit-integration-rest-json.xml b/phpunit-integration-rest-json.xml
@@ -16,6 +16,8 @@
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">
+            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
             <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LanguageServiceTest.php</file>
@@ -40,8 +42,6 @@
             <file>eZ/Publish/API/Repository/Tests/URLWildcardServiceAuthorizationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/ObjectStateServiceAuthorizationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
-            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
     </testsuites>
     <filter>

diff --git a/phpunit-integration-rest-xml.xml b/phpunit-integration-rest-xml.xml
@@ -16,6 +16,8 @@
     </php>
     <testsuites>
         <testsuite name="eZ\Publish\API\Repository">
+            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
+            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
             <file>eZ/Publish/API/Repository/Tests/RepositoryTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/SectionServiceTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LanguageServiceTest.php</file>
@@ -40,8 +42,6 @@
             <file>eZ/Publish/API/Repository/Tests/URLWildcardServiceAuthorizationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/ObjectStateServiceAuthorizationTest.php</file>
             <file>eZ/Publish/API/Repository/Tests/LimitationTest.php</file>
-            <directory>eZ/Publish/API/Repository/Tests/Values/User/Limitation</directory>
-            <directory>eZ/Publish/API/Repository/Tests/FieldType/</directory>
         </testsuite>
     </testsuites>
     <filter>