Merge pull request #25 from Recras/pull-upstream-1.5.10

Pull upstream FriendsOfSymfony1/symfony1:1.5.12

Author: timmipetit

CHANGELOG.md

@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+17/03/2018: Version 1.5.11
+--------------------------
+
+* Fix a bug in the lime unit-testing lib #168
+* Fix error 'A non well formed numeric value' on sfValidatorFile #181
+* Fix usage of octet in recent patch #182
+* Allow PATCH as an option in functional tests #185
+* Fix case for isSubclassOf method #189
+* Remove typehint from exception handler #188
+* Fix counting of non-countable var for PHP 7.2 #178
+
 02/08/2017: Version 1.5.10
 --------------------------
 

README.md

@@ -7,11 +7,11 @@ This is a community driven fork of symfony 1, as official support has been [inte
 
 **Do not use it for new projects: this version is great to improve existing symfony1 applications, but [Symfony4](http://symfony.com/) is the way to go today.**
 
-All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.com/LExpress/symfony1/blob/master/WHATS_NEW.md) file, this include:
+All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.com/FriendsOfSymfony1/symfony1/blob/master/WHATS_NEW.md) file, this include:
 
-- [DIC](https://github.com/LExpress/symfony1/wiki/ServiceContainer)
+- [DIC](https://github.com/FriendsOfSymfony1/symfony1/wiki/ServiceContainer)
 - Composer support
-- PHP 7.0 support
+- PHP 7.2 support
 - performance boost
 - new widgets & validators
 - some tickets fixed from the symfony trac
@@ -51,7 +51,7 @@ Note: On windows, if your project is a few directories down from the drive root,
 Option 2: Using Git submodules:
 
     git init # your project
-    git submodule add https://github.com/LExpress/symfony1.git lib/vendor/symfony
+    git submodule add https://github.com/FriendsOfSymfony1/symfony1.git lib/vendor/symfony
     git submodule update --init --recursive
 
 Documentation

lib/autoload/sfCoreAutoload.class.php

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

lib/form/sfFormField.class.php

@@ -324,6 +324,10 @@ public function getError()
    */
   public function hasError()
   {
-    return null !== $this->error && count($this->error);
+    if ($this->error instanceof sfValidatorErrorSchema) {
+      return $this->error->count() > 0;
+    }
+    
+    return $this->error !== null;
   }
 }

lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php

@@ -164,7 +164,7 @@ public function getPluginModels()
           {
             $parent = new ReflectionClass('Doctrine_Record');
             $reflection = new ReflectionClass($modelName);
-            if ($reflection->isSubClassOf($parent))
+            if ($reflection->isSubclassOf($parent))
             {
               $this->pluginModels[$modelName] = $pluginName;
 

lib/response/sfWebResponse.class.php

@@ -11,7 +11,7 @@
 /**
  * sfWebResponse class.
  *
- * This class manages web reponses. It supports cookies and headers management.
+ * This class manages web responses. It supports cookies and headers management.
  *
  * @package    symfony
  * @subpackage response

lib/util/sfBrowserBase.class.php

@@ -272,7 +272,7 @@ public function call($uri, $method = 'get', $parameters = array(), $changeStack
 
     // request parameters
     $_GET = $_POST = array();
-    if (in_array(strtoupper($method), array('POST', 'DELETE', 'PUT')))
+    if (in_array(strtoupper($method), array('POST', 'DELETE', 'PUT', 'PATCH')))
     {
       if (isset($parameters['_with_csrf']) && $parameters['_with_csrf'])
       {