EZP-23867: Switchable now has methods isSwitchedOn/isSwitchedOff

ezpublishlegacy · Jan 15, 2015 · 29f7f89 · 29f7f89
1 parent c12b9d1
commit 29f7f89
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/eZ/Bundle/EzPublishLegacyBundle/Cache/PersistenceCachePurger.php b/eZ/Bundle/EzPublishLegacyBundle/Cache/PersistenceCachePurger.php
@@ -66,7 +66,7 @@ public function __construct( CacheServiceDecorator $cache, LocationHandlerInterf
      */
     public function all()
     {
-        if ( $this->getSwitch() === false )
+        if ( $this->isSwitchedOff() )
             return;
 
         $this->cache->clear();
@@ -108,7 +108,7 @@ public function resetAllCleared()
      */
     public function content( $locationIds = null )
     {
-        if ( $this->allCleared === true || $this->getSwitch() === false )
+        if ( $this->allCleared === true || $this->isSwitchedOff() )
             return $locationIds;
 
         if ( $locationIds === null )
@@ -160,7 +160,7 @@ public function content( $locationIds = null )
      */
     public function contentType( $id = null )
     {
-        if ( $this->allCleared === true || $this->getSwitch() === false )
+        if ( $this->allCleared === true || $this->isSwitchedOff() )
             return;
 
         if ( $id === null )
@@ -187,7 +187,7 @@ public function contentType( $id = null )
      */
     public function contentTypeGroup( $id = null )
     {
-        if ( $this->allCleared === true || $this->getSwitch() === false )
+        if ( $this->allCleared === true || $this->isSwitchedOff() )
             return;
 
         if ( $id === null )
@@ -215,7 +215,7 @@ public function contentTypeGroup( $id = null )
      */
     public function section( $id = null )
     {
-        if ( $this->allCleared === true || $this->getSwitch() === false )
+        if ( $this->allCleared === true || $this->isSwitchedOff() )
             return;
 
         if ( $id === null )
@@ -239,7 +239,7 @@ public function section( $id = null )
      */
     public function languages( $ids )
     {
-        if ( $this->allCleared === true || $this->getSwitch() === false )
+        if ( $this->allCleared === true || $this->isSwitchedOff() )
             return;
 
         $ids = (array)$ids;
@@ -255,7 +255,7 @@ public function languages( $ids )
      */
     public function user( $id = null )
     {
-        if ( $this->allCleared === true || $this->getSwitch() === false )
+        if ( $this->allCleared === true || $this->isSwitchedOff() )
             return;
 
         if ( $id === null )

diff --git a/eZ/Bundle/EzPublishLegacyBundle/Cache/Switchable.php b/eZ/Bundle/EzPublishLegacyBundle/Cache/Switchable.php
@@ -23,11 +23,20 @@ public function switchOff()
     }
 
     /**
-     * Returns the value of the switch
+     * Checks if the switch is off
      * @return bool
      */
-    public function getSwitch()
+    public function isSwitchedOn()
     {
         return $this->isSwitchedOn;
     }
+
+    /**
+     * Checks if the switch is off
+     * @return bool
+     */
+    public function isSwitchedOff()
+    {
+        return !$this->isSwitchedOn;
+    }
 }
diff --git a/eZ/Bundle/EzPublishLegacyBundle/Cache/SwitchableHttpCachePurger.php b/eZ/Bundle/EzPublishLegacyBundle/Cache/SwitchableHttpCachePurger.php
@@ -26,7 +26,7 @@ public function __construct( GatewayCachePurger $gatewayCachePurger )
 
     public function purge( $cacheElements )
     {
-        if ( $this->getSwitch() === false )
+        if ( $this->isSwitchedOff() )
         {
             return $cacheElements;
         }
@@ -36,7 +36,7 @@ public function purge( $cacheElements )
 
     public function purgeAll()
     {
-        if ( $this->getSwitch() === false )
+        if ( $this->isSwitchedOff() )
         {
             return;
         }