minor #25813 [appveyor] set memory_limit=-1 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 95c619300c0e · 2018-01-16T18:49:05.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [appveyor] set memory_limit=-1 | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- 10e33ac [appveyor] set memory_limit=-1
diff --git a/appveyor.yml b/appveyor.yml
@@ -31,6 +31,7 @@ install:
     - 7z x php_memcache-3.0.8-5.3-nts-vc9-x86.zip -y >nul
     - cd ..
     - copy /Y php.ini-development php.ini-min
+    - echo memory_limit=-1 >> php.ini-min
     - echo serialize_precision=14 >> php.ini-min
     - echo max_execution_time=1200 >> php.ini-min
     - echo date.timezone="America/Los_Angeles" >> php.ini-min
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -39,8 +39,6 @@ class ContextListener implements ListenerInterface
     private $dispatcher;
     private $registered;
 
-    private static $unserializeExceptionCode = 0x37313bc;
-
     public function __construct(TokenStorageInterface $tokenStorage, array $userProviders, $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)
     {
         if (empty($contextKey)) {
@@ -180,7 +178,7 @@ private function safelyUnserialize($serializedToken)
         $prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
         $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$prevErrorHandler) {
             if (__FILE__ === $file) {
-                throw new \UnexpectedValueException($msg, self::$unserializeExceptionCode);
+                throw new \UnexpectedValueException($msg, 0x37313bc);
             }
 
             return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
@@ -194,7 +192,7 @@ private function safelyUnserialize($serializedToken)
         restore_error_handler();
         ini_set('unserialize_callback_func', $prevUnserializeHandler);
         if ($e) {
-            if (!$e instanceof \UnexpectedValueException || self::$unserializeExceptionCode !== $e->getCode()) {
+            if (!$e instanceof \UnexpectedValueException || 0x37313bc !== $e->getCode()) {
                 throw $e;
             }
             if ($this->logger) {
@@ -210,6 +208,6 @@ private function safelyUnserialize($serializedToken)
      */
     public static function handleUnserializeCallback($class)
     {
-        throw new \UnexpectedValueException('Class not found: '.$class, self::$unserializeExceptionCode);
+        throw new \UnexpectedValueException('Class not found: '.$class, 0x37313bc);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ class ContextListener implements ListenerInterface`
`39`	`39`	`private $dispatcher;`
`40`	`40`	`private $registered;`
`41`	`41`
`42`		`- private static $unserializeExceptionCode = 0x37313bc;`
`43`		`-`
`44`	`42`	`public function __construct(TokenStorageInterface $tokenStorage, array $userProviders, $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null)`
`45`	`43`	`{`
`46`	`44`	`if (empty($contextKey)) {`
`@@ -180,7 +178,7 @@ private function safelyUnserialize($serializedToken)`
`180`	`178`	`$prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');`
`181`	`179`	`$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$prevErrorHandler) {`
`182`	`180`	`if (__FILE__ === $file) {`
`183`		`- throw new \UnexpectedValueException($msg, self::$unserializeExceptionCode);`
	`181`	`+ throw new \UnexpectedValueException($msg, 0x37313bc);`
`184`	`182`	`}`
`185`	`183`
`186`	`184`	`return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;`
`@@ -194,7 +192,7 @@ private function safelyUnserialize($serializedToken)`
`194`	`192`	`restore_error_handler();`
`195`	`193`	`ini_set('unserialize_callback_func', $prevUnserializeHandler);`
`196`	`194`	`if ($e) {`
`197`		`- if (!$e instanceof \UnexpectedValueException \|\| self::$unserializeExceptionCode !== $e->getCode()) {`
	`195`	`+ if (!$e instanceof \UnexpectedValueException \|\| 0x37313bc !== $e->getCode()) {`
`198`	`196`	`throw $e;`
`199`	`197`	`}`
`200`	`198`	`if ($this->logger) {`
`@@ -210,6 +208,6 @@ private function safelyUnserialize($serializedToken)`
`210`	`208`	`*/`
`211`	`209`	`public static function handleUnserializeCallback($class)`
`212`	`210`	`{`
`213`		`- throw new \UnexpectedValueException('Class not found: '.$class, self::$unserializeExceptionCode);`
	`211`	`+ throw new \UnexpectedValueException('Class not found: '.$class, 0x37313bc);`
`214`	`212`	`}`
`215`	`213`	`}`