Merge pull request #163 from e1himself/fix/php-7.2-deprecation-warnings

j0k3r · web-flow · commit 448e48604796 · 2017-07-31T11:46:39.000+02:00
Fix/php 7.2 deprecation warnings
diff --git a/lib/cache/sfMemcacheCache.class.php b/lib/cache/sfMemcacheCache.class.php
@@ -223,9 +223,12 @@ public function removePattern($pattern)
   public function getMany($keys)
   {
     $values = array();
-    foreach ($this->memcache->get(array_map(create_function('$k', 'return "'.$this->getOption('prefix').'".$k;'), $keys)) as $key => $value)
+    $prefix = $this->getOption('prefix');
+    $prefixed_keys = array_map(function($k) use ($prefix) { return $prefix . $k; }, $keys);
+
+    foreach ($this->memcache->get($prefixed_keys) as $key => $value)
     {
-      $values[str_replace($this->getOption('prefix'), '', $key)] = $value;
+      $values[str_replace($prefix, '', $key)] = $value;
     }
 
     return $values;
diff --git a/lib/command/sfCommandApplication.class.php b/lib/command/sfCommandApplication.class.php
@@ -605,7 +605,12 @@ protected function fixCgi()
     }
 
     // close the streams on script termination
-    register_shutdown_function(create_function('', 'fclose(STDIN); fclose(STDOUT); fclose(STDERR); return true;'));
+    register_shutdown_function(function() {
+        fclose(STDIN);
+        fclose(STDOUT);
+        fclose(STDERR);
+        return true;
+    });
   }
 
   /**
diff --git a/lib/config/sfConfigHandler.class.php b/lib/config/sfConfigHandler.class.php
@@ -77,7 +77,7 @@ static public function replaceConstants($value)
   {
     if (is_array($value))
     {
-      array_walk_recursive($value, create_function('&$value', '$value = sfToolkit::replaceConstants($value);'));
+      array_walk_recursive($value, function(& $value) { $value = sfToolkit::replaceConstants($value); });
     }
     else
     {
@@ -98,7 +98,7 @@ static public function replacePath($path)
   {
     if (is_array($path))
     {
-      array_walk_recursive($path, create_function('&$path', '$path = sfConfigHandler::replacePath($path);'));
+      array_walk_recursive($path, function(&$path) { $path = sfConfigHandler::replacePath($path); });
     }
     else
     {
diff --git a/lib/helper/TextHelper.php b/lib/helper/TextHelper.php
@@ -278,33 +278,26 @@ function _auto_link_urls($text, $href_options = array(), $truncate = false, $tru
 {
   $href_options = _tag_options($href_options);
 
-  $callback_function = '
-    if (preg_match("/<a\s/i", $matches[1]))
-    {
-      return $matches[0];
-    }
-    ';
+  $callback_function = function($matches) use ($href_options, $truncate, $truncate_len, $pad) {
+      if (preg_match("/<a\s/i", $matches[1]))
+      {
+          return $matches[0];
+      }
 
-  if ($truncate)
-  {
-    $callback_function .= '
-      else if (strlen($matches[2].$matches[3]) > '.$truncate_len.')
+      $text = $matches[2] . $matches[3];
+      $href = ($matches[2] == "www." ? "http://www." : $matches[2]) . $matches[3];
+
+      if ($truncate && strlen($text) > $truncate_len)
       {
-        return $matches[1].\'<a href="\'.($matches[2] == "www." ? "http://www." : $matches[2]).$matches[3].\'"'.$href_options.'>\'.substr($matches[2].$matches[3], 0, '.$truncate_len.').\''.$pad.'</a>\'.$matches[4];
+          $text = substr($text, 0, $truncate_len).$pad;
       }
-      ';
-  }
 
-  $callback_function .= '
-    else
-    {
-      return $matches[1].\'<a href="\'.($matches[2] == "www." ? "http://www." : $matches[2]).$matches[3].\'"'.$href_options.'>\'.$matches[2].$matches[3].\'</a>\'.$matches[4];
-    }
-    ';
+      return sprintf('%s<a href="%s"%s>%s</a>%s', $matches[1], $href, $href_options, $text, $matches[4]);
+  };
 
   return preg_replace_callback(
     SF_AUTO_LINK_RE,
-    create_function('$matches', $callback_function),
+    $callback_function,
     $text
     );
 }
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
@@ -76,7 +76,7 @@ protected function execute($arguments = array(), $options = array())
       {
         if (!$options['no-confirmation'] && !$this->askConfirmation(array_merge(
           array('The following '.$modelName.' files will be deleted:', ''),
-          array_map(create_function('$v', 'return \' - \'.sfDebug::shortenFilePath($v);'), $files),
+          array_map(function($v) { return ' - '.sfDebug::shortenFilePath($v); }, $files),
           array('', 'Continue? (y/N)')
         ), 'QUESTION_LARGE', false))
         {
@@ -100,10 +100,10 @@ protected function execute($arguments = array(), $options = array())
 
   /**
    * Converts an array of values to a regular expression pattern fragment.
-   * 
+   *
    * @param array  $values    An array of values for the pattern
    * @param string $delimiter The regular expression delimiter
-   * 
+   *
    * @return string A regular expression fragment
    */
   protected function valuesToRegex($values, $delimiter = '/')
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
@@ -73,7 +73,7 @@ protected function execute($arguments = array(), $options = array())
       &&
       !$this->askConfirmation(array_merge(
         array(sprintf('This command will remove all data in the following "%s" connection(s):', $environment), ''),
-        array_map(create_function('$v', 'return \' - \'.$v;'), array_keys($databases)),
+        array_map(function($v) { return ' - '.$v; }, array_keys($databases)),
         array('', 'Are you sure you want to proceed? (y/N)')
       ), 'QUESTION_LARGE', false)
     )
diff --git a/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php b/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
@@ -137,7 +137,7 @@ protected function execute($arguments = array(), $options = array())
       {
         $this->logBlock(array_merge(
           array('The following errors occurred:', ''),
-          array_map(create_function('$e', 'return \' - \'.$e->getMessage();'), $migration->getErrors())
+          array_map(function($e) { return ' - '.$e->getMessage(); }, $migration->getErrors())
         ), 'ERROR_LARGE');
       }
 
diff --git a/lib/routing/sfRoute.class.php b/lib/routing/sfRoute.class.php
@@ -696,7 +696,7 @@ protected function initializeOptions()
       'extra_parameters_as_query_string' => true,
     ), $this->getDefaultOptions(), $this->options);
 
-    $preg_quote_hash = create_function('$a', 'return preg_quote($a, \'#\');');
+    $preg_quote_hash = function($a) { return preg_quote($a, '#'); };
 
     // compute some regexes
     $this->options['variable_prefix_regex'] = '(?:'.implode('|', array_map($preg_quote_hash, $this->options['variable_prefixes'])).')';
@@ -706,7 +706,7 @@ protected function initializeOptions()
       $this->options['segment_separators_regex'] = '(?:'.implode('|', array_map($preg_quote_hash, $this->options['segment_separators'])).')';
 
       // as of PHP 5.3.0, preg_quote automatically quotes dashes "-" (see http://bugs.php.net/bug.php?id=47229)
-      $preg_quote_hash_53 = create_function('$a', 'return str_replace(\'-\', \'\-\', preg_quote($a, \'#\'));');
+      $preg_quote_hash_53 = function($a) { return str_replace('-', '\-', preg_quote($a, '#')); };
       $this->options['variable_content_regex'] = '[^'.implode('',
           array_map(version_compare(PHP_VERSION, '5.3.0RC4', '>=') ? $preg_quote_hash : $preg_quote_hash_53, $this->options['segment_separators'])
         ).']+';
diff --git a/lib/task/project/sfProjectPermissionsTask.class.php b/lib/task/project/sfProjectPermissionsTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -72,18 +72,18 @@ protected function execute($arguments = array(), $options = array())
     {
       $this->logBlock(array_merge(
         array('Permissions on the following file(s) could not be fixed:', ''),
-        array_map(create_function('$f', 'return \' - \'.sfDebug::shortenFilePath($f);'), $this->failed)
+        array_map(function($f) { return ' - '.sfDebug::shortenFilePath($f); }, $this->failed)
       ), 'ERROR_LARGE');
     }
   }
 
   /**
    * Chmod and capture any failures.
-   * 
+   *
    * @param string  $file
    * @param integer $mode
    * @param integer $umask
-   * 
+   *
    * @see sfFilesystem
    */
   protected function chmod($file, $mode, $umask = 0000)
@@ -109,7 +109,7 @@ protected function chmod($file, $mode, $umask = 0000)
 
   /**
    * Captures those chmod commands that fail.
-   * 
+   *
    * @see http://www.php.net/set_error_handler
    */
   public function handleError($no, $string, $file, $line, $context)
diff --git a/lib/util/sfBrowserBase.class.php b/lib/util/sfBrowserBase.class.php
@@ -927,7 +927,7 @@ protected function parseArgumentAsArray($name, $value, &$vars)
     if (false !== $pos = strpos($name, '['))
     {
       $var = &$vars;
-      $tmps = array_filter(preg_split('/(\[ | \[\] | \])/x', $name), create_function('$s', 'return $s !== "";'));
+      $tmps = array_filter(preg_split('/(\[ | \[\] | \])/x', $name), function($s) { return $s !== ''; });
       foreach ($tmps as $tmp)
       {
         $var = &$var[$tmp];
diff --git a/lib/validator/sfValidatorErrorSchema.class.php b/lib/validator/sfValidatorErrorSchema.class.php
@@ -283,8 +283,8 @@ public function offsetUnset($offset)
   protected function updateCode()
   {
     $this->code = implode(' ', array_merge(
-      array_map(create_function('$e', 'return $e->getCode();'), $this->globalErrors),
-      array_map(create_function('$n,$e', 'return $n.\' [\'.$e->getCode().\']\';'), array_keys($this->namedErrors), array_values($this->namedErrors))
+      array_map(function($e) { /** @var $e sfValidatorError */ return $e->getCode(); }, $this->globalErrors),
+      array_map(function($n, $e) { /** @var $e sfValidatorError */ return $n.' ['.$e->getCode().']'; }, array_keys($this->namedErrors), array_values($this->namedErrors))
     ));
   }
 
@@ -294,8 +294,8 @@ protected function updateCode()
   protected function updateMessage()
   {
     $this->message = implode(' ', array_merge(
-      array_map(create_function('$e', 'return $e->getMessage();'), $this->globalErrors),
-      array_map(create_function('$n,$e', 'return $n.\' [\'.$e->getMessage().\']\';'), array_keys($this->namedErrors), array_values($this->namedErrors))
+      array_map(function($e) { /** @var $e sfValidatorError */ return $e->getMessage(); }, $this->globalErrors),
+      array_map(function($n, $e) { /** @var $e sfValidatorError */ return $n.' ['.$e->getMessage().']'; }, array_keys($this->namedErrors), array_values($this->namedErrors))
     ));
   }
 
diff --git a/lib/validator/sfValidatorFromDescription.class.php b/lib/validator/sfValidatorFromDescription.class.php
@@ -294,7 +294,7 @@ public function __construct($class, $arguments = array())
 
   public function asPhp()
   {
-    return sprintf('new %s(%s)', $this->class, implode(', ', array_map(create_function('$a', 'return var_export($a, true);'), $this->arguments)));
+    return sprintf('new %s(%s)', $this->class, implode(', ', array_map(function($a) { return var_export($a, true); }, $this->arguments)));
   }
 
   public function getValidator()
@@ -353,7 +353,7 @@ public function asPhp($tokenLeft, $tokenRight)
       $this->class,
       is_object($tokenLeft) && in_array(get_class($tokenLeft), array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenLeft->asPhp() : $tokenLeft,
       is_object($tokenRight) && in_array(get_class($tokenRight), array('sfValidatorFDToken', 'sfValidatorFDTokenFilter')) ? $tokenRight->asPhp() : $tokenRight,
-      implode(', ', array_map(create_function('$a', 'return var_export($a, true);'), $this->arguments))
+      implode(', ', array_map(function($a) { return var_export($a, true); }, $this->arguments))
     );
   }
 

Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,12 @@ public function removePattern($pattern)`
`223`	`223`	`public function getMany($keys)`
`224`	`224`	`{`
`225`	`225`	`$values = array();`
`226`		`- foreach ($this->memcache->get(array_map(create_function('$k', 'return "'.$this->getOption('prefix').'".$k;'), $keys)) as $key => $value)`
	`226`	`+ $prefix = $this->getOption('prefix');`
	`227`	`+ $prefixed_keys = array_map(function($k) use ($prefix) { return $prefix . $k; }, $keys);`
	`228`	`+`
	`229`	`+ foreach ($this->memcache->get($prefixed_keys) as $key => $value)`
`227`	`230`	`{`
`228`		`- $values[str_replace($this->getOption('prefix'), '', $key)] = $value;`
	`231`	`+ $values[str_replace($prefix, '', $key)] = $value;`
`229`	`232`	`}`
`230`	`233`
`231`	`234`	`return $values;`
Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,12 @@ protected function fixCgi()`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`// close the streams on script termination`
`608`		`- register_shutdown_function(create_function('', 'fclose(STDIN); fclose(STDOUT); fclose(STDERR); return true;'));`
	`608`	`+ register_shutdown_function(function() {`
	`609`	`+ fclose(STDIN);`
	`610`	`+ fclose(STDOUT);`
	`611`	`+ fclose(STDERR);`
	`612`	`+ return true;`
	`613`	`+ });`
`609`	`614`	`}`
`610`	`615`
`611`	`616`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ static public function replaceConstants($value)`
`77`	`77`	`{`
`78`	`78`	`if (is_array($value))`
`79`	`79`	`{`
`80`		`- array_walk_recursive($value, create_function('&$value', '$value = sfToolkit::replaceConstants($value);'));`
	`80`	`+ array_walk_recursive($value, function(& $value) { $value = sfToolkit::replaceConstants($value); });`
`81`	`81`	`}`
`82`	`82`	`else`
`83`	`83`	`{`
`@@ -98,7 +98,7 @@ static public function replacePath($path)`
`98`	`98`	`{`
`99`	`99`	`if (is_array($path))`
`100`	`100`	`{`
`101`		`- array_walk_recursive($path, create_function('&$path', '$path = sfConfigHandler::replacePath($path);'));`
	`101`	`+ array_walk_recursive($path, function(&$path) { $path = sfConfigHandler::replacePath($path); });`
`102`	`102`	`}`
`103`	`103`	`else`
`104`	`104`	`{`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ protected function execute($arguments = array(), $options = array())`
`73`	`73`	`&&`
`74`	`74`	`!$this->askConfirmation(array_merge(`
`75`	`75`	`array(sprintf('This command will remove all data in the following "%s" connection(s):', $environment), ''),`
`76`		`- array_map(create_function('$v', 'return \' - \'.$v;'), array_keys($databases)),`
	`76`	`+ array_map(function($v) { return ' - '.$v; }, array_keys($databases)),`
`77`	`77`	`array('', 'Are you sure you want to proceed? (y/N)')`
`78`	`78`	`), 'QUESTION_LARGE', false)`
`79`	`79`	`)`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ protected function execute($arguments = array(), $options = array())`
`137`	`137`	`{`
`138`	`138`	`$this->logBlock(array_merge(`
`139`	`139`	`array('The following errors occurred:', ''),`
`140`		`- array_map(create_function('$e', 'return \' - \'.$e->getMessage();'), $migration->getErrors())`
	`140`	`+ array_map(function($e) { return ' - '.$e->getMessage(); }, $migration->getErrors())`
`141`	`141`	`), 'ERROR_LARGE');`
`142`	`142`	`}`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -927,7 +927,7 @@ protected function parseArgumentAsArray($name, $value, &$vars)`
`927`	`927`	`if (false !== $pos = strpos($name, '['))`
`928`	`928`	`{`
`929`	`929`	`$var = &$vars;`
`930`		`- $tmps = array_filter(preg_split('/(\[ \| \[\] \| \])/x', $name), create_function('$s', 'return $s !== "";'));`
	`930`	`+ $tmps = array_filter(preg_split('/(\[ \| \[\] \| \])/x', $name), function($s) { return $s !== ''; });`
`931`	`931`	`foreach ($tmps as $tmp)`
`932`	`932`	`{`
`933`	`933`	`$var = &$var[$tmp];`