Merge pull request #8 from webmozart/5.3-support

padraic · padraic · commit 0ee989e06216 · 2015-05-28T16:21:20.000+01:00
Added support for PHP 5.3.3
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@ php:
     - 5.6
     - 5.5
     - 5.4
+    - 5.3
+    - 5.3.3
     - hhvm
     - hhvm-nightly
 
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4",
+        "php": ">=5.3.3",
         "padraic/humbug_get_contents": "^1.0",
         "symfony/finder": "~2.2"
     },
diff --git a/src/VersionParser.php b/src/VersionParser.php
@@ -28,7 +28,7 @@ class VersionParser
     /**
      * @param array $versions
      */
-    public function __construct(array $versions = [])
+    public function __construct(array $versions = array())
     {
         $this->versions = $versions;
     }
@@ -114,7 +114,7 @@ public function isDevelopment($version)
 
     private function selectRecentStable()
     {
-        $candidates = [];
+        $candidates = array();
         foreach ($this->versions as $version) {
             if (!$this->stable($version)) {
                 continue;
@@ -129,7 +129,7 @@ private function selectRecentStable()
 
     private function selectRecentUnstable()
     {
-        $candidates = [];
+        $candidates = array();
         foreach ($this->versions as $version) {
             if ($this->stable($version) || $this->development($version)) {
                 continue;
@@ -144,7 +144,7 @@ private function selectRecentUnstable()
 
     private function selectRecentAll()
     {
-        $candidates = [];
+        $candidates = array();
         foreach ($this->versions as $version) {
             if ($this->development($version)) {
                 continue;
diff --git a/tests/Humbug/Test/SelfUpdate/UpdaterGithubStrategyTest.php b/tests/Humbug/Test/SelfUpdate/UpdaterGithubStrategyTest.php
@@ -99,6 +99,10 @@ public function testSetStabilityThrowsExceptionOnInvalidStabilityValue()
      */
     public function testUpdatePhar()
     {
+        if (!extension_loaded('openssl')) {
+            $this->markTestSkipped('This test requires the openssl extension to run.');
+        }
+
         $this->createTestPharAndKey();
         $this->assertEquals('old', $this->getPharOutput($this->tmp . '/old.phar'));
 
@@ -141,19 +145,19 @@ private function createTestPharAndKey()
         );
         @mkdir($this->tmp.'/releases/download/1.0.1', 0755, true);
         copy($this->files.'/build/new.phar', $this->tmp.'/releases/download/1.0.1/new.phar');
-        file_put_contents($this->tmp . '/package.json', json_encode([
-            'package' => [
-                'versions' => [
-                    '1.0.1' => [
-                        'source' => [
+        file_put_contents($this->tmp . '/package.json', json_encode(array(
+            'package' => array(
+                'versions' => array(
+                    '1.0.1' => array(
+                        'source' => array(
                             'url' => 'file://' . $this->tmp . '.git'
-                        ]
-                    ],
-                    '1.0.0' => [
-                    ]
-                ]
-            ]
-        ]));
+                        )
+                    ),
+                    '1.0.0' => array(
+                    )
+                )
+            )
+        )));
     }
 }
 
diff --git a/tests/Humbug/Test/SelfUpdate/UpdaterTest.php b/tests/Humbug/Test/SelfUpdate/UpdaterTest.php
@@ -132,6 +132,10 @@ public function testThrowsExceptionOnInvalidRemoteVersion()
      */
     public function testUpdatePhar()
     {
+        if (!extension_loaded('openssl')) {
+            $this->markTestSkipped('This test requires the openssl extension to run.');
+        }
+
         $this->createTestPharAndKey();
         $this->assertEquals('old', $this->getPharOutput($this->tmp . '/old.phar'));
 
@@ -175,6 +179,10 @@ public function testUpdatePharFailsIfCurrentPublicKeyInvalid()
      */
     public function testUpdatePharFailsOnExpectedSignatureMismatch()
     {
+        if (!extension_loaded('openssl')) {
+            $this->markTestSkipped('This test requires the openssl extension to run.');
+        }
+
         $this->createTestPharAndKey();
         $this->assertEquals('old', $this->getPharOutput($this->tmp . '/old.phar'));
 
diff --git a/tests/Humbug/Test/SelfUpdate/VersionParserTest.php b/tests/Humbug/Test/SelfUpdate/VersionParserTest.php
@@ -20,102 +20,102 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
 
     public function testShouldSelectNothingFromUnstablesIfStableRequested()
     {
-        $versions = ['1.0.0a', '1.0.0alpha', '1.0.0-dev', 'dev-1.0.0', '1.0.0b',
-        '1.0.0beta', '1.0.0rc', '1.0.0RC'];
+        $versions = array('1.0.0a', '1.0.0alpha', '1.0.0-dev', 'dev-1.0.0', '1.0.0b',
+        '1.0.0beta', '1.0.0rc', '1.0.0RC');
         $parser = new VersionParser($versions);
         $this->assertSame(false, $parser->getMostRecentStable());
     }
-    
+
     public function testShouldSelectMostRecentVersionFromStandardSelection()
     {
-        $versions = ['1.0.0', '1.0.1', '1.1.0'];
+        $versions = array('1.0.0', '1.0.1', '1.1.0');
         $parser = new VersionParser($versions);
         $this->assertSame('1.1.0', $parser->getMostRecentStable());
     }
 
     public function testShouldSelectMostRecentVersionFromMixedSelection()
     {
-        $versions = ['1.0.0', '1.0.1', '1.1.0', '1.2.0a', '1.2.0b', '1.1.0rc'];
+        $versions = array('1.0.0', '1.0.1', '1.1.0', '1.2.0a', '1.2.0b', '1.1.0rc');
         $parser = new VersionParser($versions);
         $this->assertSame('1.1.0', $parser->getMostRecentStable());
     }
 
     public function testShouldSelectMostRecentVersionFromPrefixedSelection()
     {
-        $versions = ['v1.0.0', 'v1.0.1', 'v1.1.0'];
+        $versions = array('v1.0.0', 'v1.0.1', 'v1.1.0');
         $parser = new VersionParser($versions);
         $this->assertSame('v1.1.0', $parser->getMostRecentStable());
     }
 
     public function testShouldSelectMostRecentVersionFromPartlyPrefixedSelection()
     {
-        $versions = ['v1.0.0', 'v1.0.1', '1.1.0'];
+        $versions = array('v1.0.0', 'v1.0.1', '1.1.0');
         $parser = new VersionParser($versions);
         $this->assertSame('1.1.0', $parser->getMostRecentStable());
     }
 
     public function testShouldSelectMostRecentVersionFromPatchLevels()
     {
-        $versions = ['1.0.0', '1.0.0-pl2', '1.0.0-pl3', '1.0.0-pl1'];
+        $versions = array('1.0.0', '1.0.0-pl2', '1.0.0-pl3', '1.0.0-pl1');
         $parser = new VersionParser($versions);
         $this->assertSame('1.0.0-pl3', $parser->getMostRecentStable());
     }
 
     public function testShouldSelectMostRecentVersionFromPatchLevels2()
     {
-        $versions = ['1.0.0', '1.0.0pl2', '1.0.0pl3', '1.0.0pl1'];
+        $versions = array('1.0.0', '1.0.0pl2', '1.0.0pl3', '1.0.0pl1');
         $parser = new VersionParser($versions);
         $this->assertSame('1.0.0pl3', $parser->getMostRecentStable());
     }
 
     // Unstable
-    
+
     public function testShouldSelectNothingFromUnstablesIfUnstableRequested()
     {
-        $versions = ['1.0.0', '1.0.1', '1.1.0'];
+        $versions = array('1.0.0', '1.0.1', '1.1.0');
         $parser = new VersionParser($versions);
         $this->assertSame(false, $parser->getMostRecentUnstable());
     }
 
     public function testShouldSelectNothingFromStablesOrDevsIfUnstableRequested()
     {
-        $versions = ['1.0.0', '1.0.1', '1.1.0-dev', 'dev-1.1.1'];
+        $versions = array('1.0.0', '1.0.1', '1.1.0-dev', 'dev-1.1.1');
         $parser = new VersionParser($versions);
         $this->assertSame(false, $parser->getMostRecentUnstable());
     }
 
     public function testShouldSelectMostRecentUnstableVersionFromStandardSelection()
     {
-        $versions = ['1.0.0a', '1.0.0alpha', '1.0.0-dev', 'dev-1.0.0', '1.0.0b',
-        '1.0.0beta', '1.0.0rc', '1.0.0RC'];
+        $versions = array('1.0.0a', '1.0.0alpha', '1.0.0-dev', 'dev-1.0.0', '1.0.0b',
+        '1.0.0beta', '1.0.0rc', '1.0.0RC');
         $parser = new VersionParser($versions);
         $this->assertSame('1.0.0rc', $parser->getMostRecentUnstable());
     }
 
     public function testShouldSelectMostRecentUnstableVersionFromMixedSelection()
     {
-        $versions = ['1.0.0', '1.0.1', '1.1.0', '1.2.0a', '1.2.0b', '1.1.0rc'];
+        $versions = array('1.0.0', '1.0.1', '1.1.0', '1.2.0a', '1.2.0b', '1.1.0rc');
         $parser = new VersionParser($versions);
         $this->assertSame('1.2.0b', $parser->getMostRecentUnstable());
     }
 
     public function testShouldSelectMostRecentUnstableVersionFromPrefixedSelection()
     {
-        $versions = ['v1.0.0b', 'v1.0.1', 'v1.1.0'];
+        $versions = array('v1.0.0b', 'v1.0.1', 'v1.1.0');
         $parser = new VersionParser($versions);
         $this->assertSame('v1.0.0b', $parser->getMostRecentUnstable());
     }
 
     public function testShouldSelectMostRecentUnstableVersionFromPartlyPrefixedSelection()
     {
-        $versions = ['v1.0.0b', 'v1.0.0a', '1.1.0a'];
+        $versions = array('v1.0.0b', 'v1.0.0a', '1.1.0a');
         $parser = new VersionParser($versions);
         $this->assertSame('1.1.0a', $parser->getMostRecentUnstable());
     }
 
     public function testShouldSelectMostRecentUnstableFromVaryingNumeralCounts()
     {
-        $versions = ['1.0-dev', '1.0.0-alpha1'];
+        $versions = array('1.0-dev', '1.0.0-alpha1');
         $parser = new VersionParser($versions);
         $this->assertSame('1.0.0-alpha1', $parser->getMostRecentUnstable());
     }
@@ -124,7 +124,7 @@ public function testShouldSelectMostRecentUnstableFromVaryingNumeralCounts()
 
     public function testShouldSelectMostRecentIgnoringStabilityExceptDevFromPrefixedSelection()
     {
-        $versions = ['v1.0.0b', 'v1.0.1', 'v1.1.0a', 'v1.2.0-dev'];
+        $versions = array('v1.0.0b', 'v1.0.1', 'v1.1.0a', 'v1.2.0-dev');
         $parser = new VersionParser($versions);
         $this->assertSame('v1.1.0a', $parser->getMostRecentAll());
     }

-Original file line number
+Diff line change
     - 5.6
     - 5.5
     - 5.4
 +    - 5.3
 +    - 5.3.3
     - hhvm
     - hhvm-nightly
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`}`
`13`	`13`	`],`
`14`	`14`	`"require": {`
`15`		`- "php": ">=5.4",`
	`15`	`+ "php": ">=5.3.3",`
`16`	`16`	`"padraic/humbug_get_contents": "^1.0",`
`17`	`17`	`"symfony/finder": "~2.2"`
`18`	`18`	`},`
Original file line number	Diff line number	Diff line change
`@@ -20,102 +20,102 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase`
`20`	`20`
`21`	`21`	`public function testShouldSelectNothingFromUnstablesIfStableRequested()`
`22`	`22`	`{`
`23`		`- $versions = ['1.0.0a', '1.0.0alpha', '1.0.0-dev', 'dev-1.0.0', '1.0.0b',`
`24`		`- '1.0.0beta', '1.0.0rc', '1.0.0RC'];`
	`23`	`+ $versions = array('1.0.0a', '1.0.0alpha', '1.0.0-dev', 'dev-1.0.0', '1.0.0b',`
	`24`	`+ '1.0.0beta', '1.0.0rc', '1.0.0RC');`
`25`	`25`	`$parser = new VersionParser($versions);`
`26`	`26`	`$this->assertSame(false, $parser->getMostRecentStable());`
`27`	`27`	`}`
`28`		`-`
	`28`	`+`
`29`	`29`	`public function testShouldSelectMostRecentVersionFromStandardSelection()`
`30`	`30`	`{`
`31`		`- $versions = ['1.0.0', '1.0.1', '1.1.0'];`
	`31`	`+ $versions = array('1.0.0', '1.0.1', '1.1.0');`
`32`	`32`	`$parser = new VersionParser($versions);`
`33`	`33`	`$this->assertSame('1.1.0', $parser->getMostRecentStable());`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function testShouldSelectMostRecentVersionFromMixedSelection()`
`37`	`37`	`{`
`38`		`- $versions = ['1.0.0', '1.0.1', '1.1.0', '1.2.0a', '1.2.0b', '1.1.0rc'];`
	`38`	`+ $versions = array('1.0.0', '1.0.1', '1.1.0', '1.2.0a', '1.2.0b', '1.1.0rc');`
`39`	`39`	`$parser = new VersionParser($versions);`
`40`	`40`	`$this->assertSame('1.1.0', $parser->getMostRecentStable());`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public function testShouldSelectMostRecentVersionFromPrefixedSelection()`
`44`	`44`	`{`
`45`		`- $versions = ['v1.0.0', 'v1.0.1', 'v1.1.0'];`
	`45`	`+ $versions = array('v1.0.0', 'v1.0.1', 'v1.1.0');`
`46`	`46`	`$parser = new VersionParser($versions);`
`47`	`47`	`$this->assertSame('v1.1.0', $parser->getMostRecentStable());`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function testShouldSelectMostRecentVersionFromPartlyPrefixedSelection()`
`51`	`51`	`{`
`52`		`- $versions = ['v1.0.0', 'v1.0.1', '1.1.0'];`
	`52`	`+ $versions = array('v1.0.0', 'v1.0.1', '1.1.0');`
`53`	`53`	`$parser = new VersionParser($versions);`
`54`	`54`	`$this->assertSame('1.1.0', $parser->getMostRecentStable());`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public function testShouldSelectMostRecentVersionFromPatchLevels()`
`58`	`58`	`{`
`59`		`- $versions = ['1.0.0', '1.0.0-pl2', '1.0.0-pl3', '1.0.0-pl1'];`
	`59`	`+ $versions = array('1.0.0', '1.0.0-pl2', '1.0.0-pl3', '1.0.0-pl1');`
`60`	`60`	`$parser = new VersionParser($versions);`
`61`	`61`	`$this->assertSame('1.0.0-pl3', $parser->getMostRecentStable());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public function testShouldSelectMostRecentVersionFromPatchLevels2()`
`65`	`65`	`{`
`66`		`- $versions = ['1.0.0', '1.0.0pl2', '1.0.0pl3', '1.0.0pl1'];`
	`66`	`+ $versions = array('1.0.0', '1.0.0pl2', '1.0.0pl3', '1.0.0pl1');`
`67`	`67`	`$parser = new VersionParser($versions);`
`68`	`68`	`$this->assertSame('1.0.0pl3', $parser->getMostRecentStable());`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// Unstable`
`72`		`-`
	`72`	`+`
`73`	`73`	`public function testShouldSelectNothingFromUnstablesIfUnstableRequested()`
`74`	`74`	`{`
`75`		`- $versions = ['1.0.0', '1.0.1', '1.1.0'];`
	`75`	`+ $versions = array('1.0.0', '1.0.1', '1.1.0');`
`76`	`76`	`$parser = new VersionParser($versions);`
`77`	`77`	`$this->assertSame(false, $parser->getMostRecentUnstable());`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`public function testShouldSelectNothingFromStablesOrDevsIfUnstableRequested()`
`81`	`81`	`{`
`82`		`- $versions = ['1.0.0', '1.0.1', '1.1.0-dev', 'dev-1.1.1'];`
	`82`	`+ $versions = array('1.0.0', '1.0.1', '1.1.0-dev', 'dev-1.1.1');`
`83`	`83`	`$parser = new VersionParser($versions);`
`84`	`84`	`$this->assertSame(false, $parser->getMostRecentUnstable());`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public function testShouldSelectMostRecentUnstableVersionFromStandardSelection()`
`88`	`88`	`{`
`89`		`- $versions = ['1.0.0a', '1.0.0alpha', '1.0.0-dev', 'dev-1.0.0', '1.0.0b',`
`90`		`- '1.0.0beta', '1.0.0rc', '1.0.0RC'];`
	`89`	`+ $versions = array('1.0.0a', '1.0.0alpha', '1.0.0-dev', 'dev-1.0.0', '1.0.0b',`
	`90`	`+ '1.0.0beta', '1.0.0rc', '1.0.0RC');`
`91`	`91`	`$parser = new VersionParser($versions);`
`92`	`92`	`$this->assertSame('1.0.0rc', $parser->getMostRecentUnstable());`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public function testShouldSelectMostRecentUnstableVersionFromMixedSelection()`
`96`	`96`	`{`
`97`		`- $versions = ['1.0.0', '1.0.1', '1.1.0', '1.2.0a', '1.2.0b', '1.1.0rc'];`
	`97`	`+ $versions = array('1.0.0', '1.0.1', '1.1.0', '1.2.0a', '1.2.0b', '1.1.0rc');`
`98`	`98`	`$parser = new VersionParser($versions);`
`99`	`99`	`$this->assertSame('1.2.0b', $parser->getMostRecentUnstable());`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`public function testShouldSelectMostRecentUnstableVersionFromPrefixedSelection()`
`103`	`103`	`{`
`104`		`- $versions = ['v1.0.0b', 'v1.0.1', 'v1.1.0'];`
	`104`	`+ $versions = array('v1.0.0b', 'v1.0.1', 'v1.1.0');`
`105`	`105`	`$parser = new VersionParser($versions);`
`106`	`106`	`$this->assertSame('v1.0.0b', $parser->getMostRecentUnstable());`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`public function testShouldSelectMostRecentUnstableVersionFromPartlyPrefixedSelection()`
`110`	`110`	`{`
`111`		`- $versions = ['v1.0.0b', 'v1.0.0a', '1.1.0a'];`
	`111`	`+ $versions = array('v1.0.0b', 'v1.0.0a', '1.1.0a');`
`112`	`112`	`$parser = new VersionParser($versions);`
`113`	`113`	`$this->assertSame('1.1.0a', $parser->getMostRecentUnstable());`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`public function testShouldSelectMostRecentUnstableFromVaryingNumeralCounts()`
`117`	`117`	`{`
`118`		`- $versions = ['1.0-dev', '1.0.0-alpha1'];`
	`118`	`+ $versions = array('1.0-dev', '1.0.0-alpha1');`
`119`	`119`	`$parser = new VersionParser($versions);`
`120`	`120`	`$this->assertSame('1.0.0-alpha1', $parser->getMostRecentUnstable());`
`121`	`121`	`}`
`@@ -124,7 +124,7 @@ public function testShouldSelectMostRecentUnstableFromVaryingNumeralCounts()`
`124`	`124`
`125`	`125`	`public function testShouldSelectMostRecentIgnoringStabilityExceptDevFromPrefixedSelection()`
`126`	`126`	`{`
`127`		`- $versions = ['v1.0.0b', 'v1.0.1', 'v1.1.0a', 'v1.2.0-dev'];`
	`127`	`+ $versions = array('v1.0.0b', 'v1.0.1', 'v1.1.0a', 'v1.2.0-dev');`
`128`	`128`	`$parser = new VersionParser($versions);`
`129`	`129`	`$this->assertSame('v1.1.0a', $parser->getMostRecentAll());`
`130`	`130`	`}`