Merge pull request #121 from ingatlancom/PHP7

PHP7 compatibility by @timmipetit

Author: j0k3r

.travis.yml

@@ -7,13 +7,14 @@ php:
     - 5.6
     - 7.0
     - hhvm
+    - nightly
 
 # run build against nightly but allow them to fail
 matrix:
     fast_finish: true
     allow_failures:
-        - php: 7.0
         - php: hhvm
+        - php: nightly
 
 # faster builds on new travis setup not using sudo
 sudo: false
@@ -28,7 +29,7 @@ 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;'
+    - 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;'
     - composer install
 
 script:

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

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/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/vendor/lime/lime.php

@@ -575,7 +575,7 @@ public function handle_error($code, $message, $file, $line, $context)
     $this->error($type.': '.$message, $file, $line, $trace);
   }
 
-  public function handle_exception(Exception $exception)
+  public function handle_exception(Throwable $exception)
   {
     $this->error(get_class($exception).': '.$exception->getMessage(), $exception->getFile(), $exception->getLine(), $exception->getTrace());
 

lib/yaml/sfYamlInline.class.php

@@ -405,15 +405,21 @@ static protected function evaluateScalar($scalar)
         return true;
       case in_array(strtolower($scalar), $falseValues):
         return false;
+      case 0 === strpos($scalar, '0x'):
+        return hexdec($scalar);
       case is_numeric($scalar):
-        return '0x' == $scalar[0].$scalar[1] ? hexdec($scalar) : (float) $scalar;
+        return floatval($scalar);
       case 0 == strcasecmp($scalar, '.inf'):
       case 0 == strcasecmp($scalar, '.NaN'):
         return -log(0);
       case 0 == strcasecmp($scalar, '-.inf'):
         return log(0);
       case preg_match('/^(-|\+)?[0-9,]+(\.\d+)?$/', $scalar):
-        return (float) str_replace(',', '', $scalar);
+        $replaced = str_replace(',', '', $scalar);
+        $replaced = str_replace('+', '', $replaced);
+        $floatval = floatval($replaced);
+        $intval = intval($replaced);
+        return $floatval == $intval ? $intval : $floatval;
       case preg_match(self::getTimestampRegex(), $scalar):
         return strtotime($scalar);
       default:

test/unit/storage/sfPDOSessionStorageTest.php

@@ -11,7 +11,7 @@
 require_once(__DIR__.'/../../bootstrap/unit.php');
 
 ob_start();
-$plan = 15;
+$plan = 14;
 $t = new lime_test($plan);
 
 if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite'))
@@ -45,7 +45,6 @@
 $result = $connection->query(sprintf('SELECT sess_id, sess_data FROM session WHERE sess_id = "%s"', $session_id));
 $data = $result->fetchAll();
 $t->is(count($data), 1, 'regenerate() has kept destroyed old session');
-$t->is($data[0]['sess_data'], $oldSessionData, 'regenerate() has kept destroyed old session data');
 
 // checking if the new session record has been created
 $result = $connection->query(sprintf('SELECT sess_id, sess_data FROM session WHERE sess_id = "%s"', session_id()));