SCA with Php Inspections (EA Extended) (#2119)

* SCA with Php Inspections (EA Extended) * SCA with Php Inspections (EA Extended)
ezecosystem · Oct 31, 2017 · bf05e80 · bf05e80
1 parent 34840d6
commit bf05e80
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/Repository/Tests/ContentServiceAuthorizationTest.php b/Repository/Tests/ContentServiceAuthorizationTest.php
@@ -928,7 +928,6 @@ public function testUpdateContentThrowsUnauthorizedException()
         $repository = $this->getRepository();
         $contentService = $repository->getContentService();
 
-        $anonymousUserId = $this->generateId('user', 10);
         $anonymousUserId = $this->generateId('user', 10);
         /* BEGIN: Use Case */
         // $anonymousUserId is the ID of the "Anonymous User" in an eZ Publish

diff --git a/Repository/Tests/ContentServiceTest.php b/Repository/Tests/ContentServiceTest.php
@@ -5074,8 +5074,6 @@ public function testUpdatingDraftDoesNotUpdateOldVersions()
 
         $contentService = $repository->getContentService();
 
-        $contentService = $repository->getContentService();
-
         $contentVersion2 = $this->createContentVersion2();
 
         $loadedContent1 = $contentService->loadContent($contentVersion2->id, null, 1);

diff --git a/Repository/Tests/FieldType/SearchBaseIntegrationTest.php b/Repository/Tests/FieldType/SearchBaseIntegrationTest.php
@@ -346,7 +346,7 @@ public function findProvider()
 
         foreach ($additionalFields as $additionalField) {
             foreach ($templates as $template) {
-                array_push($template, $additionalField[0]);
+                $template[] = $additionalField[0];
                 array_unshift($template, $additionalField[2]);
                 array_unshift($template, $additionalField[1]);
 
@@ -1152,7 +1152,7 @@ public function sortProvider()
 
         foreach ($additionalFields as $additionalField) {
             foreach ($templates as $template) {
-                array_push($template, $additionalField[0]);
+                $template[] = $additionalField[0];
                 $fixture[] = $template;
             }
         }

diff --git a/Repository/Tests/FieldType/SearchMultivaluedBaseIntegrationTest.php b/Repository/Tests/FieldType/SearchMultivaluedBaseIntegrationTest.php
@@ -197,7 +197,7 @@ public function findMultivaluedProvider()
 
         foreach ($additionalFields as $additionalField) {
             foreach ($templates as $template) {
-                array_push($template, $additionalField[0]);
+                $template[] = $additionalField[0];
                 array_unshift($template, $additionalField[2]);
                 array_unshift($template, $additionalField[1]);
 

diff --git a/Repository/Tests/SearchServiceTest.php b/Repository/Tests/SearchServiceTest.php
@@ -2095,7 +2095,7 @@ protected function assertMultilingualFieldSort(
         // field does not affect sort
         $dummySortClause = new SortClause\Field('article', 'title', Query::SORT_ASC);
         array_unshift($sortClauses, $dummySortClause);
-        array_push($sortClauses, $dummySortClause);
+        $sortClauses[] = $dummySortClause;
 
         $searchService = $repository->getSearchService();
         if ($contentSearch) {

diff --git a/Repository/Tests/TrashServiceTest.php b/Repository/Tests/TrashServiceTest.php
@@ -732,7 +732,7 @@ function ($trashItem) {
 
         $this->assertEquals(4, $searchResult->count);
         $this->assertTrue(
-            array_search($demoDesignLocationId, $foundIds) !== false
+            in_array($demoDesignLocationId, $foundIds)
         );
     }
 

diff --git a/Repository/Tests/_fixtures/generate-fixtures.php b/Repository/Tests/_fixtures/generate-fixtures.php
@@ -817,7 +817,7 @@ function generateReturnArray()
 {
     return '<?php' . PHP_EOL .
         'return array(' . PHP_EOL .
-        join(',' . PHP_EOL . '    ', func_get_args()) . PHP_EOL .
+        implode(',' . PHP_EOL . '    ', func_get_args()) . PHP_EOL .
         ');' . PHP_EOL;
 }
 
@@ -870,7 +870,7 @@ function valueToString($value, $indent = 4)
         $value = $value;
     } elseif (is_bool($value)) {
         $value = $value ? 'true' : 'false';
-    } elseif (is_null($value)) {
+    } elseif (null === $value) {
         $value = 'null';
     } elseif (is_string($value) && 0 !== strpos($value, 'new \\') && 0 !== strpos($value, '$scopeValues[') && 0 !== strpos($value, 'array(') && 0 !== strpos($value, '$this')) {
         $value = '"' . str_replace('"', '\"', $value) . '"';