DO NOT MERGE - REFERENCE - branch:omg-8.3

.gitmodules

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

lib/action/sfAction.class.php

@@ -266,7 +266,9 @@ public function renderText($text)
      */
     public function renderJson($data)
     {
-        $this->getResponse()->setContentType('application/json');
+        $this->getResponse()->setHttpHeader('Cache-Control', 'no-cache, must-revalidate');
+        $this->getResponse()->setHttpHeader('Expires', '0');
+        $this->getResponse()->setHttpHeader('Content-Type', 'application/json; charset=utf-8');
         $this->getResponse()->setContent(json_encode($data));
 
         return sfView::NONE;

lib/command/sfFormatter.class.php

@@ -65,7 +65,7 @@ public function format($text = '', $parameters = [])
      */
     public function formatSection($section, $text, $size = null)
     {
-        if (!$size) {
+        if (!$size || !is_int($size)) {
             $size = $this->size;
         }
 

lib/config/sfApplicationConfiguration.class.php

@@ -231,7 +231,7 @@ public function setRootDir($rootDir)
             'sf_app' => $this->getApplication(),
             'sf_environment' => $this->getEnvironment(),
             'sf_debug' => $this->isDebug(),
-            'sf_cli' => PHP_SAPI === 'cli',
+            'sf_cli' => 0 === strncasecmp(PHP_SAPI, 'cli', 3) && 'cli-server' !== PHP_SAPI,
         ]);
 
         $this->setAppDir(sfConfig::get('sf_apps_dir').DIRECTORY_SEPARATOR.$this->getApplication());

lib/exception/sfError404Exception.class.php

@@ -34,11 +34,6 @@ public function printStackTrace()
             return parent::printStackTrace();
         }
 
-        // log all exceptions in php log
-        if (!sfConfig::get('sf_test')) {
-            error_log($this->getMessage());
-        }
-
         sfContext::getInstance()->getController()->forward(sfConfig::get('sf_error_404_module'), sfConfig::get('sf_error_404_action'));
     }
 }