Skip to content

Commit 0d7b36a

Browse files
authored
Merge pull request #177 from bupy7/master
AsseticBundle\CacheBuster\Null has deprecated
2 parents e61b0db + 7b63bf1 commit 0d7b36a

File tree

2 files changed

+34
-6
lines changed

2 files changed

+34
-6
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
namespace AsseticBundle\CacheBuster;
4+
5+
use Assetic\Asset\AssetInterface,
6+
Assetic\Factory\Worker\WorkerInterface,
7+
Assetic\Factory\AssetFactory;
8+
9+
class NoCache implements WorkerInterface
10+
{
11+
public function process(AssetInterface $asset, AssetFactory $factory)
12+
{
13+
}
14+
}

src/AsseticBundle/CacheBuster/Null.php

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,27 @@
22

33
namespace AsseticBundle\CacheBuster;
44

5-
use Assetic\Asset\AssetInterface,
6-
Assetic\Factory\Worker\WorkerInterface,
7-
Assetic\Factory\AssetFactory;
8-
9-
class Null implements WorkerInterface
5+
/**
6+
* Stub class for backwards compatibility.
7+
*
8+
* Since PHP 7 adds "null" as a reserved keyword, we can no longer have a class
9+
* named that and retain PHP 7 compatibility. The original class has been
10+
* renamed to "NoCache", and this class is now an extension of it. It raises an
11+
* E_USER_DEPRECATED to warn users to migrate.
12+
*
13+
* @deprecated
14+
*/
15+
class Null extends NoCache
1016
{
11-
public function process(AssetInterface $asset, AssetFactory $factory)
17+
public function __construct()
1218
{
19+
trigger_error(
20+
sprintf(
21+
'The class %s has been deprecated; please use %s\\NoCache',
22+
__CLASS__,
23+
__NAMESPACE__
24+
),
25+
E_USER_DEPRECATED
26+
);
1327
}
1428
}

0 commit comments

Comments
 (0)