minor symfony#11963 Fixing unit tests (fejese)

fabpot · fabpot · commit cd9ae6f0b581 · 2014-09-20T08:06:06.000+02:00
This PR was merged into the 2.6-dev branch. Discussion ---------- Fixing unit tests [Validator] Fixing how default time zone is backed up during testing to not interfere with other tests [HttpKernel] Fixing merge issue since 4677e92 | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 5b3193a minor symfony#11963 Unit test fixes [HttpKernel] Fixing unit test broken since merge 4677e92 [Validator] Fixing the way the default time zone is backed up
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/EsiTest.php
@@ -106,7 +106,7 @@ public function testProcess()
         $response = new Response('foo <esi:comment text="some comment" /><esi:include src="foo\'" alt="bar\'" onerror="continue" />');
         $esi->process($request, $response);
 
-        $this->assertEquals("foo <?php echo \$this->esi->handle(\$this, 'foo\\'', 'bar\\'', true) ?>"."\n", $response->getContent());
+        $this->assertEquals('foo <?php echo $this->surrogate->handle($this, \'foo\\\'\', \'bar\\\'\', true) ?>'."\n", $response->getContent());
 
         $response = new Response('foo <esi:include src="..." />');
         $esi->process($request, $response);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php
@@ -90,15 +90,15 @@ protected function setDefaultTimezone($defaultTimezone)
         // Make sure this method can not be called twice before calling
         // also restoreDefaultTimezone()
         if (null === $this->defaultTimezone) {
-            $this->defaultTimezone = ini_get('date.timezone');
-            ini_set('date.timezone', $defaultTimezone);
+            $this->defaultTimezone = date_default_timezone_get();
+            date_default_timezone_set($defaultTimezone);
         }
     }
 
     protected function restoreDefaultTimezone()
     {
         if (null !== $this->defaultTimezone) {
-            ini_set('date.timezone', $this->defaultTimezone);
+            date_default_timezone_set($this->defaultTimezone);
             $this->defaultTimezone = null;
         }
     }
@@ -116,7 +116,7 @@ protected function createContext()
                     $this->metadata,
                     $this->value,
                     $this->group,
-                    $this->propertyPath
+                    $this->propertyPath,
                 ))
                 ->setMethods(array('validate', 'validateValue'))
                 ->getMock();

Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,15 @@ protected function setDefaultTimezone($defaultTimezone)`
`90`	`90`	`// Make sure this method can not be called twice before calling`
`91`	`91`	`// also restoreDefaultTimezone()`
`92`	`92`	`if (null === $this->defaultTimezone) {`
`93`		`- $this->defaultTimezone = ini_get('date.timezone');`
`94`		`- ini_set('date.timezone', $defaultTimezone);`
	`93`	`+ $this->defaultTimezone = date_default_timezone_get();`
	`94`	`+ date_default_timezone_set($defaultTimezone);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`protected function restoreDefaultTimezone()`
`99`	`99`	`{`
`100`	`100`	`if (null !== $this->defaultTimezone) {`
`101`		`- ini_set('date.timezone', $this->defaultTimezone);`
	`101`	`+ date_default_timezone_set($this->defaultTimezone);`
`102`	`102`	`$this->defaultTimezone = null;`
`103`	`103`	`}`
`104`	`104`	`}`
`@@ -116,7 +116,7 @@ protected function createContext()`
`116`	`116`	`$this->metadata,`
`117`	`117`	`$this->value,`
`118`	`118`	`$this->group,`
`119`		`- $this->propertyPath`
	`119`	`+ $this->propertyPath,`
`120`	`120`	`))`
`121`	`121`	`->setMethods(array('validate', 'validateValue'))`
`122`	`122`	`->getMock();`