minor #13862 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup (kalessil)

This PR was squashed before being merged into the 2.3 branch (closes #13862).

Discussion
----------

[2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Split <a href="https://github.com/symfony/symfony/pull/13813">PR 13813</a>: part 1 - targeting v2.3

Following is included (no functional changes, found with <a href="https://plugins.jetbrains.com/plugin/7622?pr=phpStorm">Php Inspections (EA Extended)</a>):
- Fixed couple of concatenation as array index warnings
- Unset calls can be merged inspection fixes
- array_search in in_array context inspection fixes
- Is null usage inspection fixes
- Prefixed increment/decrement inspection fixes
- Elvis operator can be used inspection fixes
- Alias functions usage inspection fixes
- Ternary operator simplification inspection fixes
- _ _ DIR _ _ equivalent inspection fixes

Commits
-------

f13b5f7 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup

Author: fabpot

Acl/Dbal/AclProvider.php

@@ -173,7 +173,8 @@ public function findAcls(array $oids, array $sids = array())
             }
 
             // Is it time to load the current batch?
-            if ((self::MAX_BATCH_SIZE === count($currentBatch) || ($i + 1) === $c) && count($currentBatch) > 0) {
+            $currentBatchesCount = count($currentBatch);
+            if ($currentBatchesCount > 0 && (self::MAX_BATCH_SIZE === $currentBatchesCount || ($i + 1) === $c)) {
                 try {
                     $loadedBatch = $this->lookupObjectIdentities($currentBatch, $sids, $oidLookup);
                 } catch (AclNotFoundException $aclNotFoundexception) {
@@ -557,10 +558,11 @@ private function hydrateObjectIdentities(Statement $stmt, array $oidLookup, arra
                 // attach ACL to the result set; even though we do not enforce that every
                 // object identity has only one instance, we must make sure to maintain
                 // referential equality with the oids passed to findAcls()
-                if (!isset($oidCache[$objectIdentifier.$classType])) {
-                    $oidCache[$objectIdentifier.$classType] = $acl->getObjectIdentity();
+                $oidCacheKey = $objectIdentifier.$classType;
+                if (!isset($oidCache[$oidCacheKey])) {
+                    $oidCache[$oidCacheKey] = $acl->getObjectIdentity();
                 }
-                $result->attach($oidCache[$objectIdentifier.$classType], $acl);
+                $result->attach($oidCache[$oidCacheKey], $acl);
             // so, this hasn't been hydrated yet
             } else {
                 // create object identity if we haven't done so yet
@@ -668,7 +670,7 @@ private function hydrateObjectIdentities(Statement $stmt, array $oidLookup, arra
             // let's see if we have already hydrated this
             if (isset($acls[$parentId])) {
                 $aclParentAclProperty->setValue($acl, $acls[$parentId]);
-                $processed += 1;
+                ++$processed;
 
                 continue;
             }

Tests/Acl/Dbal/AclProviderBenchmarkTest.php

@@ -122,7 +122,7 @@ protected function chooseClassId()
 
         if ($id === 1000 || ($id < 1500 && rand(0, 1))) {
             $this->insertClassStmt->execute(array($id, $this->getRandomString(rand(20, 100), 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\_')));
-            $id += 1;
+            ++$id;
 
             return $id-1;
         } else {
@@ -148,7 +148,7 @@ protected function generateAcl($classId, $parentId, $ancestors)
         }
 
         $this->generateAces($classId, $id);
-        $id += 1;
+        ++$id;
 
         return $id-1;
     }
@@ -163,7 +163,7 @@ protected function chooseSid()
                 $this->getRandomString(rand(5, 30)),
                 rand(0, 1),
             ));
-            $id += 1;
+            ++$id;
 
             return $id-1;
         } else {
@@ -215,7 +215,7 @@ protected function generateAces($classId, $objectId)
                 rand(0, 1),
             ));
 
-            $id += 1;
+            ++$id;
         }
     }
 

Tests/Core/Util/SecureRandomTest.php

@@ -41,7 +41,7 @@ public function testPoker($secureRandom)
 
         for ($j = 1; $j <= 5000; $j++) {
             $k = 4 * $j - 1;
-            $c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]] += 1;
+            ++$c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]];
         }
 
         $f = 0;
@@ -73,14 +73,14 @@ public function testRun($secureRandom)
                 $run = 6;
             }
 
-            $runs[$run] += 1;
+            ++$runs[$run];
         };
 
         $currentRun = 0;
         $lastBit = null;
         for ($i = 0; $i < 20000; $i++) {
             if ($lastBit === $b[$i]) {
-                $currentRun += 1;
+                ++$currentRun;
             } else {
                 if ($currentRun > 0) {
                     $addRun($currentRun);
@@ -115,7 +115,7 @@ public function testLongRun($secureRandom)
         $lastBit = null;
         for ($i = 0; $i < 20000; $i++) {
             if ($lastBit === $b[$i]) {
-                $currentRun += 1;
+                ++$currentRun;
             } else {
                 if ($currentRun > $longestRun) {
                     $longestRun = $currentRun;

Tests/Http/Firewall/ExceptionListenerTest.php

@@ -177,9 +177,9 @@ private function createEvent(\Exception $exception, $kernel = null)
     private function createExceptionListener(SecurityContextInterface $context = null, AuthenticationTrustResolverInterface $trustResolver = null, HttpUtils $httpUtils = null, AuthenticationEntryPointInterface $authenticationEntryPoint = null, $errorPage = null, AccessDeniedHandlerInterface $accessDeniedHandler = null)
     {
         return new ExceptionListener(
-            $context ? $context : $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'),
-            $trustResolver ? $trustResolver : $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface'),
-            $httpUtils ? $httpUtils : $this->getMock('Symfony\Component\Security\Http\HttpUtils'),
+            $context ?: $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'),
+            $trustResolver ?: $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolverInterface'),
+            $httpUtils ?: $this->getMock('Symfony\Component\Security\Http\HttpUtils'),
             'key',
             $authenticationEntryPoint,
             $errorPage,