Merge pull request #64 from duxthefux/laravel-8

publiux · web-flow · commit 686b75bb39a9 · 2020-12-14T13:06:57.000-05:00
Added support for Laravel 8
diff --git a/composer.json b/composer.json
@@ -21,15 +21,15 @@
     ],
     "require": {
         "php": ">=5.5.9",
-      "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|^6|^7",
-      "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|^6|^7",
-      "symfony/finder": "2.*|3.*|4.*|5.*",
-      "symfony/console": "2.*|3.*|4.*|5.*",
+      "illuminate/support": "^8",
+      "illuminate/config": "^8",
+      "symfony/finder": "^5",
+      "symfony/console": "^5",
       "aws/aws-sdk-php": "~3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "mockery/mockery": "0.9.3"
+        "phpunit/phpunit": "^9.0",
+        "mockery/mockery": "1.4.2"
     },
     "autoload": {
         "classmap": [
diff --git a/tests/Publiux/laravelcdn/AssetTest.php b/tests/Publiux/laravelcdn/AssetTest.php
@@ -37,7 +37,7 @@ public function testInitReturningAssetObject()
         ]);
 
         // check the returned object is of type Publiux\laravelcdn\Asset
-        assertEquals($result, $this->asset);
+        $this->assertEquals($result, $this->asset);
     }
 
     public function testIncludedDirectories()
@@ -52,7 +52,7 @@ public function testIncludedDirectories()
 
         $result = $this->asset->getIncludedDirectories();
 
-        assertEquals($result, $dir);
+        $this->assertEquals($result, $dir);
     }
 
     public function testIncludedExtensions()
@@ -67,7 +67,7 @@ public function testIncludedExtensions()
 
         $result = $this->asset->getIncludedExtensions();
 
-        assertEquals($result, $ext);
+        $this->assertEquals($result, $ext);
     }
 
     public function testIncludedPatterns()
@@ -82,7 +82,7 @@ public function testIncludedPatterns()
 
         $result = $this->asset->getIncludedPatterns();
 
-        assertEquals($result, $pat);
+        $this->assertEquals($result, $pat);
     }
 
     public function testExcludedDirectories()
@@ -97,7 +97,7 @@ public function testExcludedDirectories()
 
         $result = $this->asset->getExcludedDirectories();
 
-        assertEquals($result, $dir);
+        $this->assertEquals($result, $dir);
     }
 
     public function testExcludedFiles()
@@ -112,7 +112,7 @@ public function testExcludedFiles()
 
         $result = $this->asset->getExcludedFiles();
 
-        assertEquals($result, $dir);
+        $this->assertEquals($result, $dir);
     }
 
     public function testExcludedExtensions()
@@ -127,7 +127,7 @@ public function testExcludedExtensions()
 
         $result = $this->asset->getExcludedExtensions();
 
-        assertEquals($result, $dir);
+        $this->assertEquals($result, $dir);
     }
 
     public function testExcludedPatterns()
@@ -142,7 +142,7 @@ public function testExcludedPatterns()
 
         $result = $this->asset->getExcludedPatterns();
 
-        assertEquals($result, $dir);
+        $this->assertEquals($result, $dir);
     }
 
     public function testExcludedHidden()
@@ -157,6 +157,6 @@ public function testExcludedHidden()
 
         $result = $this->asset->getExcludeHidden();
 
-        assertEquals($result, $bol);
+        $this->assertEquals($result, $bol);
     }
 }
diff --git a/tests/Publiux/laravelcdn/CdnFacadeTest.php b/tests/Publiux/laravelcdn/CdnFacadeTest.php
@@ -87,7 +87,7 @@ public function testAssetIsCallingUrlGenerator()
 
         $result = $this->facade->asset($this->asset_path);
         // assert is calling the url generator
-        assertEquals($result, $this->asset_url);
+        $this->assertEquals($result, $this->asset_url);
     }
 
     public function testPathIsCallingUrlGenerator()
@@ -98,7 +98,7 @@ public function testPathIsCallingUrlGenerator()
 
         $result = $this->facade->asset($this->path_path);
         // assert is calling the url generator
-        assertEquals($result, $this->asset_url);
+        $this->assertEquals($result, $this->asset_url);
     }
 
     /**
diff --git a/tests/Publiux/laravelcdn/CdnTest.php b/tests/Publiux/laravelcdn/CdnTest.php
@@ -69,7 +69,7 @@ public function testPushCommandReturnTrue()
 
         $result = $this->cdn->push();
 
-        assertEquals($result, true);
+        $this->assertEquals($result, true);
     }
 
     /**
@@ -153,7 +153,7 @@ public function testPushCommand()
             ->andReturn(__DIR__.'/AwsS3ProviderTest.php');
 
         // partial mock
-        $p_aws_s3_provider = M::mock('\Publiux\laravelcdn\Providers\AwsS3Provider[connect]', 
+        $p_aws_s3_provider = M::mock('\Publiux\laravelcdn\Providers\AwsS3Provider[connect]',
         [
             $m_console,
             $m_validator,
@@ -185,6 +185,6 @@ public function testPushCommand()
 
         $result = $cdn->push();
 
-        assertEquals($result, true);
+        $this->assertEquals($result, true);
     }
 }
diff --git a/tests/Publiux/laravelcdn/FinderTest.php b/tests/Publiux/laravelcdn/FinderTest.php
@@ -43,9 +43,9 @@ public function testReadReturnCorrectDataType()
 
         $result = $finder->read($asset_holder);
 
-        assertInstanceOf('Symfony\Component\Finder\SplFileInfo', $result->first());
+        $this->assertInstanceOf('Symfony\Component\Finder\SplFileInfo', $result->first());
 
-        assertEquals($result, new Collection($result->all()));
+        $this->assertEquals($result, new Collection($result->all()));
     }
 
     /**
diff --git a/tests/Publiux/laravelcdn/ProviderFactoryTest.php b/tests/Publiux/laravelcdn/ProviderFactoryTest.php
@@ -41,7 +41,7 @@ public function testCreateReturnCorrectProviderObject()
 
         $provider = $this->provider_factory->create($configurations);
 
-        assertEquals($provider, $m_aws_s3);
+        $this->assertEquals($provider, $m_aws_s3);
     }
 
     /**
diff --git a/tests/Publiux/laravelcdn/Providers/AwsS3ProviderTest.php b/tests/Publiux/laravelcdn/Providers/AwsS3ProviderTest.php
@@ -95,7 +95,7 @@ public function testInitializingObject()
 
         $awsS3Provider_obj = $this->p_awsS3Provider->init($configurations);
 
-        assertInstanceOf('Publiux\laravelcdn\Providers\AwsS3Provider', $awsS3Provider_obj);
+        $this->assertInstanceOf('Publiux\laravelcdn\Providers\AwsS3Provider', $awsS3Provider_obj);
     }
 
     public function testUploadingAssets()
@@ -131,7 +131,7 @@ public function testUploadingAssets()
 
         $result = $this->p_awsS3Provider->upload(new Collection([$this->m_spl_file]));
 
-        assertEquals(true, $result);
+        $this->assertEquals(true, $result);
     }
 
     public function testUrlGenerator()
@@ -167,7 +167,7 @@ public function testUrlGenerator()
 
         $result = $this->p_awsS3Provider->urlGenerator($this->path);
 
-        assertEquals($this->cdn_url, $result);
+        $this->assertEquals($this->cdn_url, $result);
     }
 
     public function testEmptyUrlGenerator()
@@ -203,6 +203,6 @@ public function testEmptyUrlGenerator()
 
         $result = $this->p_awsS3Provider->urlGenerator($this->path);
 
-        assertEquals($this->path_url, $result);
+        $this->assertEquals($this->path_url, $result);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function testInitReturningAssetObject()`
`37`	`37`	`]);`
`38`	`38`
`39`	`39`	`// check the returned object is of type Publiux\laravelcdn\Asset`
`40`		`- assertEquals($result, $this->asset);`
	`40`	`+ $this->assertEquals($result, $this->asset);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public function testIncludedDirectories()`
`@@ -52,7 +52,7 @@ public function testIncludedDirectories()`
`52`	`52`
`53`	`53`	`$result = $this->asset->getIncludedDirectories();`
`54`	`54`
`55`		`- assertEquals($result, $dir);`
	`55`	`+ $this->assertEquals($result, $dir);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function testIncludedExtensions()`
`@@ -67,7 +67,7 @@ public function testIncludedExtensions()`
`67`	`67`
`68`	`68`	`$result = $this->asset->getIncludedExtensions();`
`69`	`69`
`70`		`- assertEquals($result, $ext);`
	`70`	`+ $this->assertEquals($result, $ext);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public function testIncludedPatterns()`
`@@ -82,7 +82,7 @@ public function testIncludedPatterns()`
`82`	`82`
`83`	`83`	`$result = $this->asset->getIncludedPatterns();`
`84`	`84`
`85`		`- assertEquals($result, $pat);`
	`85`	`+ $this->assertEquals($result, $pat);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public function testExcludedDirectories()`
`@@ -97,7 +97,7 @@ public function testExcludedDirectories()`
`97`	`97`
`98`	`98`	`$result = $this->asset->getExcludedDirectories();`
`99`	`99`
`100`		`- assertEquals($result, $dir);`
	`100`	`+ $this->assertEquals($result, $dir);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public function testExcludedFiles()`
`@@ -112,7 +112,7 @@ public function testExcludedFiles()`
`112`	`112`
`113`	`113`	`$result = $this->asset->getExcludedFiles();`
`114`	`114`
`115`		`- assertEquals($result, $dir);`
	`115`	`+ $this->assertEquals($result, $dir);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`public function testExcludedExtensions()`
`@@ -127,7 +127,7 @@ public function testExcludedExtensions()`
`127`	`127`
`128`	`128`	`$result = $this->asset->getExcludedExtensions();`
`129`	`129`
`130`		`- assertEquals($result, $dir);`
	`130`	`+ $this->assertEquals($result, $dir);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`public function testExcludedPatterns()`
`@@ -142,7 +142,7 @@ public function testExcludedPatterns()`
`142`	`142`
`143`	`143`	`$result = $this->asset->getExcludedPatterns();`
`144`	`144`
`145`		`- assertEquals($result, $dir);`
	`145`	`+ $this->assertEquals($result, $dir);`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`public function testExcludedHidden()`
`@@ -157,6 +157,6 @@ public function testExcludedHidden()`
`157`	`157`
`158`	`158`	`$result = $this->asset->getExcludeHidden();`
`159`	`159`
`160`		`- assertEquals($result, $bol);`
	`160`	`+ $this->assertEquals($result, $bol);`
`161`	`161`	`}`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function testAssetIsCallingUrlGenerator()`
`87`	`87`
`88`	`88`	`$result = $this->facade->asset($this->asset_path);`
`89`	`89`	`// assert is calling the url generator`
`90`		`- assertEquals($result, $this->asset_url);`
	`90`	`+ $this->assertEquals($result, $this->asset_url);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public function testPathIsCallingUrlGenerator()`
`@@ -98,7 +98,7 @@ public function testPathIsCallingUrlGenerator()`
`98`	`98`
`99`	`99`	`$result = $this->facade->asset($this->path_path);`
`100`	`100`	`// assert is calling the url generator`
`101`		`- assertEquals($result, $this->asset_url);`
	`101`	`+ $this->assertEquals($result, $this->asset_url);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function testPushCommandReturnTrue()`
`69`	`69`
`70`	`70`	`$result = $this->cdn->push();`
`71`	`71`
`72`		`- assertEquals($result, true);`
	`72`	`+ $this->assertEquals($result, true);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
`@@ -153,7 +153,7 @@ public function testPushCommand()`
`153`	`153`	`->andReturn(__DIR__.'/AwsS3ProviderTest.php');`
`154`	`154`
`155`	`155`	`// partial mock`
`156`		`- $p_aws_s3_provider = M::mock('\Publiux\laravelcdn\Providers\AwsS3Provider[connect]',`
	`156`	`+ $p_aws_s3_provider = M::mock('\Publiux\laravelcdn\Providers\AwsS3Provider[connect]',`
`157`	`157`	`[`
`158`	`158`	`$m_console,`
`159`	`159`	`$m_validator,`
`@@ -185,6 +185,6 @@ public function testPushCommand()`
`185`	`185`
`186`	`186`	`$result = $cdn->push();`
`187`	`187`
`188`		`- assertEquals($result, true);`
	`188`	`+ $this->assertEquals($result, true);`
`189`	`189`	`}`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ public function testReadReturnCorrectDataType()`
`43`	`43`
`44`	`44`	`$result = $finder->read($asset_holder);`
`45`	`45`
`46`		`- assertInstanceOf('Symfony\Component\Finder\SplFileInfo', $result->first());`
	`46`	`+ $this->assertInstanceOf('Symfony\Component\Finder\SplFileInfo', $result->first());`
`47`	`47`
`48`		`- assertEquals($result, new Collection($result->all()));`
	`48`	`+ $this->assertEquals($result, new Collection($result->all()));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function testCreateReturnCorrectProviderObject()`
`41`	`41`
`42`	`42`	`$provider = $this->provider_factory->create($configurations);`
`43`	`43`
`44`		`- assertEquals($provider, $m_aws_s3);`
	`44`	`+ $this->assertEquals($provider, $m_aws_s3);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function testInitializingObject()`
`95`	`95`
`96`	`96`	`$awsS3Provider_obj = $this->p_awsS3Provider->init($configurations);`
`97`	`97`
`98`		`- assertInstanceOf('Publiux\laravelcdn\Providers\AwsS3Provider', $awsS3Provider_obj);`
	`98`	`+ $this->assertInstanceOf('Publiux\laravelcdn\Providers\AwsS3Provider', $awsS3Provider_obj);`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`public function testUploadingAssets()`
`@@ -131,7 +131,7 @@ public function testUploadingAssets()`
`131`	`131`
`132`	`132`	`$result = $this->p_awsS3Provider->upload(new Collection([$this->m_spl_file]));`
`133`	`133`
`134`		`- assertEquals(true, $result);`
	`134`	`+ $this->assertEquals(true, $result);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`public function testUrlGenerator()`
`@@ -167,7 +167,7 @@ public function testUrlGenerator()`
`167`	`167`
`168`	`168`	`$result = $this->p_awsS3Provider->urlGenerator($this->path);`
`169`	`169`
`170`		`- assertEquals($this->cdn_url, $result);`
	`170`	`+ $this->assertEquals($this->cdn_url, $result);`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`public function testEmptyUrlGenerator()`
`@@ -203,6 +203,6 @@ public function testEmptyUrlGenerator()`
`203`	`203`
`204`	`204`	`$result = $this->p_awsS3Provider->urlGenerator($this->path);`
`205`	`205`
`206`		`- assertEquals($this->path_url, $result);`
	`206`	`+ $this->assertEquals($this->path_url, $result);`
`207`	`207`	`}`
`208`	`208`	`}`