Merge branch '3.2'

Signed-off-by: crynobone <crynobone@gmail.com>

.travis.yml

@@ -15,10 +15,10 @@ env:
 before_script:
   - travis_retry composer self-update
   - composer config discard-changes true
-  - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-source --no-interaction; fi
-  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-stable; fi
-  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-source --no-interaction --prefer-lowest --prefer-stable; fi
-  - if [[ $setup = 'coveralls' ]]; then travis_retry composer require "psr/log=1.0.0" "satooshi/php-coveralls=~0.6" "symfony/yaml=~2.0" --prefer-source --no-interaction --dev; fi
+  - if [[ $setup = 'basic' ]]; then travis_retry composer install --prefer-dist --no-interaction; fi
+  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable; fi
+  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable; fi
+  - if [[ $setup = 'coveralls' ]]; then travis_retry composer require "satooshi/php-coveralls=~0.7" --prefer-dist --no-interaction --dev; fi
 
 script:
   - if [[ $coverage = 'yes' ]]; then phpunit -c phpunit.xml --coverage-clover build/logs/clover.xml; fi

src/ContainerTrait.php

@@ -1,61 +1,9 @@
 <?php namespace Orchestra\Memory;
 
-use Orchestra\Contracts\Memory\Provider as ProviderContract;
-
+/**
+ * @deprecated v3.2.x
+ */
 trait ContainerTrait
 {
-    /**
-     * Memory instance.
-     *
-     * @var \Orchestra\Contracts\Memory\Provider
-     */
-    protected $memory = null;
-
-    /**
-     * Check whether a Memory instance is already attached to the container.
-     *
-     * @return bool
-     */
-    public function attached()
-    {
-        return ($this->memory instanceof ProviderContract);
-    }
-
-    /**
-     * Attach memory provider.
-     *
-     * @param  \Orchestra\Contracts\Memory\Provider  $memory
-     *
-     * @return object
-     */
-    public function attach(ProviderContract $memory)
-    {
-        $this->setMemoryProvider($memory);
-
-        return $this;
-    }
-
-    /**
-     * Set memory provider.
-     *
-     * @param  \Orchestra\Contracts\Memory\Provider  $memory
-     *
-     * @return object
-     */
-    public function setMemoryProvider(ProviderContract $memory)
-    {
-        $this->memory = $memory;
-
-        return $this;
-    }
-
-    /**
-     * Set memory provider.
-     *
-     * @return \Orchestra\Contracts\Memory\Provider|null
-     */
-    public function getMemoryProvider()
-    {
-        return $this->memory;
-    }
+    use Memorizable;
 }

src/Memorizable.php

@@ -0,0 +1,61 @@
+<?php namespace Orchestra\Memory;
+
+use Orchestra\Contracts\Memory\Provider as ProviderContract;
+
+trait Memorizable
+{
+    /**
+     * Memory instance.
+     *
+     * @var \Orchestra\Contracts\Memory\Provider
+     */
+    protected $memory = null;
+
+    /**
+     * Check whether a Memory instance is already attached to the container.
+     *
+     * @return bool
+     */
+    public function attached()
+    {
+        return ($this->memory instanceof ProviderContract);
+    }
+
+    /**
+     * Attach memory provider.
+     *
+     * @param  \Orchestra\Contracts\Memory\Provider  $memory
+     *
+     * @return object
+     */
+    public function attach(ProviderContract $memory)
+    {
+        $this->setMemoryProvider($memory);
+
+        return $this;
+    }
+
+    /**
+     * Set memory provider.
+     *
+     * @param  \Orchestra\Contracts\Memory\Provider  $memory
+     *
+     * @return object
+     */
+    public function setMemoryProvider(ProviderContract $memory)
+    {
+        $this->memory = $memory;
+
+        return $this;
+    }
+
+    /**
+     * Set memory provider.
+     *
+     * @return \Orchestra\Contracts\Memory\Provider|null
+     */
+    public function getMemoryProvider()
+    {
+        return $this->memory;
+    }
+}

src/Provider.php

@@ -1,13 +1,13 @@
 <?php namespace Orchestra\Memory;
 
+use Orchestra\Support\Traits\DataContainer;
 use Illuminate\Contracts\Encryption\Encrypter;
-use Orchestra\Support\Traits\DataContainerTrait;
 use Orchestra\Contracts\Memory\Handler as HandlerContract;
 use Orchestra\Contracts\Memory\Provider as ProviderContract;
 
 class Provider implements ProviderContract
 {
-    use DataContainerTrait;
+    use DataContainer;
 
     /**
      * Handler instance.