diff --git a/app/bootstrap.php.cache b/app/bootstrap.php.cache index ee68059..0ee1f62 100644 --- a/app/bootstrap.php.cache +++ b/app/bootstrap.php.cache @@ -1575,14 +1575,10 @@ return null !== $this->headers->get('Vary'); } public function getVary() { -if (!$vary = $this->headers->get('Vary', null, false)) { +if (!$vary = $this->headers->get('Vary')) { return array(); } -$ret = array(); -foreach ($vary as $item) { -$ret = array_merge($ret, preg_split('/[\s,]+/', $item)); -} -return $ret; +return is_array($vary) ? $vary : preg_split('/[\s,]+/', $vary); } public function setVary($headers, $replace = true) { @@ -2174,11 +2170,11 @@ protected $booted; protected $name; protected $startTime; protected $loadClassCache; -const VERSION ='2.3.12'; -const VERSION_ID ='20312'; +const VERSION ='2.3.10'; +const VERSION_ID ='20310'; const MAJOR_VERSION ='2'; const MINOR_VERSION ='3'; -const RELEASE_VERSION ='12'; +const RELEASE_VERSION ='10'; const EXTRA_VERSION =''; public function __construct($environment, $debug) { @@ -2544,33 +2540,21 @@ return $source; $rawChunk =''; $output =''; $tokens = token_get_all($source); -$ignoreSpace = false; for (reset($tokens); false !== $token = current($tokens); next($tokens)) { if (is_string($token)) { $rawChunk .= $token; } elseif (T_START_HEREDOC === $token[0]) { -$output .= $rawChunk.$token[1]; +$output .= preg_replace(array('/\s+$/Sm','/\n+/S'),"\n", $rawChunk).$token[1]; do { $token = next($tokens); $output .= $token[1]; } while ($token[0] !== T_END_HEREDOC); $rawChunk =''; -} elseif (T_WHITESPACE === $token[0]) { -if ($ignoreSpace) { -$ignoreSpace = false; -continue; -} -$rawChunk .= preg_replace(array('/\n{2,}/S'),"\n", $token[1]); -} elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { -$ignoreSpace = true; -} else { +} elseif (!in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) { $rawChunk .= $token[1]; -if (T_OPEN_TAG === $token[0]) { -$ignoreSpace = true; -} } } -$output .= $rawChunk; +$output .= preg_replace(array('/\s+$/Sm','/\n+/S'),"\n", $rawChunk); return $output; } public function serialize() @@ -2752,7 +2736,6 @@ $application->add($r->newInstance()); namespace Symfony\Component\Config { use Symfony\Component\Config\Resource\ResourceInterface; -use Symfony\Component\Filesystem\Exception\IOException; use Symfony\Component\Filesystem\Filesystem; class ConfigCache { @@ -2790,20 +2773,11 @@ return true; } public function write($content, array $metadata = null) { -$mode = 0666; -$umask = umask(); +$mode = 0666 & ~umask(); $filesystem = new Filesystem(); -$filesystem->dumpFile($this->file, $content, null); -try { -$filesystem->chmod($this->file, $mode, $umask); -} catch (IOException $e) { -} +$filesystem->dumpFile($this->file, $content, $mode); if (null !== $metadata && true === $this->debug) { -$filesystem->dumpFile($this->getMetaFile(), serialize($metadata), null); -try { -$filesystem->chmod($this->getMetaFile(), $mode, $umask); -} catch (IOException $e) { -} +$filesystem->dumpFile($this->getMetaFile(), serialize($metadata), $mode); } } private function getMetaFile() diff --git a/composer.json b/composer.json index 6bdd3b4..b9fb427 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/symfony": "2.3.*", + "symfony/symfony": "2.3.10", "jquery/jquery": "1.10.*", "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/doctrine-bundle": "1.2.*", diff --git a/composer.lock b/composer.lock index 713a76e..a50b144 100644 --- a/composer.lock +++ b/composer.lock @@ -3,7 +3,7 @@ "This file locks the dependencies of your project to a known state", "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" ], - "hash": "7b0319266c174918185313801b3e4139", + "hash": "2374f22cb735f9931567e2668cf40380", "packages": [ { "name": "braincrafted/bootstrap-bundle", @@ -2927,16 +2927,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.12", + "version": "v2.3.10", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "3574df3d5e0039f3225007b8be534df5c4104503" + "reference": "e4b9ff28b7c357971947ed12f99fbc68ff116830" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/3574df3d5e0039f3225007b8be534df5c4104503", - "reference": "3574df3d5e0039f3225007b8be534df5c4104503", + "url": "https://api.github.com/repos/symfony/symfony/zipball/e4b9ff28b7c357971947ed12f99fbc68ff116830", + "reference": "e4b9ff28b7c357971947ed12f99fbc68ff116830", "shasum": "" }, "require": { @@ -3033,7 +3033,7 @@ "keywords": [ "framework" ], - "time": "2014-04-03 05:42:39" + "time": "2014-02-12 08:18:23" }, { "name": "twbs/bootstrap", -- libgit2 0.21.2