Removed all $that variables

symfony · fabpot · Dec 21, 2014 · Dec 3, 2014 · Dec 21, 2014 · 7b33d1a06074bce5c24a758eb53832cc1eb2b9c3
commit 7b33d1a06074bce5c24a758eb53832cc1eb2b9c3
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -63,11 +63,10 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
         $choiceListCache = & $this->choiceListCache;
         $registry = $this->registry;
         $propertyAccessor = $this->propertyAccessor;
-        $type = $this;
 
-        $loader = function (Options $options) use ($type) {
+        $loader = function (Options $options) {
             if (null !== $options['query_builder']) {
-                return $type->getLoader($options['em'], $options['query_builder'], $options['class']);
+                return $this->getLoader($options['em'], $options['query_builder'], $options['class']);
             }
         };
 

diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -71,11 +71,10 @@ public function getProxyFactoryCode(Definition $definition, $id)
 
         return <<<EOF
         if (\$lazyLoad) {
-            \$container = \$this;
 
             $instantiation new $proxyClass(
-                function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) use (\$container) {
-                    \$wrappedInstance = \$container->$methodName(false);
+                function (&\$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface \$proxy) {
+                    \$wrappedInstance = \$this->$methodName(false);
 
                     \$proxy->setProxyInitializer(null);
 

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
@@ -46,11 +46,10 @@ public function __construct()
     public function getFooService($lazyLoad = true)
     {
         if ($lazyLoad) {
-            $container = $this;
 
             return $this->services['foo'] = new stdClass_c1d194250ee2e2b7d2eab8b8212368a8(
-                function (& $wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
-                    $wrappedInstance = $container->getFooService(false);
+                function (& $wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) {
+                    $wrappedInstance = $this->getFooService(false);
 
                     $proxy->setProxyInitializer(null);
 

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service_structure.txt
@@ -6,11 +6,10 @@ class ProjectServiceContainer extends Container
     public function getFooService($lazyLoad = true)
     {
         if ($lazyLoad) {
-            $container = $this;
 
             return $this->services['foo'] = new stdClass_%s(
-                function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {
-                    $wrappedInstance = $container->getFooService(false);
+                function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) {
+                    $wrappedInstance = $this->getFooService(false);
 
                     $proxy->setProxyInitializer(null);
 
@@ -24,4 +23,4 @@ class ProjectServiceContainer extends Container
 }
 
 class stdClass_%s extends \stdClass implements \ProxyManager\Proxy\VirtualProxyInterface
-{%a}%A
+{%a}%A
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -71,10 +71,10 @@ public function testGetProxyFactoryCode()
         $code = $this->dumper->getProxyFactoryCode($definition, 'foo');
 
         $this->assertStringMatchesFormat(
-            '%wif ($lazyLoad) {%w$container = $this;%wreturn $this->services[\'foo\'] = new '
+            '%wif ($lazyLoad) {%wreturn $this->services[\'foo\'] = new '
             .'SymfonyBridgeProxyManagerTestsLazyProxyPhpDumperProxyDumperTest_%s(%wfunction '
-            .'(&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($container) {'
-            .'%w$wrappedInstance = $container->getFooService(false);%w$proxy->setProxyInitializer(null);'
+            .'(&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) {'
+            .'%w$wrappedInstance = $this->getFooService(false);%w$proxy->setProxyInitializer(null);'
             .'%wreturn true;%w}%w);%w}%w',
             $code
         );

diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -205,10 +205,8 @@ public function getFileLink($file, $line)
 
     public function formatFileFromText($text)
     {
-        $that = $this;
-
-        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) use ($that) {
-            return 'in '.$that->formatFile($match[2], $match[3]);
+        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) {
+            return 'in '.$this->formatFile($match[2], $match[3]);
         }, $text);
     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -197,10 +197,8 @@ public function getFileLink($file, $line)
 
     public function formatFileFromText($text)
     {
-        $that = $this;
-
-        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) use ($that) {
-            return 'in '.$that->formatFile($match[2], $match[3]);
+        return preg_replace_callback('/in ("|&quot;)?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) {
+            return 'in '.$this->formatFile($match[2], $match[3]);
         }, $text);
     }
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/PhpStringTokenParser.php b/src/Symfony/Bundle/FrameworkBundle/Translation/PhpStringTokenParser.php
@@ -106,7 +106,7 @@ public static function parseEscapeSequences($str, $quote)
         );
     }
 
-    public static function parseCallback($matches)
+    private static function parseCallback($matches)
     {
         $str = $matches[1];
 

diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/PreviewErrorControllerTest.php
@@ -21,8 +21,6 @@ class PreviewErrorControllerTest extends TestCase
 {
     public function testForwardRequestToConfiguredController()
     {
-        $self = $this;
-
         $request = Request::create('whatever');
         $response = new Response("");
         $code = 123;
@@ -33,15 +31,14 @@ public function testForwardRequestToConfiguredController()
             ->expects($this->once())
             ->method('handle')
             ->with(
-                $this->callback(function (Request $request) use ($self, $logicalControllerName, $code) {
+                $this->callback(function (Request $request) use ($logicalControllerName, $code) {
 
-                    $self->assertEquals($logicalControllerName, $request->attributes->get('_controller'));
+                    $this->assertEquals($logicalControllerName, $request->attributes->get('_controller'));
 
                     $exception = $request->attributes->get('exception');
-                    $self->assertInstanceOf('Symfony\Component\Debug\Exception\FlattenException', $exception);
-                    $self->assertEquals($code, $exception->getStatusCode());
-
-                    $self->assertFalse($request->attributes->get('showException'));
+                    $this->assertInstanceOf('Symfony\Component\HttpKernel\Exception\FlattenException', $exception);
+                    $this->assertEquals($code, $exception->getStatusCode());
+                    $this->assertFalse($request->attributes->get('showException'));
 
                     return true;
                 }),

diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php
@@ -346,10 +346,8 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback
      */
     public function askAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $default = null, array $autocomplete = null)
     {
-        $that = $this;
-
-        $interviewer = function () use ($output, $question, $default, $autocomplete, $that) {
-            return $that->ask($output, $question, $default, $autocomplete);
+        $interviewer = function () use ($output, $question, $default, $autocomplete) {
+            return $this->ask($output, $question, $default, $autocomplete);
         };
 
         return $this->validateAttempts($interviewer, $output, $validator, $attempts);
@@ -376,10 +374,8 @@ public function askAndValidate(OutputInterface $output, $question, $validator, $
      */
     public function askHiddenResponseAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $fallback = true)
     {
-        $that = $this;
-
-        $interviewer = function () use ($output, $question, $fallback, $that) {
-            return $that->askHiddenResponse($output, $question, $fallback);
+        $interviewer = function () use ($output, $question, $fallback) {
+            return $this->askHiddenResponse($output, $question, $fallback);
         };
 
         return $this->validateAttempts($interviewer, $output, $validator, $attempts);

diff --git a/src/Symfony/Component/Console/Helper/ProcessHelper.php b/src/Symfony/Component/Console/Helper/ProcessHelper.php
@@ -111,23 +111,16 @@ public function wrapCallback(OutputInterface $output, Process $process, $callbac
     {
         $formatter = $this->getHelperSet()->get('debug_formatter');
 
-        $that = $this;
-
-        return function ($type, $buffer) use ($output, $process, $callback, $formatter, $that) {
-            $output->write($formatter->progress(spl_object_hash($process), $that->escapeString($buffer), Process::ERR === $type));
+        return function ($type, $buffer) use ($output, $process, $callback, $formatter) {
+            $output->write($formatter->progress(spl_object_hash($process), $this->escapeString($buffer), Process::ERR === $type));
 
             if (null !== $callback) {
                 call_user_func($callback, $type, $buffer);
             }
         };
     }
 
-    /**
-     * This method is public for PHP 5.3 compatibility, it should be private.
-     *
-     * @internal
-     */
-    public function escapeString($str)
+    private function escapeString($str)
     {
         return str_replace('<', '\\<', $str);
     }

diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php
@@ -193,11 +193,9 @@ public function getProgress()
     /**
      * Gets the progress bar step width.
      *
-     * @internal This method is public for PHP 5.3 compatibility, it should not be used.
-     *
-     * @return int The progress bar step width
+     * @return int     The progress bar step width
      */
-    public function getStepWidth()
+    private function getStepWidth()
     {
         return $this->stepWidth;
     }
@@ -432,15 +430,11 @@ public function display()
             return;
         }
 
-        // these 3 variables can be removed in favor of using $this in the closure when support for PHP 5.3 will be dropped.
-        $self = $this;
-        $output = $this->output;
-        $messages = $this->messages;
-        $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self, $output, $messages) {
-            if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) {
-                $text = call_user_func($formatter, $self, $output);
-            } elseif (isset($messages[$matches[1]])) {
-                $text = $messages[$matches[1]];
+        $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) {
+            if ($formatter = $this::getPlaceholderFormatterDefinition($matches[1])) {
+                $text = call_user_func($formatter, $this, $this->output);
+            } elseif (isset($this->messages[$matches[1]])) {
+                $text = $this->messages[$matches[1]];
             } else {
                 return $matches[0];
             }

diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -49,10 +49,8 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu
             return $this->doAsk($output, $question);
         }
 
-        $that = $this;
-
-        $interviewer = function () use ($output, $question, $that) {
-            return $that->doAsk($output, $question);
+        $interviewer = function () use ($output, $question) {
+            return $this->doAsk($output, $question);
         };
 
         return $this->validateAttempts($interviewer, $output, $question);

diff --git a/src/Symfony/Component/Console/Input/ArgvInput.php b/src/Symfony/Component/Console/Input/ArgvInput.php
@@ -333,14 +333,13 @@ public function getParameterOption($values, $default = false)
      */
     public function __toString()
     {
-        $self = $this;
-        $tokens = array_map(function ($token) use ($self) {
+        $tokens = array_map(function ($token) {
             if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1].$self->escapeToken($match[2]);
+                return $match[1].$this->escapeToken($match[2]);
             }
 
             if ($token && $token[0] !== '-') {
-                return $self->escapeToken($token);
+                return $this->escapeToken($token);
             }
 
             return $token;

diff --git a/src/Symfony/Component/Debug/ExceptionHandler.php b/src/Symfony/Component/Debug/ExceptionHandler.php
@@ -112,13 +112,30 @@ public function handle(\Exception $exception)
 
         $caughtLength = $this->caughtLength = 0;
 
-        ob_start(array($this, 'catchOutput'));
+        ob_start(function($buffer) {
+            $this->caughtBuffer = $buffer;
+
+            return '';
+        });
+
+
         $this->failSafeHandle($exception);
         while (null === $this->caughtBuffer && ob_end_flush()) {
             // Empty loop, everything is in the condition
         }
         if (isset($this->caughtBuffer[0])) {
-            ob_start(array($this, 'cleanOutput'));
+            ob_start(function($buffer) {
+                if ($this->caughtLength) {
+                    // use substr_replace() instead of substr() for mbstring overloading resistance
+                    $cleanBuffer = substr_replace($buffer, '', 0, $this->caughtLength);
+                    if (isset($cleanBuffer[0])) {
+                        $buffer = $cleanBuffer;
+                    }
+                }
+
+                return $buffer;
+            });
+
             echo $this->caughtBuffer;
             $caughtLength = ob_get_length();
         }
@@ -426,30 +443,4 @@ protected static function utf8Htmlize($str)
 
         return htmlspecialchars($str, ENT_QUOTES | (PHP_VERSION_ID >= 50400 ? ENT_SUBSTITUTE : 0), 'UTF-8');
     }
-
-    /**
-     * @internal
-     */
-    public function catchOutput($buffer)
-    {
-        $this->caughtBuffer = $buffer;
-
-        return '';
-    }
-
-    /**
-     * @internal
-     */
-    public function cleanOutput($buffer)
-    {
-        if ($this->caughtLength) {
-            // use substr_replace() instead of substr() for mbstring overloading resistance
-            $cleanBuffer = substr_replace($buffer, '', 0, $this->caughtLength);
-            if (isset($cleanBuffer[0])) {
-                $buffer = $cleanBuffer;
-            }
-        }
-
-        return $buffer;
-    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,7 @@ public static function parseEscapeSequences($str, $quote) @@
             );
         }
-        public static function parseCallback($matches)
+        private static function parseCallback($matches)
         {
             $str = $matches[1];
@@ Expand Down @@