From 6c8b2062ab9699e3ae2ff619b1d5364ef22f0d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josip=20Crnkovi=C4=87?= <jcrnkovic95@gmail.com>
Date: Tue, 23 Feb 2021 10:27:11 +0100
Subject: [PATCH] wip

---
 .../Compilers/Concerns/CompilesInjections.php |  6 ++--
 tests/View/Blade/BladeInjectTest.php          | 34 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 tests/View/Blade/BladeInjectTest.php

diff --git a/src/Illuminate/View/Compilers/Concerns/CompilesInjections.php b/src/Illuminate/View/Compilers/Concerns/CompilesInjections.php
index c295bcd448c5..a0d1ccf5ea31 100644
--- a/src/Illuminate/View/Compilers/Concerns/CompilesInjections.php
+++ b/src/Illuminate/View/Compilers/Concerns/CompilesInjections.php
@@ -12,12 +12,12 @@ trait CompilesInjections
      */
     protected function compileInject($expression)
     {
-        $segments = explode(',', preg_replace("/[\(\)\\\"\']/", '', $expression));
+        $segments = explode(',', preg_replace("/[\(\)]/", '', $expression));
 
-        $variable = trim($segments[0]);
+        $variable = trim($segments[0], " '\"");
 
         $service = trim($segments[1]);
 
-        return "<?php \${$variable} = app('{$service}'); ?>";
+        return "<?php \${$variable} = app({$service}); ?>";
     }
 }
diff --git a/tests/View/Blade/BladeInjectTest.php b/tests/View/Blade/BladeInjectTest.php
new file mode 100644
index 000000000000..07ffd19f0e3f
--- /dev/null
+++ b/tests/View/Blade/BladeInjectTest.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Illuminate\Tests\View\Blade;
+
+class BladeInjectTest extends AbstractBladeTestCase
+{
+    public function testDependenciesInjectedAsStringsAreCompiled()
+    {
+        $string = "Foo @inject('baz', 'SomeNamespace\SomeClass') bar";
+        $expected = "Foo <?php \$baz = app('SomeNamespace\SomeClass'); ?> bar";
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testDependenciesInjectedAsStringsAreCompiledWhenInjectedWithDoubleQuotes()
+    {
+        $string = 'Foo @inject("baz", "SomeNamespace\SomeClass") bar';
+        $expected = 'Foo <?php $baz = app("SomeNamespace\SomeClass"); ?> bar';
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testDependenciesAreCompiled()
+    {
+        $string = "Foo @inject('baz', SomeNamespace\SomeClass::class) bar";
+        $expected = "Foo <?php \$baz = app(SomeNamespace\SomeClass::class); ?> bar";
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testDependenciesAreCompiledWithDoubleQuotes()
+    {
+        $string = 'Foo @inject("baz", SomeNamespace\SomeClass::class) bar';
+        $expected = "Foo <?php \$baz = app(SomeNamespace\SomeClass::class); ?> bar";
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+}