HelperFuncCallToFacadeClassRector, allow with argument (#318)

* HelperFuncCallToFacadeClassRector, allow with argument

* Skip in case of no argument

Author: parth391

Diff for: src/Rector/FuncCall/HelperFuncCallToFacadeClassRector.php

@@ -38,7 +38,7 @@ class SomeClass
 {
     public function run()
     {
-        return \Illuminate\Support\Facades\App::get('translator')->trans('value');
+        return \Illuminate\Support\Facades\App::make('translator')->trans('value');
     }
 }
 CODE_SAMPLE
@@ -59,14 +59,14 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->isName($node->name, 'app')) {
+        if (! $this->isNames($node->name, ['app', 'resolve'])) {
             return null;
         }
 
-        if (count($node->args) !== 1) {
-            return null;
+        if (count($node->args) > 0) {
+            return $this->nodeFactory->createStaticCall('Illuminate\Support\Facades\App', 'make', $node->args);
         }
 
-        return $this->nodeFactory->createStaticCall('Illuminate\Support\Facades\App', 'get', $node->args);
+        return null;
     }
 }

Diff for: tests/Rector/FuncCall/HelperFuncCallToFacadeClassRector/Fixture/fixture.php.inc

@@ -20,7 +20,7 @@ class Fixture
 {
     public function run()
     {
-        return \Illuminate\Support\Facades\App::get('translator')->trans('value');
+        return \Illuminate\Support\Facades\App::make('translator')->trans('value');
     }
 }
 

Diff for: tests/Rector/FuncCall/HelperFuncCallToFacadeClassRector/Fixture/skip_with_args.php.inc renamed to tests/Rector/FuncCall/HelperFuncCallToFacadeClassRector/Fixture/skip_with_no_arg.php.inc

@@ -2,10 +2,10 @@
 
 namespace RectorLaravel\Tests\Rector\FuncCall\HelperFuncCallToFacadeClassRector\Fixture;
 
-class SkipWithArgs
+class SkipWithNoArg
 {
     public function run()
     {
-        return app('translator', 'some');
+        return app()->isProduction();
     }
 }

Diff for: tests/Rector/FuncCall/HelperFuncCallToFacadeClassRector/Fixture/with_args.php.inc

@@ -0,0 +1,31 @@
+<?php
+
+namespace RectorLaravel\Tests\Rector\FuncCall\HelperFuncCallToFacadeClassRector\Fixture;
+
+class WithArgs
+{
+    public function run()
+    {
+        resolve(SomeClass::class, ['argument' => 'value']);
+
+        return app(OtherClass::class, ['argument' => 'value']);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace RectorLaravel\Tests\Rector\FuncCall\HelperFuncCallToFacadeClassRector\Fixture;
+
+class WithArgs
+{
+    public function run()
+    {
+        \Illuminate\Support\Facades\App::make(SomeClass::class, ['argument' => 'value']);
+
+        return \Illuminate\Support\Facades\App::make(OtherClass::class, ['argument' => 'value']);
+    }
+}
+
+?>