Merge pull request #14 from laravel/master

Master

Author: imanghafoori1

src/Illuminate/Cache/ArrayStore.php

@@ -2,9 +2,11 @@
 
 namespace Illuminate\Cache;
 
+use Illuminate\Support\InteractsWithTime;
+
 class ArrayStore extends TaggableStore
 {
-    use RetrievesMultipleKeys;
+    use InteractsWithTime, RetrievesMultipleKeys;
 
     /**
      * The array of stored values.
@@ -21,7 +23,21 @@ class ArrayStore extends TaggableStore
      */
     public function get($key)
     {
-        return $this->storage[$key] ?? null;
+        if (! isset($this->storage[$key])) {
+            return null;
+        }
+
+        $item = $this->storage[$key];
+
+        $expiresAt = $item['expiresAt'] ?? 0;
+
+        if ($expiresAt !== 0 && $this->currentTime() > $expiresAt) {
+            $this->forget($key);
+
+            return null;
+        }
+
+        return $item['value'];
     }
 
     /**
@@ -34,7 +50,10 @@ public function get($key)
      */
     public function put($key, $value, $minutes)
     {
-        $this->storage[$key] = $value;
+        $this->storage[$key] = [
+            'value' => $value,
+            'expiresAt' => $this->calculateExpiration($minutes),
+        ];
 
         return true;
     }
@@ -48,10 +67,15 @@ public function put($key, $value, $minutes)
      */
     public function increment($key, $value = 1)
     {
-        $this->storage[$key] = ! isset($this->storage[$key])
-                ? $value : ((int) $this->storage[$key]) + $value;
+        if (! isset($this->storage[$key])) {
+            $this->forever($key, $value);
 
-        return $this->storage[$key];
+            return $this->storage[$key]['value'];
+        }
+
+        $this->storage[$key]['value'] = ((int) $this->storage[$key]['value']) + $value;
+
+        return $this->storage[$key]['value'];
     }
 
     /**
@@ -112,4 +136,26 @@ public function getPrefix()
     {
         return '';
     }
+
+    /**
+     * Get the expiration time of the key.
+     *
+     * @param  int  $minutes
+     * @return int
+     */
+    protected function calculateExpiration($minutes)
+    {
+        return $this->toTimestamp($minutes);
+    }
+
+    /**
+     * Get the UNIX timestamp for the given number of minutes.
+     *
+     * @param  int  $minutes
+     * @return int
+     */
+    protected function toTimestamp($minutes)
+    {
+        return $minutes > 0 ? $this->availableAt($minutes * 60) : 0;
+    }
 }

src/Illuminate/Queue/BeanstalkdQueue.php

@@ -30,17 +30,26 @@ class BeanstalkdQueue extends Queue implements QueueContract
      */
     protected $timeToRun;
 
+    /**
+     * The maximum number of seconds to block for a job.
+     *
+     * @var int
+     */
+    protected $blockFor;
+
     /**
      * Create a new Beanstalkd queue instance.
      *
      * @param  \Pheanstalk\Pheanstalk  $pheanstalk
      * @param  string  $default
      * @param  int  $timeToRun
+     * @param  int  $blockFor
      * @return void
      */
-    public function __construct(Pheanstalk $pheanstalk, $default, $timeToRun)
+    public function __construct(Pheanstalk $pheanstalk, $default, $timeToRun, $blockFor = 0)
     {
         $this->default = $default;
+        $this->blockFor = $blockFor;
         $this->timeToRun = $timeToRun;
         $this->pheanstalk = $pheanstalk;
     }
@@ -117,7 +126,7 @@ public function pop($queue = null)
     {
         $queue = $this->getQueue($queue);
 
-        $job = $this->pheanstalk->watchOnly($queue)->reserve(0);
+        $job = $this->pheanstalk->watchOnly($queue)->reserve($this->blockFor);
 
         if ($job instanceof PheanstalkJob) {
             return new BeanstalkdJob(

src/Illuminate/Queue/Connectors/BeanstalkdConnector.php

@@ -17,9 +17,12 @@ class BeanstalkdConnector implements ConnectorInterface
      */
     public function connect(array $config)
     {
-        $retryAfter = $config['retry_after'] ?? Pheanstalk::DEFAULT_TTR;
-
-        return new BeanstalkdQueue($this->pheanstalk($config), $config['queue'], $retryAfter);
+        return new BeanstalkdQueue(
+            $this->pheanstalk($config),
+            $config['queue'],
+            $config['retry_after'] ?? Pheanstalk::DEFAULT_TTR,
+            $config['block_for'] ?? 0
+        );
     }
 
     /**

tests/Cache/CacheArrayStoreTest.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Tests\Cache;
 
+use Illuminate\Support\Carbon;
 use PHPUnit\Framework\TestCase;
 use Illuminate\Cache\ArrayStore;
 
@@ -33,6 +34,19 @@ public function testMultipleItemsCanBeSetAndRetrieved()
         ], $store->many(['foo', 'fizz', 'quz', 'norf']));
     }
 
+    public function testItemsCanExpire(): void
+    {
+        Carbon::setTestNow(Carbon::now());
+        $store = new ArrayStore;
+
+        $store->put('foo', 'bar', 10);
+        Carbon::setTestNow(Carbon::now()->addMinutes(10)->addSecond());
+        $result = $store->get('foo');
+
+        $this->assertNull($result);
+        Carbon::setTestNow(null);
+    }
+
     public function testStoreItemForeverProperlyStoresInArray()
     {
         $mock = $this->getMockBuilder(ArrayStore::class)->setMethods(['put'])->getMock();
@@ -47,22 +61,25 @@ public function testValuesCanBeIncremented()
     {
         $store = new ArrayStore;
         $store->put('foo', 1, 10);
-        $store->increment('foo');
+        $result = $store->increment('foo');
+        $this->assertEquals(2, $result);
         $this->assertEquals(2, $store->get('foo'));
     }
 
     public function testNonExistingKeysCanBeIncremented()
     {
         $store = new ArrayStore;
-        $store->increment('foo');
+        $result = $store->increment('foo');
+        $this->assertEquals(1, $result);
         $this->assertEquals(1, $store->get('foo'));
     }
 
     public function testValuesCanBeDecremented()
     {
         $store = new ArrayStore;
         $store->put('foo', 1, 10);
-        $store->decrement('foo');
+        $result = $store->decrement('foo');
+        $this->assertEquals(0, $result);
         $this->assertEquals(0, $store->get('foo'));
     }