Update from original

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "lib/vendor/swiftmailer"]
 	path = lib/vendor/swiftmailer
 	url = https://github.com/swiftmailer/swiftmailer.git
+	branch = 5.x
 [submodule "lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine"]
 	path = lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
 	url = https://github.com/LExpress/doctrine1.git

.travis.yml

@@ -5,19 +5,23 @@ php:
     - 5.4
     - 5.5
     - 5.6
-    - nightly
+    - 7.0
     - hhvm
+    - nightly
 
 # run build against nightly but allow them to fail
 matrix:
     fast_finish: true
     allow_failures:
-        - php: nightly
         - php: hhvm
+        - php: nightly
 
 # faster builds on new travis setup not using sudo
 sudo: false
 
+services:
+    - memcached
+
 # cache vendor dirs
 cache:
     directories:
@@ -28,9 +32,12 @@ install:
     - composer self-update
 
 before_script:
-    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    # by default, --remote is not used on travis
+    - git submodule update --remote --force
+    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
     - composer install
 
 script:
     - php data/bin/check_configuration.php
-    - php -dshort_open_tag=Off -dmagic_quotes_gpc=Off data/bin/symfony symfony:test --trace
+    - php data/bin/symfony symfony:test --trace

CHANGELOG.md

@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+02/02/2016: Version 1.5.7
+-------------------------
+
+* Fix error in embedded form #105
+* Added HTTP PATCH request method #110
+* Fix integers used in mt_rand() #113
+* Remove array cast from parameter of sfAction::renderJson #115
+* Don't post unnamed submit fields in sfBrowserBase #112
+* Add support for traits in autoloaders #112
+* Php Inspections (EA Extended): Static Code Analysis #111
+
 22/07/2015: Version 1.5.6
 -------------------------
 

README.md

@@ -11,7 +11,7 @@ All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.
 
 - [DIC](https://github.com/LExpress/symfony1/wiki/ServiceContainer)
 - Composer support
-- PHP 5.6 support
+- PHP 7.0 support
 - performance boost
 - new widgets & validators
 - some tickets fixed from the symfony trac

UPGRADE.md

@@ -26,3 +26,32 @@ Due to the new embed form enhancements:
 * You cannot added the same `sfValidatorErrorSchema` instance twice or more into an `sfValidatorErrorSchema`.
 * The method `sfValidatorErrorSchema::addErrors` only accept an `sfValidatorErrorSchema` instance as argument.
 + The `sfValidatorErrorSchema` constructor no longer accept an array of errors as second argument.
+
+Doctrine & Project configuration
+--------------------------------
+
+Previously, you were able to configure doctrine in your `/config/ProjectConfiguration.class.php` using the method `configureDoctrine`.
+This method isn't called anymore. You now need to connect to the `doctrine.configure` event:
+
+```php
+<?php
+// ...
+
+class ProjectConfiguration extends sfProjectConfiguration
+{
+  public function setup()
+  {
+    // ...
+
+    $this->dispatcher->connect('doctrine.configure', array($this, 'configureDoctrineEvent'));
+  }
+
+  public function configureDoctrineEvent(sfEvent $event)
+  {
+    $manager = $event->getSubject();
+
+    // configure what ever you want on the doctrine manager
+    $manager->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+  }
+}
+```

data/bin/check_configuration.php

@@ -97,6 +97,8 @@ function_exists('xcache_set')
 check(!ini_get('register_globals'), 'php.ini has register_globals set to off', 'Set it to off in php.ini', false);
 check(!ini_get('session.auto_start'), 'php.ini has session.auto_start set to off', 'Set it to off in php.ini', false);
 
+check(class_exists('Memcache'), 'Memcache is available', 'You must have memcache installed and enabled to use sfMemcacheCache class.', false);
+
 if (!is_cli())
 {
   echo '</pre></body></html>';

data/bin/sandbox_installer.php

@@ -26,7 +26,7 @@
 $seen = array();
 foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(sfConfig::get('sf_root_dir')), RecursiveIteratorIterator::CHILD_FIRST) as $path => $item)
 {
-  if ($item->isDir() && !$item->isLink() && !isset($seen[$path]))
+  if (!isset($seen[$path]) && $item->isDir() && !$item->isLink())
   {
     touch($item->getRealPath().'/.sf');
   }

lib/action/sfAction.class.php

@@ -269,15 +269,15 @@ public function renderText($text)
   }
 
   /**
-   * Convert the given array of data into a JSON response.
+   * Convert the given data into a JSON response.
    *
    * <code>return $this->renderJson(array('username' => 'john'))</code>
    *
-   * @param array $data Data to encode as JSON
+   * @param mixed $data Data to encode as JSON
    *
    * @return sfView::NONE
    */
-  public function renderJson(array $data)
+  public function renderJson($data)
   {
     $this->getResponse()->setContentType('application/json');
     $this->getResponse()->setContent(json_encode($data));

lib/autoload/sfAutoload.class.php

@@ -138,7 +138,15 @@ public function reloadClasses($force = false)
 
     $file = $configuration->getConfigCache()->checkConfig('config/autoload.yml');
 
-    $this->classes = include($file);
+    if (defined('HHVM_VERSION'))
+    {
+      // workaround for https://github.com/facebook/hhvm/issues/1447
+      $this->classes = eval(str_replace('<?php', '', file_get_contents($file)));
+    }
+    else
+    {
+      $this->classes = include $file;
+    }
 
     foreach ($this->overriden as $class => $path)
     {

lib/autoload/sfCoreAutoload.class.php

@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.5.7-dev');
+define('SYMFONY_VERSION', '1.5.8-dev');
 
 /**
  * sfCoreAutoload class.

lib/cache/sfFileCache.class.php

@@ -277,13 +277,13 @@ protected function write($path, $data, $timeout)
     $current_umask = umask();
     umask(0000);
 
-    if (!is_dir(dirname($path)))
+    $cacheDir = dirname($path);
+    if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
     {
-      // create directory structure if needed
-      mkdir(dirname($path), 0777, true);
+      throw new \sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));
     }
 
-    $tmpFile = tempnam(dirname($path), basename($path));
+    $tmpFile = tempnam($cacheDir, basename($path));
 
     if (!$fp = @fopen($tmpFile, 'wb'))
     {

lib/cache/sfMemcacheCache.class.php

@@ -92,15 +92,21 @@ public function get($key, $default = null)
   {
     $value = $this->memcache->get($this->getOption('prefix').$key);
 
-    return false === $value ? $default : $value;
+    return (false === $value && false === $this->getMetadata($key)) ? $default : $value;
   }
 
   /**
    * @see sfCache
    */
   public function has($key)
   {
-    return !(false === $this->memcache->get($this->getOption('prefix').$key));
+    if (false === $this->memcache->get($this->getOption('prefix') . $key))
+    {
+      // if there is metadata, $key exists with a false value
+      return !(false === $this->getMetadata($key));
+    }
+
+    return true;
   }
 
   /**
@@ -232,7 +238,7 @@ protected function getMetadata($key)
    */
   protected function setMetadata($key, $lifetime)
   {
-    $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, $lifetime);
+    $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, time() + $lifetime);
   }
 
   /**

lib/cache/sfSQLiteCache.class.php

@@ -142,7 +142,7 @@ public function clean($mode = sfCache::ALL)
     {
       $res = $this->dbh->exec("DELETE FROM cache".(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''));
 
-      if ($res);
+      if ($res)
       {
         return (boolean) $this->dbh->changes();
       }

lib/command/sfAnsiColorFormatter.class.php

@@ -98,7 +98,7 @@ public function formatSection($section, $text, $size = null, $style = 'INFO')
     $style = array_key_exists($style, $this->styles) ? $style : 'INFO';
     $width = 9 + strlen($this->format('', $style));
 
-    return sprintf(">> %-{$width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
+    return sprintf(">> %-${width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
   }
 
   /**

lib/config/sfConfigCache.class.php

@@ -333,15 +333,13 @@ protected function loadConfigHandlers()
   protected function writeCacheFile($config, $cache, $data)
   {
     $current_umask = umask(0000);
-    if (!is_dir(dirname($cache)))
+    $cacheDir      = dirname($cache);
+    if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
     {
-      if (false === @mkdir(dirname($cache), 0777, true))
-      {
-        throw new sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', dirname($cache), $config));
-      }
+        throw new \sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));
     }
 
-    $tmpFile = tempnam(dirname($cache), basename($cache));
+    $tmpFile = tempnam($cacheDir, basename($cache));
 
     if (!$fp = @fopen($tmpFile, 'wb'))
     {

lib/config/sfViewConfigHandler.class.php

@@ -263,6 +263,7 @@ private function addAssets($type, $assets){
       $position = '';
       if (is_array($asset))
       {
+        reset($asset);
         $key = key($asset);
         $options = $asset[$key];
         if (isset($options['position']))

lib/controller/sfWebController.class.php

@@ -120,7 +120,7 @@ public function convertUrlStringToParameters($url)
     }
 
     // routeName?
-    if ($url[0] == '@')
+    if ($url && $url[0] == '@')
     {
       $route = substr($url, 1);
     }

lib/database/sfPDODatabase.class.php

@@ -42,7 +42,7 @@ public function connect()
       $password   = $this->getParameter('password');
       $persistent = $this->getParameter('persistent');
 
-      $options = ($persistent) ? array(PDO::ATTR_PERSISTENT => true) : array();
+      $options = $persistent ? array(PDO::ATTR_PERSISTENT => true) : array();
 
       $this->connection = new $pdo_class($dsn, $username, $password, $options);
 

lib/debug/sfWebDebugPanelMemory.class.php

@@ -20,7 +20,7 @@ class sfWebDebugPanelMemory extends sfWebDebugPanel
 {
   public function getTitle()
   {
-    $totalMemory = sprintf('%.1f', (memory_get_peak_usage(true) / 1024));
+    $totalMemory = sprintf('%.1f', memory_get_peak_usage(true) / 1024);
 
     return '<img src="'.$this->webDebug->getOption('image_root_path').'/memory.png" alt="Memory" /> '.$totalMemory.' KB';
   }

lib/form/sfForm.class.php

@@ -610,7 +610,8 @@ public function setValidators(array $validators)
    */
   public function setValidator($name, sfValidatorBase $validator)
   {
-    if (isset($this->embeddedForms[$name])) {
+    if (isset($this->embeddedForms[$name]))
+    {
       throw new LogicException('You cannot set a validator for an embedded form.');
     }
 
@@ -635,7 +636,8 @@ public function getValidator($name)
       throw new InvalidArgumentException(sprintf('The validator "%s" does not exist.', $name));
     }
 
-    if (isset($this->embeddedForms[$name])) {
+    if (isset($this->embeddedForms[$name]))
+    {
       return $this->embeddedForms[$name]->getValidatorSchema();
     }
 

lib/generator/sfGeneratorManager.class.php

@@ -80,12 +80,13 @@ public function save($path, $content)
   {
     $path = $this->getBasePath().DIRECTORY_SEPARATOR.$path;
 
-    if (!is_dir(dirname($path)))
+    $cacheDir = dirname($path);
+    if (!is_dir($cacheDir))
     {
       $current_umask = umask(0000);
-      if (false === @mkdir(dirname($path), 0777, true))
+      if (!@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
       {
-        throw new sfCacheException(sprintf('Failed to make cache directory "%s".', dirname($path)));
+        throw new \sfCacheException(sprintf('Failed to make cache directory "%s".', $cacheDir));
       }
       umask($current_umask);
     }

lib/helper/AssetHelper.php

@@ -365,7 +365,9 @@ function image_tag($source, $options = array())
 
   if (isset($options['size']))
   {
-    list($options['width'], $options['height']) = explode('x', $options['size'], 2);
+    list($width, $height) = explode('x', $options['size'], 2);
+    $options['height'] = $height;
+    $options['width'] = $width;
     unset($options['size']);
   }
 

lib/helper/TagHelper.php

@@ -34,7 +34,7 @@ function tag($name, $options = array(), $open = false)
     return '';
   }
 
-  return '<'.$name._tag_options($options).(($open) ? '>' : ' />');
+  return '<'.$name._tag_options($options).($open ? '>' : ' />');
 }
 
 function content_tag($name, $content = '', $options = array())

lib/helper/TextHelper.php

@@ -45,8 +45,8 @@ function truncate_text($text, $length = 30, $truncate_string = '...', $truncate_
     $old_encoding = mb_internal_encoding();
     @mb_internal_encoding(mb_detect_encoding($text));
   }
-  $strlen = ($mbstring) ? 'mb_strlen' : 'strlen';
-  $substr = ($mbstring) ? 'mb_substr' : 'substr';
+  $strlen = $mbstring ? 'mb_strlen' : 'strlen';
+  $substr = $mbstring ? 'mb_substr' : 'substr';
 
   if ($strlen($text) > $length)
   {

lib/helper/UrlHelper.php

@@ -74,7 +74,7 @@ function link_to1($name, $internal_uri, $options = array())
     }
   }
 
-  if (!strlen($name))
+  if ('' === $name)
   {
     $name = $html_options['href'];
   }

lib/i18n/sfChoiceFormat.class.php

@@ -155,12 +155,7 @@ public function isValid($number, $set)
       $right = $number < $elements[$total - 1];
     }
 
-    if ($left && $right)
-    {
-      return true;
-    }
-
-    return false;
+    return $left && $right;
   }
 
   protected function isValidSetNotation($number, $set)