Skip to content

Commit 0168359

Browse files
author
Mario Blazek
committed
Null handler changed to NoCache
1 parent bbdb690 commit 0168359

10 files changed

Lines changed: 42 additions & 44 deletions

Cache/Null.php renamed to Cache/NoCache.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace Netgen\Bundle\OpenWeatherMapBundle\Cache;
44

55
/**
6-
* Class Null
6+
* Class NoCache
77
* @package Netgen\Bundle\OpenWeatherMapBundle\Cache
88
*/
9-
class Null implements HandlerInterface
9+
class NoCache implements HandlerInterface
1010
{
1111
/**
1212
* @inheritDoc

‎Resources/config/services.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ parameters:
99
# END of OpenWeatherMap services
1010

1111
# Cache services
12-
netgen_open_weather_map.cache_handler.null.class: Netgen\Bundle\OpenWeatherMapBundle\Cache\Null
12+
netgen_open_weather_map.cache_handler.null.class: Netgen\Bundle\OpenWeatherMapBundle\Cache\NoCache
1313
netgen_open_weather_map.cache_handler.memcached.class: Netgen\Bundle\OpenWeatherMapBundle\Cache\Memcached
1414
netgen_open_weather_map.cache_handler.stash.class: Netgen\Bundle\OpenWeatherMapBundle\Cache\Stash
1515
netgen_open_weather_map.cache_handler.class: Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface

‎Tests/Cache/NullTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
namespace Netgen\Bundle\OpenWeatherMapBundle\Tests\Cache;
44

55
use Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface;
6-
use Netgen\Bundle\OpenWeatherMapBundle\Cache\Null;
6+
use Netgen\Bundle\OpenWeatherMapBundle\Cache\NoCache;
77

88
class NullTest extends \PHPUnit_Framework_TestCase
99
{
1010
public function testInstanceOfHandlerInterface()
1111
{
12-
$this->assertInstanceOf(HandlerInterface::class, new Null());
12+
$this->assertInstanceOf(HandlerInterface::class, new NoCache());
1313
}
1414

1515
public function testHasMethodMustAlwaysReturnFalse()
1616
{
17-
$nullHandler = new Null();
17+
$nullHandler = new NoCache();
1818

1919
$this->assertFalse($nullHandler->has('some_key'));
2020
$this->assertFalse($nullHandler->has('test'));
@@ -23,7 +23,7 @@ public function testHasMethodMustAlwaysReturnFalse()
2323

2424
public function testGetMethodMustAlwaysReturnFalse()
2525
{
26-
$nullHandler = new Null();
26+
$nullHandler = new NoCache();
2727

2828
$this->assertFalse($nullHandler->get('some_key'));
2929
$this->assertFalse($nullHandler->get('test'));
@@ -32,7 +32,7 @@ public function testGetMethodMustAlwaysReturnFalse()
3232

3333
public function testSetMethodShouldDoNothing()
3434
{
35-
$nullHandler = new Null();
35+
$nullHandler = new NoCache();
3636

3737
$nullHandler->set('some_key', 'data', 120);
3838
$nullHandler->set('test', 'data', 1000);

‎Tests/Core/AirPollutionTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Netgen\Bundle\OpenWeatherMapBundle\API\OpenWeatherMap\Weather\AirPollutionInterface;
66
use Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface;
7-
use Netgen\Bundle\OpenWeatherMapBundle\Cache\Null;
7+
use Netgen\Bundle\OpenWeatherMapBundle\Cache\NoCache;
88
use Netgen\Bundle\OpenWeatherMapBundle\Core\AirPollution;
99
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClient;
1010
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClientInterface;
@@ -24,7 +24,7 @@ public function testInstanceOfAirPollutionInterface()
2424

2525
public function testFetchOzoneDataFromCache()
2626
{
27-
$cacheHandler = $this->getMockBuilder(Null::class)
27+
$cacheHandler = $this->getMockBuilder(NoCache::class)
2828
->disableOriginalConstructor()
2929
->setMethods(array('has', 'get'))
3030
->getMock();
@@ -48,7 +48,7 @@ public function testFetchOzoneDataFromCache()
4848

4949
public function testFetchOzoneDataFromRemoteService()
5050
{
51-
$cacheHandler = $this->getMockBuilder(Null::class)
51+
$cacheHandler = $this->getMockBuilder(NoCache::class)
5252
->disableOriginalConstructor()
5353
->setMethods(array('has', 'set'))
5454
->getMock();
@@ -87,7 +87,7 @@ public function testFetchOzoneDataFromRemoteService()
8787
*/
8888
public function testFetchOzoneDataWhenRequestIsNotAuthorized()
8989
{
90-
$cacheHandler = $this->getMockBuilder(Null::class)
90+
$cacheHandler = $this->getMockBuilder(NoCache::class)
9191
->disableOriginalConstructor()
9292
->setMethods(array('has'))
9393
->getMock();
@@ -116,7 +116,7 @@ public function testFetchOzoneDataWhenRequestIsNotAuthorized()
116116
*/
117117
public function testFetchOzoneDataWhenRequestIsNotOk()
118118
{
119-
$cacheHandler = $this->getMockBuilder(Null::class)
119+
$cacheHandler = $this->getMockBuilder(NoCache::class)
120120
->disableOriginalConstructor()
121121
->setMethods(array('has'))
122122
->getMock();
@@ -142,7 +142,7 @@ public function testFetchOzoneDataWhenRequestIsNotOk()
142142

143143
public function testFetchCarbonMonoxideDataFromCache()
144144
{
145-
$cacheHandler = $this->getMockBuilder(Null::class)
145+
$cacheHandler = $this->getMockBuilder(NoCache::class)
146146
->disableOriginalConstructor()
147147
->setMethods(array('has', 'get'))
148148
->getMock();
@@ -166,7 +166,7 @@ public function testFetchCarbonMonoxideDataFromCache()
166166

167167
public function testFetchCarbonMonoxideDataFromRemoteService()
168168
{
169-
$cacheHandler = $this->getMockBuilder(Null::class)
169+
$cacheHandler = $this->getMockBuilder(NoCache::class)
170170
->disableOriginalConstructor()
171171
->setMethods(array('has', 'set'))
172172
->getMock();

‎Tests/Core/DailyForecastTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Netgen\Bundle\OpenWeatherMapBundle\API\OpenWeatherMap\Weather\DailyForecastInterface;
66
use Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface;
7-
use Netgen\Bundle\OpenWeatherMapBundle\Cache\Null;
7+
use Netgen\Bundle\OpenWeatherMapBundle\Cache\NoCache;
88
use Netgen\Bundle\OpenWeatherMapBundle\Core\DailyForecast;
99
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClient;
1010
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClientInterface;
@@ -24,7 +24,7 @@ public function testInstanceOfDailyForecastInterface()
2424

2525
public function testFetchForecastByCityName()
2626
{
27-
$cacheHandler = $this->getMockBuilder(Null::class)
27+
$cacheHandler = $this->getMockBuilder(NoCache::class)
2828
->disableOriginalConstructor()
2929
->setMethods(array('has', 'set'))
3030
->getMock();
@@ -54,7 +54,7 @@ public function testFetchForecastByCityName()
5454

5555
public function testFetchForecastByCityNameWithoutCountryCode()
5656
{
57-
$cacheHandler = $this->getMockBuilder(Null::class)
57+
$cacheHandler = $this->getMockBuilder(NoCache::class)
5858
->disableOriginalConstructor()
5959
->setMethods(array('has', 'set'))
6060
->getMock();
@@ -84,7 +84,7 @@ public function testFetchForecastByCityNameWithoutCountryCode()
8484

8585
public function testFetchForecastByCityId()
8686
{
87-
$cacheHandler = $this->getMockBuilder(Null::class)
87+
$cacheHandler = $this->getMockBuilder(NoCache::class)
8888
->disableOriginalConstructor()
8989
->setMethods(array('has', 'set'))
9090
->getMock();
@@ -114,7 +114,7 @@ public function testFetchForecastByCityId()
114114

115115
public function testFetchForecastByCityGeographicCoordinates()
116116
{
117-
$cacheHandler = $this->getMockBuilder(Null::class)
117+
$cacheHandler = $this->getMockBuilder(NoCache::class)
118118
->disableOriginalConstructor()
119119
->setMethods(array('has', 'set'))
120120
->getMock();

‎Tests/Core/HourForecastTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Netgen\Bundle\OpenWeatherMapBundle\API\OpenWeatherMap\Weather\HourForecastInterface;
66
use Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface;
7-
use Netgen\Bundle\OpenWeatherMapBundle\Cache\Null;
7+
use Netgen\Bundle\OpenWeatherMapBundle\Cache\NoCache;
88
use Netgen\Bundle\OpenWeatherMapBundle\Core\HourForecast;
99
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClient;
1010
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClientInterface;
@@ -24,7 +24,7 @@ public function testInstanceOfHourForecastInterface()
2424

2525
public function testFetchForecastByCityName()
2626
{
27-
$cacheHandler = $this->getMockBuilder(Null::class)
27+
$cacheHandler = $this->getMockBuilder(NoCache::class)
2828
->disableOriginalConstructor()
2929
->setMethods(array('has', 'set'))
3030
->getMock();
@@ -54,7 +54,7 @@ public function testFetchForecastByCityName()
5454

5555
public function testFetchForecastByCityNameWithoutCountryCode()
5656
{
57-
$cacheHandler = $this->getMockBuilder(Null::class)
57+
$cacheHandler = $this->getMockBuilder(NoCache::class)
5858
->disableOriginalConstructor()
5959
->setMethods(array('has', 'set'))
6060
->getMock();
@@ -84,7 +84,7 @@ public function testFetchForecastByCityNameWithoutCountryCode()
8484

8585
public function testFetchForecastByCityId()
8686
{
87-
$cacheHandler = $this->getMockBuilder(Null::class)
87+
$cacheHandler = $this->getMockBuilder(NoCache::class)
8888
->disableOriginalConstructor()
8989
->setMethods(array('has', 'set'))
9090
->getMock();
@@ -114,7 +114,7 @@ public function testFetchForecastByCityId()
114114

115115
public function testFetchForecastByCityGeographicCoordinates()
116116
{
117-
$cacheHandler = $this->getMockBuilder(Null::class)
117+
$cacheHandler = $this->getMockBuilder(NoCache::class)
118118
->disableOriginalConstructor()
119119
->setMethods(array('has', 'set'))
120120
->getMock();

‎Tests/Core/UltravioletIndexTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Netgen\Bundle\OpenWeatherMapBundle\API\OpenWeatherMap\Weather\UltravioletIndexInterface;
66
use Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface;
7-
use Netgen\Bundle\OpenWeatherMapBundle\Cache\Null;
7+
use Netgen\Bundle\OpenWeatherMapBundle\Cache\NoCache;
88
use Netgen\Bundle\OpenWeatherMapBundle\Core\UltravioletIndex;
99
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClient;
1010
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClientInterface;
@@ -24,7 +24,7 @@ public function testInstanceOfUltravioletIndexInterface()
2424

2525
public function testFetchUltravioletIndex()
2626
{
27-
$cacheHandler = $this->getMockBuilder(Null::class)
27+
$cacheHandler = $this->getMockBuilder(NoCache::class)
2828
->disableOriginalConstructor()
2929
->setMethods(array('has', 'set'))
3030
->getMock();
@@ -54,7 +54,7 @@ public function testFetchUltravioletIndex()
5454

5555
public function testFetchUltravioletIndexWithDate()
5656
{
57-
$cacheHandler = $this->getMockBuilder(Null::class)
57+
$cacheHandler = $this->getMockBuilder(NoCache::class)
5858
->disableOriginalConstructor()
5959
->setMethods(array('has', 'set'))
6060
->getMock();

‎Tests/Core/WeatherStationsTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Netgen\Bundle\OpenWeatherMapBundle\API\OpenWeatherMap\Weather\WeatherStationsInterface;
66
use Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface;
7-
use Netgen\Bundle\OpenWeatherMapBundle\Cache\Null;
7+
use Netgen\Bundle\OpenWeatherMapBundle\Cache\NoCache;
88
use Netgen\Bundle\OpenWeatherMapBundle\Core\WeatherStations;
99
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClient;
1010
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClientInterface;
@@ -24,7 +24,7 @@ public function testInstanceOfWeatherStationsInterface()
2424

2525
public function testFetchFromOnStationById()
2626
{
27-
$cacheHandler = $this->getMockBuilder(Null::class)
27+
$cacheHandler = $this->getMockBuilder(NoCache::class)
2828
->disableOriginalConstructor()
2929
->setMethods(array('has', 'set'))
3030
->getMock();
@@ -54,7 +54,7 @@ public function testFetchFromOnStationById()
5454

5555
public function testFetchFromSeveralByRectangleZone()
5656
{
57-
$cacheHandler = $this->getMockBuilder(Null::class)
57+
$cacheHandler = $this->getMockBuilder(NoCache::class)
5858
->disableOriginalConstructor()
5959
->setMethods(array('has', 'set'))
6060
->getMock();
@@ -88,7 +88,7 @@ public function testFetchFromSeveralByRectangleZone()
8888

8989
public function testFetchFromSeveralByGeoPoint()
9090
{
91-
$cacheHandler = $this->getMockBuilder(Null::class)
91+
$cacheHandler = $this->getMockBuilder(NoCache::class)
9292
->disableOriginalConstructor()
9393
->setMethods(array('has', 'set'))
9494
->getMock();

‎Tests/Core/WeatherTest.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Netgen\Bundle\OpenWeatherMapBundle\API\OpenWeatherMap\Weather\WeatherInterface;
66
use Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface;
7-
use Netgen\Bundle\OpenWeatherMapBundle\Cache\Null;
7+
use Netgen\Bundle\OpenWeatherMapBundle\Cache\NoCache;
88
use Netgen\Bundle\OpenWeatherMapBundle\Core\Weather;
99
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClient;
1010
use Netgen\Bundle\OpenWeatherMapBundle\Http\HttpClientInterface;
@@ -24,7 +24,7 @@ public function testInstanceOfWeatherInterface()
2424

2525
public function testFetchForecastByCityName()
2626
{
27-
$cacheHandler = $this->getMockBuilder(Null::class)
27+
$cacheHandler = $this->getMockBuilder(NoCache::class)
2828
->disableOriginalConstructor()
2929
->setMethods(array('has', 'set'))
3030
->getMock();
@@ -54,7 +54,7 @@ public function testFetchForecastByCityName()
5454

5555
public function testFetchForecastByCityNameWithoutCountryCode()
5656
{
57-
$cacheHandler = $this->getMockBuilder(Null::class)
57+
$cacheHandler = $this->getMockBuilder(NoCache::class)
5858
->disableOriginalConstructor()
5959
->setMethods(array('has', 'set'))
6060
->getMock();
@@ -84,7 +84,7 @@ public function testFetchForecastByCityNameWithoutCountryCode()
8484

8585
public function testFetchForecastByCityId()
8686
{
87-
$cacheHandler = $this->getMockBuilder(Null::class)
87+
$cacheHandler = $this->getMockBuilder(NoCache::class)
8888
->disableOriginalConstructor()
8989
->setMethods(array('has', 'set'))
9090
->getMock();
@@ -114,7 +114,7 @@ public function testFetchForecastByCityId()
114114

115115
public function testFetchForecastByZipCode()
116116
{
117-
$cacheHandler = $this->getMockBuilder(Null::class)
117+
$cacheHandler = $this->getMockBuilder(NoCache::class)
118118
->disableOriginalConstructor()
119119
->setMethods(array('has', 'set'))
120120
->getMock();
@@ -144,7 +144,7 @@ public function testFetchForecastByZipCode()
144144

145145
public function testFetchForecastByZipCodeWithoutCountryCode()
146146
{
147-
$cacheHandler = $this->getMockBuilder(Null::class)
147+
$cacheHandler = $this->getMockBuilder(NoCache::class)
148148
->disableOriginalConstructor()
149149
->setMethods(array('has', 'set'))
150150
->getMock();
@@ -174,7 +174,7 @@ public function testFetchForecastByZipCodeWithoutCountryCode()
174174

175175
public function testFetchForecastByCityGeographicCoordinates()
176176
{
177-
$cacheHandler = $this->getMockBuilder(Null::class)
177+
$cacheHandler = $this->getMockBuilder(NoCache::class)
178178
->disableOriginalConstructor()
179179
->setMethods(array('has', 'set'))
180180
->getMock();
@@ -204,7 +204,7 @@ public function testFetchForecastByCityGeographicCoordinates()
204204

205205
public function testFetchWeatherDataForCitiesWithinRectangleZone()
206206
{
207-
$cacheHandler = $this->getMockBuilder(Null::class)
207+
$cacheHandler = $this->getMockBuilder(NoCache::class)
208208
->disableOriginalConstructor()
209209
->setMethods(array('has', 'set'))
210210
->getMock();
@@ -238,7 +238,7 @@ public function testFetchWeatherDataForCitiesWithinRectangleZone()
238238

239239
public function testFetchWeatherDataForCitiesInCycle()
240240
{
241-
$cacheHandler = $this->getMockBuilder(Null::class)
241+
$cacheHandler = $this->getMockBuilder(NoCache::class)
242242
->disableOriginalConstructor()
243243
->setMethods(array('has', 'set'))
244244
->getMock();
@@ -268,7 +268,7 @@ public function testFetchWeatherDataForCitiesInCycle()
268268

269269
public function testFetchWeatherDataForSeveralCityIds()
270270
{
271-
$cacheHandler = $this->getMockBuilder(Null::class)
271+
$cacheHandler = $this->getMockBuilder(NoCache::class)
272272
->disableOriginalConstructor()
273273
->setMethods(array('has', 'set'))
274274
->getMock();

‎Tests/Factory/CacheHandlerFactoryTest.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
namespace Netgen\Bundle\OpenWeatherMapBundle\Tests\Factory;
44

55
use Netgen\Bundle\OpenWeatherMapBundle\Cache\HandlerInterface;
6-
use Netgen\Bundle\OpenWeatherMapBundle\Cache\Null;
76
use Netgen\Bundle\OpenWeatherMapBundle\Factory\CacheHandlerFactory;
87
use Symfony\Component\DependencyInjection\Container;
98
use Symfony\Component\DependencyInjection\ContainerAware;
10-
use Symfony\Component\DependencyInjection\ContainerInterface;
119

1210
class CacheHandlerFactoryTest extends \PHPUnit_Framework_TestCase
1311
{

0 commit comments

Comments
 (0)