removing isset where ?? is sufficient

uniting blocks that do no longer need to be separated in php7 replacing the last few array() with []
ezpublishlegacy · Jul 9, 2018 · 159a008 · 159a008
1 parent c43445d
commit 159a008
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 57 deletions.
diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -398,35 +398,38 @@ public function generate($type, array $methods = null, $mockClassName = '', $cal
             \sort($type);
         }
 
-        if ($mockClassName === '') {
-            $key = \md5(
-                \is_array($type) ? \implode('_', $type) : $type .
-                \serialize($methods) .
-                \serialize($callOriginalClone) .
-                \serialize($cloneArguments) .
-                \serialize($callOriginalMethods)
+        if ($mockClassName !== '') {
+            return $this->generateMock(
+                $type,
+                $methods,
+                $mockClassName,
+                $callOriginalClone,
+                $callAutoload,
+                $cloneArguments,
+                $callOriginalMethods
             );
-
-            if (isset(self::$cache[$key])) {
-                return self::$cache[$key];
-            }
         }
-
-        $mock = $this->generateMock(
-            $type,
-            $methods,
-            $mockClassName,
-            $callOriginalClone,
-            $callAutoload,
-            $cloneArguments,
-            $callOriginalMethods
+        $key = \md5(
+            \is_array($type) ? \implode('_', $type) : $type .
+            \serialize($methods) .
+            \serialize($callOriginalClone) .
+            \serialize($cloneArguments) .
+            \serialize($callOriginalMethods)
         );
 
-        if (isset($key)) {
-            self::$cache[$key] = $mock;
+        if (!isset(self::$cache[$key])) {
+            self::$cache[$key] = $this->generateMock(
+                $type,
+                $methods,
+                $mockClassName,
+                $callOriginalClone,
+                $callAutoload,
+                $cloneArguments,
+                $callOriginalMethods
+            );
         }
 
-        return $mock;
+        return self::$cache[$key];
     }
 
     /**
@@ -485,13 +488,13 @@ public function generateClassFromWsdl($wsdlFile, $className, array $methods = []
             }
         }
 
-        $optionsBuffer = 'array(';
+        $optionsBuffer = '[';
 
         foreach ($options as $key => $value) {
             $optionsBuffer .= $key . ' => ' . $value;
         }
 
-        $optionsBuffer .= ')';
+        $optionsBuffer .= ']';
 
         $classTemplate = $this->getTemplate('wsdl_class.tpl');
         $namespace     = '';

diff --git a/src/Framework/MockObject/Matcher/ConsecutiveParameters.php b/src/Framework/MockObject/Matcher/ConsecutiveParameters.php
@@ -88,9 +88,7 @@ public function verify(): void
      */
     private function verifyInvocation(BaseInvocation $invocation, $callIndex): void
     {
-        if (isset($this->parameterGroups[$callIndex])) {
-            $parameters = $this->parameterGroups[$callIndex];
-        } else {
+        if (!isset($this->parameterGroups[$callIndex])) {
             // no parameter assertion for this call index
             return;
         }
@@ -101,6 +99,8 @@ private function verifyInvocation(BaseInvocation $invocation, $callIndex): void
             );
         }
 
+        $parameters = $this->parameterGroups[$callIndex];
+
         if (\count($invocation->getParameters()) < \count($parameters)) {
             throw new ExpectationFailedException(
                 \sprintf(

diff --git a/src/Framework/TestCase.php b/src/Framework/TestCase.php
@@ -894,17 +894,13 @@ public function runBare(): void
                 }
             }
         } catch (Throwable $_e) {
-            if (!isset($e)) {
-                $e = $_e;
-            }
+            $e = $e ?? $_e;
         }
 
         try {
             $this->stopOutputBuffering();
         } catch (RiskyTestError $_e) {
-            if (!isset($e)) {
-                $e = $_e;
-            }
+            $e = $e ?? $_e;
         }
 
         if (isset($_e)) {

diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php
@@ -269,22 +269,18 @@ private function assertPhptExpectation(array $sections, string $output): void
         foreach ($assertions as $sectionName => $sectionAssertion) {
             if (isset($sections[$sectionName])) {
                 $sectionContent = \preg_replace('/\r\n/', "\n", \trim($sections[$sectionName]));
-                $assertion      = $sectionAssertion;
                 $expected       = $sectionName === 'EXPECTREGEX' ? "/{$sectionContent}/" : $sectionContent;
 
-                break;
-            }
-        }
-
-        if (!isset($assertion)) {
-            throw new Exception('No PHPT assertion found');
-        }
+                if ($expected === null) {
+                    throw new Exception('No PHPT expectation found');
+                }
+                Assert::$sectionAssertion($expected, $actual);
 
-        if (!isset($expected)) {
-            throw new Exception('No PHPT expectation found');
+                return;
+            }
         }
 
-        Assert::$assertion($expected, $actual);
+        throw new Exception('No PHPT assertion found');
     }
 
     /**

diff --git a/src/Runner/ResultCacheExtension.php b/src/Runner/ResultCacheExtension.php
@@ -96,11 +96,7 @@ private function getTestName(string $test): string
         $matches = [];
 
         if (\preg_match('/^(?:\S+::)?(?<name>\S+)(?:(?<data> with data set (?:#\d+|"[^"]+"))\s\()?/', $test, $matches)) {
-            $test = $matches['name'];
-
-            if (isset($matches['data'])) {
-                $test .= $matches['data'];
-            }
+            $test = $matches['name'] . ($matches['data'] ?? '');
         }
 
         return $test;

diff --git a/src/TextUI/TestRunner.php b/src/TextUI/TestRunner.php
@@ -188,9 +188,7 @@ public function doRun(Test $suite, array $arguments = [], bool $exit = true): Te
         }
 
         if ($arguments['executionOrder'] !== TestSuiteSorter::ORDER_DEFAULT || $arguments['executionOrderDefects'] !== TestSuiteSorter::ORDER_DEFAULT || $arguments['resolveDependencies']) {
-            if (!isset($cache)) {
-                $cache = new NullTestResultCache;
-            }
+            $cache = $cache ?? new NullTestResultCache;
 
             $cache->load();
 

diff --git a/src/Util/PHP/Template/TestCaseClass.tpl.dist b/src/Util/PHP/Template/TestCaseClass.tpl.dist
@@ -69,12 +69,12 @@ function __phpunit_run_isolated_test()
     }
 
     print serialize(
-      array(
+      [
         'testResult'    => $test->getResult(),
         'numAssertions' => $test->getNumAssertions(),
         'result'        => $result,
         'output'        => $output
-      )
+      ]
     );
 }
 

diff --git a/src/Util/PHP/Template/TestCaseMethod.tpl.dist b/src/Util/PHP/Template/TestCaseMethod.tpl.dist
@@ -71,12 +71,12 @@ function __phpunit_run_isolated_test()
     }
 
     print serialize(
-      array(
+      [
         'testResult'    => $test->getResult(),
         'numAssertions' => $test->getNumAssertions(),
         'result'        => $result,
         'output'        => $output
-      )
+      ]
     );
 }