@@ -850,27 +850,16 @@ public function testSetTimeZoneId($timeZoneId, $expectedTimeZoneId)
850
850
851
851
public function setTimeZoneIdProvider ()
852
852
{
853
- $ data = array (
853
+ return array (
854
854
array ('UTC ' , 'UTC ' ),
855
855
array ('GMT ' , 'GMT ' ),
856
856
array ('GMT-03:00 ' , 'GMT-03:00 ' ),
857
857
array ('Europe/Zurich ' , 'Europe/Zurich ' ),
858
+ array ('GMT-0300 ' , 'GMT-0300 ' ),
859
+ array ('Foo/Bar ' , 'Foo/Bar ' ),
860
+ array ('GMT+00:AA ' , 'GMT+00:AA ' ),
861
+ array ('GMT+00AA ' , 'GMT+00AA ' ),
858
862
);
859
-
860
- // When time zone not exists, uses UTC by default
861
- if (version_compare (PHP_VERSION , '5.5.0-dev ' , '>= ' )) {
862
- $ data [] = array ('GMT-0300 ' , 'UTC ' );
863
- $ data [] = array ('Foo/Bar ' , 'UTC ' );
864
- $ data [] = array ('GMT+00:AA ' , 'UTC ' );
865
- $ data [] = array ('GMT+00AA ' , 'UTC ' );
866
- } else {
867
- $ data [] = array ('GMT-0300 ' , 'GMT-0300 ' );
868
- $ data [] = array ('Foo/Bar ' , 'Foo/Bar ' );
869
- $ data [] = array ('GMT+00:AA ' , 'GMT+00:AA ' );
870
- $ data [] = array ('GMT+00AA ' , 'GMT+00AA ' );
871
- }
872
-
873
- return $ data ;
874
863
}
875
864
876
865
protected function getDefaultDateFormatter ($ pattern = null )
0 commit comments