Merge pull request #4560 from samsonasik/apply-rector-change-array-pu…

…sh-to-array-assign [Rector] Apply Rector: ChangeArrayPushToArrayAssignRector
codeigniter4 · Apr 12, 2021 · dd19b1e · dd19b1e
2 parents 38e59e0 + 1bf2188
commit dd19b1e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/rector.php b/rector.php
@@ -3,6 +3,7 @@
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\For_\ForToForeachRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
+use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
@@ -74,4 +75,5 @@
 	$services->set(UnusedForeachValueToArrayKeysRector::class);
 	$services->set(RemoveConcatAutocastRector::class);
 	$services->set(RemoveDefaultArgumentValueRector::class);
+	$services->set(ChangeArrayPushToArrayAssignRector::class);
 };
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
@@ -286,9 +286,12 @@ protected function parseTemplate(string $class, array $search = [], array $repla
 	{
 		// Retrieves the namespace part from the fully qualified class name.
 		$namespace = trim(implode('\\', array_slice(explode('\\', $class), 0, -1)), '\\');
-
-		array_push($search, '<@php', '{namespace}', '{class}');
-		array_push($replace, '<?php', $namespace, str_replace($namespace . '\\', '', $class));
+		$search[]  = '<@php';
+		$search[]  = '{namespace}';
+		$search[]  = '{class}';
+		$replace[] = '<?php';
+		$replace[] = $namespace;
+		$replace[] = str_replace($namespace . '\\', '', $class);
 
 		return str_replace($search, $replace, $this->renderTemplate($data));
 	}

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
@@ -183,7 +183,7 @@ protected static function getSharedInstance(string $key, ...$params)
 		if (! isset(static::$instances[$key]))
 		{
 			// Make sure $getShared is false
-			array_push($params, false);
+			$params[] = false;
 
 			static::$instances[$key] = static::$key(...$params);
 		}

diff --git a/system/Files/File.php b/system/Files/File.php
@@ -200,7 +200,7 @@ public function getDestination(string $destination, string $delimiter = '_', int
 				{
 					$i = end($parts);
 					array_pop($parts);
-					array_push($parts, ++ $i);
+					$parts[]     = ++ $i;
 					$destination = $info['dirname'] . '/' . implode($delimiter, $parts) . $extension;
 				}
 				else

diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
@@ -125,7 +125,7 @@ public function charset(array $supported): string
 	 */
 	public function encoding(array $supported = []): string
 	{
-		array_push($supported, 'identity');
+		$supported[] = 'identity';
 
 		return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-encoding'));
 	}

diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
@@ -1133,7 +1133,7 @@ protected function mergePaths(URI $base, URI $reference): string
 		}
 
 		array_pop($path);
-		array_push($path, $reference->getPath());
+		$path[] = $reference->getPath();
 
 		return implode('/', $path);
 	}
@@ -1181,7 +1181,7 @@ public function removeDotSegments(string $path): string
 			}
 			elseif ($segment !== '.' && $segment !== '')
 			{
-				array_push($output, $segment);
+				$output[] = $segment;
 			}
 		}