Changed lockExists to isLocked, fixed indentation.

msonnabaum · msonnabaum · commit e0eb32c164e3 · 2012-08-30T07:58:18.000-05:00
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
@@ -515,7 +515,7 @@ protected function lock(Request $request, Response $entry)
 
             // wait for the lock to be released
             $wait = 0;
-            while ($this->store->lockExists($request) && $wait < 5000000) {
+            while ($this->store->isLocked($request) && $wait < 5000000) {
                 usleep(50000);
                 $wait += 50000;
             }
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -97,9 +97,9 @@ public function unlock(Request $request)
         return @unlink($this->getPath($this->getCacheKey($request).'.lck'));
     }
 
-    public function lockExists(Request $request)
+    public function isLocked(Request $request)
     {
-      return is_file($this->getPath($this->getCacheKey($request).'.lck'));
+        return is_file($this->getPath($this->getCacheKey($request).'.lck'));
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php b/src/Symfony/Component/HttpKernel/HttpCache/StoreInterface.php
@@ -76,7 +76,7 @@ public function unlock(Request $request);
      *
      * @return Boolean true if lock exists, false otherwise
      */
-    public function lockExists(Request $request);
+    public function isLocked(Request $request);
 
     /**
      * Purges data for the given URL.
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/StoreTest.php
@@ -200,10 +200,10 @@ public function testLocking()
         $this->assertTrue($this->store->lock($req));
 
         $path = $this->store->lock($req);
-        $this->assertTrue($this->store->lockExists($req));
+        $this->assertTrue($this->store->isLocked($req));
 
         $this->store->unlock($req);
-        $this->assertFalse($this->store->lockExists($req));
+        $this->assertFalse($this->store->isLocked($req));
     }
 
     protected function storeSimpleEntry($path = null, $headers = array())

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ protected function lock(Request $request, Response $entry)`
`515`	`515`
`516`	`516`	`// wait for the lock to be released`
`517`	`517`	`$wait = 0;`
`518`		`- while ($this->store->lockExists($request) && $wait < 5000000) {`
	`518`	`+ while ($this->store->isLocked($request) && $wait < 5000000) {`
`519`	`519`	`usleep(50000);`
`520`	`520`	`$wait += 50000;`
`521`	`521`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,9 @@ public function unlock(Request $request)`
`97`	`97`	`return @unlink($this->getPath($this->getCacheKey($request).'.lck'));`
`98`	`98`	`}`
`99`	`99`
`100`		`- public function lockExists(Request $request)`
	`100`	`+ public function isLocked(Request $request)`
`101`	`101`	`{`
`102`		`- return is_file($this->getPath($this->getCacheKey($request).'.lck'));`
	`102`	`+ return is_file($this->getPath($this->getCacheKey($request).'.lck'));`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function unlock(Request $request);`
`76`	`76`	`*`
`77`	`77`	`* @return Boolean true if lock exists, false otherwise`
`78`	`78`	`*/`
`79`		`- public function lockExists(Request $request);`
	`79`	`+ public function isLocked(Request $request);`
`80`	`80`
`81`	`81`	`/**`
`82`	`82`	`* Purges data for the given URL.`