Skip to content

Commit db19628

Browse files
committed
Stop using Resource as a class name, as 'resource' is reserved
1 parent b783b8e commit db19628

File tree

8 files changed

+15
-14
lines changed

8 files changed

+15
-14
lines changed

src/Dispatch.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ public function setHashSalt(string $hashSalt)
8080
* Generate a hash against specific content, for a desired length
8181
*
8282
* @param $content
83-
* @param null $length
83+
* @param int $length
8484
*
8585
* @return string
8686
*/
87-
public function generateHash($content, $length = null)
87+
public function generateHash($content, int $length = null)
8888
{
8989
$hash = md5($content . $this->_hashSalt);
9090
if($length !== null)

src/Resources/AbstractDispatchableResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function setProcessingPath($path)
3232
*
3333
* @param $content
3434
*
35-
* @return Resource
35+
* @return DispatchResource
3636
*/
3737
public function setContent($content)
3838
{

src/Resources/AbstractResource.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Packaged\Dispatch\Resources;
33

4-
abstract class AbstractResource implements Resource
4+
abstract class AbstractResource implements DispatchResource
55
{
66
protected $_content;
77
protected $_options;
@@ -23,7 +23,7 @@ public function getContent()
2323
*
2424
* @param $content
2525
*
26-
* @return Resource
26+
* @return AbstractResource
2727
*/
2828
public function setContent($content)
2929
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Packaged\Dispatch\Resources;
33

4-
interface Resource
4+
interface DispatchResource
55
{
66
public function getExtension();
77

src/Resources/DispatchableResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use Packaged\Dispatch\ResourceManager;
55

6-
interface DispatchableResource extends Resource
6+
interface DispatchableResource extends DispatchResource
77
{
88
/**
99
* Set the asset manager to process sub dispatchables through

src/Resources/JavascriptResource.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ protected function _minify()
6565
}
6666
catch(\Exception $e)
6767
{
68+
//If minification doesnt work, return the original content
6869
}
6970
}
7071
}

src/Resources/ResourceFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ public static function addExtension($ext, $classname)
7373
/**
7474
* @param $extension
7575
*
76-
* @return Resource
76+
* @return DispatchResource
7777
*/
78-
public static function getExtensionResource($extension): Resource
78+
public static function getExtensionResource($extension): DispatchResource
7979
{
8080
$extension = strtolower($extension);
8181
if(isset(self::$_resourceMap[$extension]))
@@ -86,12 +86,12 @@ public static function getExtensionResource($extension): Resource
8686
}
8787

8888
/**
89-
* @param Resource $resource
89+
* @param DispatchResource $resource
9090
*
9191
* @return Response
9292
* @throws \Exception
9393
*/
94-
public static function create(Resource $resource)
94+
public static function create(DispatchResource $resource)
9595
{
9696
$response = new Response();
9797

tests/Resources/GenericResourceTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
namespace Packaged\Dispatch\Tests\Resources;
33

44
use Packaged\Dispatch\Resources\AbstractResource;
5-
use Packaged\Dispatch\Resources\Resource;
5+
use Packaged\Dispatch\Resources\DispatchResource;
66
use Packaged\Dispatch\Resources\ResourceFactory;
77
use Packaged\Dispatch\Resources\UnknownResource;
88
use PHPUnit\Framework\TestCase;
@@ -13,9 +13,9 @@ class GenericResourceTest extends TestCase
1313
* @dataProvider resourceProvider
1414
*
1515
* @param $ext
16-
* @param Resource $class
16+
* @param DispatchResource $class
1717
*/
18-
public function testResource($ext, Resource $class)
18+
public function testResource($ext, DispatchResource $class)
1919
{
2020
$extType = [
2121
"ico" => "image/x-icon",

0 commit comments

Comments
 (0)