Commit 5b2e9494eff492dd6d7cc0552982d9d4a28bf5e2

Authored by Eduardo Santos
1 parent c52ba58f
Exists in master and in 1 other branch 3.1

Downgrade de versão do Symfony pois não estava funcionando no RHEL 6

app/bootstrap.php.cache
@@ -1575,14 +1575,10 @@ return null !== $this->headers->get('Vary'); @@ -1575,14 +1575,10 @@ return null !== $this->headers->get('Vary');
1575 } 1575 }
1576 public function getVary() 1576 public function getVary()
1577 { 1577 {
1578 -if (!$vary = $this->headers->get('Vary', null, false)) { 1578 +if (!$vary = $this->headers->get('Vary')) {
1579 return array(); 1579 return array();
1580 } 1580 }
1581 -$ret = array();  
1582 -foreach ($vary as $item) {  
1583 -$ret = array_merge($ret, preg_split('/[\s,]+/', $item));  
1584 -}  
1585 -return $ret; 1581 +return is_array($vary) ? $vary : preg_split('/[\s,]+/', $vary);
1586 } 1582 }
1587 public function setVary($headers, $replace = true) 1583 public function setVary($headers, $replace = true)
1588 { 1584 {
@@ -2174,11 +2170,11 @@ protected $booted; @@ -2174,11 +2170,11 @@ protected $booted;
2174 protected $name; 2170 protected $name;
2175 protected $startTime; 2171 protected $startTime;
2176 protected $loadClassCache; 2172 protected $loadClassCache;
2177 -const VERSION ='2.3.12';  
2178 -const VERSION_ID ='20312'; 2173 +const VERSION ='2.3.10';
  2174 +const VERSION_ID ='20310';
2179 const MAJOR_VERSION ='2'; 2175 const MAJOR_VERSION ='2';
2180 const MINOR_VERSION ='3'; 2176 const MINOR_VERSION ='3';
2181 -const RELEASE_VERSION ='12'; 2177 +const RELEASE_VERSION ='10';
2182 const EXTRA_VERSION =''; 2178 const EXTRA_VERSION ='';
2183 public function __construct($environment, $debug) 2179 public function __construct($environment, $debug)
2184 { 2180 {
@@ -2544,33 +2540,21 @@ return $source; @@ -2544,33 +2540,21 @@ return $source;
2544 $rawChunk =''; 2540 $rawChunk ='';
2545 $output =''; 2541 $output ='';
2546 $tokens = token_get_all($source); 2542 $tokens = token_get_all($source);
2547 -$ignoreSpace = false;  
2548 for (reset($tokens); false !== $token = current($tokens); next($tokens)) { 2543 for (reset($tokens); false !== $token = current($tokens); next($tokens)) {
2549 if (is_string($token)) { 2544 if (is_string($token)) {
2550 $rawChunk .= $token; 2545 $rawChunk .= $token;
2551 } elseif (T_START_HEREDOC === $token[0]) { 2546 } elseif (T_START_HEREDOC === $token[0]) {
2552 -$output .= $rawChunk.$token[1]; 2547 +$output .= preg_replace(array('/\s+$/Sm','/\n+/S'),"\n", $rawChunk).$token[1];
2553 do { 2548 do {
2554 $token = next($tokens); 2549 $token = next($tokens);
2555 $output .= $token[1]; 2550 $output .= $token[1];
2556 } while ($token[0] !== T_END_HEREDOC); 2551 } while ($token[0] !== T_END_HEREDOC);
2557 $rawChunk =''; 2552 $rawChunk ='';
2558 -} elseif (T_WHITESPACE === $token[0]) {  
2559 -if ($ignoreSpace) {  
2560 -$ignoreSpace = false;  
2561 -continue;  
2562 -}  
2563 -$rawChunk .= preg_replace(array('/\n{2,}/S'),"\n", $token[1]);  
2564 -} elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {  
2565 -$ignoreSpace = true;  
2566 -} else { 2553 +} elseif (!in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
2567 $rawChunk .= $token[1]; 2554 $rawChunk .= $token[1];
2568 -if (T_OPEN_TAG === $token[0]) {  
2569 -$ignoreSpace = true;  
2570 -}  
2571 } 2555 }
2572 } 2556 }
2573 -$output .= $rawChunk; 2557 +$output .= preg_replace(array('/\s+$/Sm','/\n+/S'),"\n", $rawChunk);
2574 return $output; 2558 return $output;
2575 } 2559 }
2576 public function serialize() 2560 public function serialize()
@@ -2752,7 +2736,6 @@ $application->add($r->newInstance()); @@ -2752,7 +2736,6 @@ $application->add($r->newInstance());
2752 namespace Symfony\Component\Config 2736 namespace Symfony\Component\Config
2753 { 2737 {
2754 use Symfony\Component\Config\Resource\ResourceInterface; 2738 use Symfony\Component\Config\Resource\ResourceInterface;
2755 -use Symfony\Component\Filesystem\Exception\IOException;  
2756 use Symfony\Component\Filesystem\Filesystem; 2739 use Symfony\Component\Filesystem\Filesystem;
2757 class ConfigCache 2740 class ConfigCache
2758 { 2741 {
@@ -2790,20 +2773,11 @@ return true; @@ -2790,20 +2773,11 @@ return true;
2790 } 2773 }
2791 public function write($content, array $metadata = null) 2774 public function write($content, array $metadata = null)
2792 { 2775 {
2793 -$mode = 0666;  
2794 -$umask = umask(); 2776 +$mode = 0666 & ~umask();
2795 $filesystem = new Filesystem(); 2777 $filesystem = new Filesystem();
2796 -$filesystem->dumpFile($this->file, $content, null);  
2797 -try {  
2798 -$filesystem->chmod($this->file, $mode, $umask);  
2799 -} catch (IOException $e) {  
2800 -} 2778 +$filesystem->dumpFile($this->file, $content, $mode);
2801 if (null !== $metadata && true === $this->debug) { 2779 if (null !== $metadata && true === $this->debug) {
2802 -$filesystem->dumpFile($this->getMetaFile(), serialize($metadata), null);  
2803 -try {  
2804 -$filesystem->chmod($this->getMetaFile(), $mode, $umask);  
2805 -} catch (IOException $e) {  
2806 -} 2780 +$filesystem->dumpFile($this->getMetaFile(), serialize($metadata), $mode);
2807 } 2781 }
2808 } 2782 }
2809 private function getMetaFile() 2783 private function getMetaFile()
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 ], 24 ],
25 "require": { 25 "require": {
26 "php": ">=5.3.3", 26 "php": ">=5.3.3",
27 - "symfony/symfony": "2.3.*", 27 + "symfony/symfony": "2.3.10",
28 "jquery/jquery": "1.10.*", 28 "jquery/jquery": "1.10.*",
29 "doctrine/orm": ">=2.2.3,<2.4-dev", 29 "doctrine/orm": ">=2.2.3,<2.4-dev",
30 "doctrine/doctrine-bundle": "1.2.*", 30 "doctrine/doctrine-bundle": "1.2.*",
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 "This file locks the dependencies of your project to a known state", 3 "This file locks the dependencies of your project to a known state",
4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" 4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
5 ], 5 ],
6 - "hash": "7b0319266c174918185313801b3e4139", 6 + "hash": "2374f22cb735f9931567e2668cf40380",
7 "packages": [ 7 "packages": [
8 { 8 {
9 "name": "braincrafted/bootstrap-bundle", 9 "name": "braincrafted/bootstrap-bundle",
@@ -2927,16 +2927,16 @@ @@ -2927,16 +2927,16 @@
2927 }, 2927 },
2928 { 2928 {
2929 "name": "symfony/symfony", 2929 "name": "symfony/symfony",
2930 - "version": "v2.3.12", 2930 + "version": "v2.3.10",
2931 "source": { 2931 "source": {
2932 "type": "git", 2932 "type": "git",
2933 "url": "https://github.com/symfony/symfony.git", 2933 "url": "https://github.com/symfony/symfony.git",
2934 - "reference": "3574df3d5e0039f3225007b8be534df5c4104503" 2934 + "reference": "e4b9ff28b7c357971947ed12f99fbc68ff116830"
2935 }, 2935 },
2936 "dist": { 2936 "dist": {
2937 "type": "zip", 2937 "type": "zip",
2938 - "url": "https://api.github.com/repos/symfony/symfony/zipball/3574df3d5e0039f3225007b8be534df5c4104503",  
2939 - "reference": "3574df3d5e0039f3225007b8be534df5c4104503", 2938 + "url": "https://api.github.com/repos/symfony/symfony/zipball/e4b9ff28b7c357971947ed12f99fbc68ff116830",
  2939 + "reference": "e4b9ff28b7c357971947ed12f99fbc68ff116830",
2940 "shasum": "" 2940 "shasum": ""
2941 }, 2941 },
2942 "require": { 2942 "require": {
@@ -3033,7 +3033,7 @@ @@ -3033,7 +3033,7 @@
3033 "keywords": [ 3033 "keywords": [
3034 "framework" 3034 "framework"
3035 ], 3035 ],
3036 - "time": "2014-04-03 05:42:39" 3036 + "time": "2014-02-12 08:18:23"
3037 }, 3037 },
3038 { 3038 {
3039 "name": "twbs/bootstrap", 3039 "name": "twbs/bootstrap",