lcache · ndobromirov · Dec 27, 2016 · Dec 30, 2016 · Dec 30, 2016 · Jan 2, 2017
diff --git a/composer.json b/composer.json
@@ -32,7 +32,12 @@
         "cbf": "phpcbf --standard=PSR2 -n src",
         "api": "PATH=$HOME/bin:$PATH sami.phar --ansi update sami-config.php",
         "sami-install": "mkdir -p $HOME/bin && curl --output $HOME/bin/sami.phar http://get.sensiolabs.org/sami.phar && chmod +x $HOME/bin/sami.phar",
-        "test": "phpunit"
+        "test": "phpunit",
+        "test-state": "phpunit --group state",
+        "test-l1": "phpunit --group L1",
+        "test-l2": "phpunit --group L2",
+        "test-integration": "phpunit --group integration",
+        "test-failing": "phpunit --group failing"
     },
     "extra": {
         "branch-alias": {

diff --git a/src/APCuL1.php b/src/APCuL1.php
@@ -121,7 +121,6 @@ public function delete($event_id, Address $address)
         $localKey = $this->getLocalKey($address);
 
         if ($address->isEntireCache() || $address->isEntireBin()) {
-            $localKey = $this->getLocalKey($address);
             $pattern = '/^' . preg_quote($localKey) . '.*/';
             $matching = $this->getIterator($pattern, APC_ITER_KEY);
             assert(!is_null($matching), 'Iterator instantiation failed.');

diff --git a/src/Address.php b/src/Address.php
@@ -70,12 +70,16 @@ public function isEntireCache()
      */
     public function isMatch(Address $address)
     {
-        if (!is_null($address->getBin()) && !is_null($this->bin) && $address->getBin() !== $this->bin) {
+        $bin = $address->getBin();
+        if (!(null === $bin || null === $this->bin || $bin === $this->bin)) {
             return false;
         }
-        if (!is_null($address->getKey()) && !is_null($this->key) && $address->getKey() !== $this->key) {
+
+        $key =  $address->getKey();
+        if (!(null === $key || null === $this->key || $key === $this->key)) {
             return false;
         }
+
         return true;
     }