Cs fixes

Author: patrickbrouwers

src/Configuration/Cache/ApcCacheProvider.php

@@ -2,33 +2,10 @@
 
 namespace LaravelDoctrine\ORM\Configuration\Cache;
 
-use Illuminate\Contracts\Cache\Factory;
-use LaravelDoctrine\ORM\Configuration\Driver;
-
-class ApcCacheProvider implements Driver
+class ApcCacheProvider extends IlluminateCacheProvider
 {
     /**
-     * @var Factory
-     */
-    protected $cache;
-
-    /**
-     * @param Factory $cache
-     */
-    public function __construct(Factory $cache)
-    {
-        $this->cache = $cache;
-    }
-
-    /**
-     * @param array $settings
-     *
-     * @return ApcCache
+     * @var string
      */
-    public function resolve(array $settings = [])
-    {
-        return new IlluminateCacheAdapter(
-            $this->cache->store('apc')
-        );
-    }
+    protected $store = 'apc';
 }

src/Configuration/Cache/IlluminateCacheProvider.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace LaravelDoctrine\ORM\Configuration\Cache;
+
+use Illuminate\Contracts\Cache\Factory;
+use LaravelDoctrine\ORM\Configuration\Driver;
+
+abstract class IlluminateCacheProvider implements Driver
+{
+    /**
+     * @var Factory
+     */
+    protected $cache;
+
+    /**
+     * @var string
+     */
+    protected $store;
+
+    /**
+     * @param Factory $cache
+     */
+    public function __construct(Factory $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * @param array $settings
+     *
+     * @return MemcachedCache
+     */
+    public function resolve(array $settings = [])
+    {
+        return new IlluminateCacheAdapter(
+            $this->cache->store($this->store)
+        );
+    }
+}

src/Configuration/Cache/MemcachedCacheProvider.php

@@ -2,33 +2,10 @@
 
 namespace LaravelDoctrine\ORM\Configuration\Cache;
 
-use Illuminate\Contracts\Cache\Factory;
-use LaravelDoctrine\ORM\Configuration\Driver;
-
-class MemcachedCacheProvider implements Driver
+class MemcachedCacheProvider extends IlluminateCacheProvider
 {
     /**
-     * @var Factory
-     */
-    protected $cache;
-
-    /**
-     * @param Factory $cache
-     */
-    public function __construct(Factory $cache)
-    {
-        $this->cache = $cache;
-    }
-
-    /**
-     * @param array $settings
-     *
-     * @return MemcachedCache
+     * @var string
      */
-    public function resolve(array $settings = [])
-    {
-        return new IlluminateCacheAdapter(
-            $this->cache->store('memcached')
-        );
-    }
+    protected $store = 'memcached';
 }

src/Configuration/Cache/RedisCacheProvider.php

@@ -2,33 +2,10 @@
 
 namespace LaravelDoctrine\ORM\Configuration\Cache;
 
-use Illuminate\Contracts\Cache\Factory;
-use LaravelDoctrine\ORM\Configuration\Driver;
-
-class RedisCacheProvider implements Driver
+class RedisCacheProvider extends IlluminateCacheProvider
 {
     /**
-     * @var Factory
-     */
-    protected $cache;
-
-    /**
-     * @param Factory $cache
-     */
-    public function __construct(Factory $cache)
-    {
-        $this->cache = $cache;
-    }
-
-    /**
-     * @param array $settings
-     *
-     * @return RedisCache
+     * @var string
      */
-    public function resolve(array $settings = [])
-    {
-        return new IlluminateCacheAdapter(
-            $this->cache->store('redis')
-        );
-    }
+    protected $store = 'redis';
 }

src/Configuration/MetaData/Fluent.php

@@ -2,8 +2,8 @@
 
 namespace LaravelDoctrine\ORM\Configuration\MetaData;
 
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Illuminate\Contracts\Container\Container;
 use LaravelDoctrine\Fluent\Builders\Builder;
 use LaravelDoctrine\Fluent\Extensions\ExtensibleClassMetadataFactory;
@@ -36,7 +36,7 @@ public function resolve(array $settings = [])
 
         $namingStrategy = $this->getNamingStrategy($settings);
 
-        $driver->setFluentFactory(function (ClassMetadata $meta) use ($namingStrategy) {
+        $driver->setFluentFactory(function (ClassMetadataInfo $meta) use ($namingStrategy) {
             return new Builder(new ClassMetadataBuilder($meta), $namingStrategy);
         });
 

src/EntityManagerFactory.php

@@ -385,7 +385,7 @@ protected function decorateManager(array $settings = [], EntityManagerInterface
     /**
      * @param array $settings
      *
-     * @return string|null
+     * @return array
      */
     protected function getConnectionDriver(array $settings = [])
     {