Merge pull request phalcon#11161 from sergeyklay/mvc/model/metadata

Fixed issue phalcon#11152
Alive2212 · Dec 9, 2015 · a1881d5 · a1881d5
2 parents d0ba270 + 875eebc
commit a1881d5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 21 deletions.
diff --git a/phalcon/mvc/model/metadata.zep b/phalcon/mvc/model/metadata.zep
@@ -42,7 +42,7 @@ use Phalcon\Mvc\Model\MetaData\StrategyInterface;
  * </code>
  *
  */
-abstract class MetaData implements InjectionAwareInterface
+abstract class MetaData implements InjectionAwareInterface, MetaDataInterface
 {
 
 	protected _dependencyInjector;

diff --git a/phalcon/mvc/model/metadata/apc.zep b/phalcon/mvc/model/metadata/apc.zep
@@ -20,7 +20,6 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Mvc\Model\Exception;
 
 /**
@@ -39,7 +38,7 @@ use Phalcon\Mvc\Model\Exception;
  *	));
  *</code>
  */
-class Apc extends MetaData implements MetaDataInterface
+class Apc extends MetaData
 {
 
 	protected _prefix = "";

diff --git a/phalcon/mvc/model/metadata/files.zep b/phalcon/mvc/model/metadata/files.zep
@@ -20,7 +20,6 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Mvc\Model\Exception;
 
 /**
@@ -34,7 +33,7 @@ use Phalcon\Mvc\Model\Exception;
  * ));
  *</code>
  */
-class Files extends MetaData implements MetaDataInterface
+class Files extends MetaData
 {
 
 	protected _metaDataDir = "./";

diff --git a/phalcon/mvc/model/metadata/libmemcached.zep b/phalcon/mvc/model/metadata/libmemcached.zep
@@ -20,7 +20,6 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Cache\Backend\Libmemcached;
 use Phalcon\Cache\Frontend\Data as FrontendData;
 use Phalcon\Mvc\Model\Exception;
@@ -47,7 +46,7 @@ use Phalcon\Mvc\Model\Exception;
  *	));
  *</code>
  */
-class Libmemcached extends MetaData implements MetaDataInterface
+class Libmemcached extends MetaData
 {
 
 	protected _ttl = 172800;
@@ -129,4 +128,4 @@ class Libmemcached extends MetaData implements MetaDataInterface
 
 		parent::reset();
 	}
-}
+}
diff --git a/phalcon/mvc/model/metadata/memcache.zep b/phalcon/mvc/model/metadata/memcache.zep
@@ -20,7 +20,6 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Cache\Backend\Memcache;
 use Phalcon\Cache\Frontend\Data as FrontendData;
 
@@ -42,7 +41,7 @@ use Phalcon\Cache\Frontend\Data as FrontendData;
  *	));
  *</code>
  */
-class Memcache extends MetaData implements MetaDataInterface
+class Memcache extends MetaData
 {
 
 	protected _ttl = 172800;
@@ -132,4 +131,4 @@ class Memcache extends MetaData implements MetaDataInterface
 
 		parent::reset();
 	}
-}
+}
diff --git a/phalcon/mvc/model/metadata/memory.zep b/phalcon/mvc/model/metadata/memory.zep
@@ -20,7 +20,6 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Mvc\Model\Exception;
 
 /**
@@ -29,7 +28,7 @@ use Phalcon\Mvc\Model\Exception;
  * Stores model meta-data in memory. Data will be erased when the request finishes
  *
  */
-class Memory extends MetaData implements MetaDataInterface
+class Memory extends MetaData
 {
 
 	/**

diff --git a/phalcon/mvc/model/metadata/redis.zep b/phalcon/mvc/model/metadata/redis.zep
@@ -20,7 +20,6 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Cache\Backend\Redis;
 use Phalcon\Cache\Frontend\Data as FrontendData;
 
@@ -42,7 +41,7 @@ use Phalcon\Cache\Frontend\Data as FrontendData;
  *	));
  *</code>
  */
-class Redis extends MetaData implements MetaDataInterface
+class Redis extends MetaData
 {
 
 	protected _ttl = 172800;
@@ -132,4 +131,4 @@ class Redis extends MetaData implements MetaDataInterface
 
 		parent::reset();
 	}
-}
+}
diff --git a/phalcon/mvc/model/metadata/session.zep b/phalcon/mvc/model/metadata/session.zep
@@ -20,7 +20,6 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Mvc\Model\Exception;
 
 /**
@@ -37,7 +36,7 @@ use Phalcon\Mvc\Model\Exception;
  * ));
  *</code>
  */
-class Session extends MetaData implements MetaDataInterface
+class Session extends MetaData
 {
 
 	protected _prefix = "";

diff --git a/phalcon/mvc/model/metadata/xcache.zep b/phalcon/mvc/model/metadata/xcache.zep
@@ -20,7 +20,6 @@
 namespace Phalcon\Mvc\Model\MetaData;
 
 use Phalcon\Mvc\Model\MetaData;
-use Phalcon\Mvc\Model\MetaDataInterface;
 
 /**
  * Phalcon\Mvc\Model\MetaData\Xcache
@@ -38,7 +37,7 @@ use Phalcon\Mvc\Model\MetaDataInterface;
  *	));
  *</code>
  */
-class Xcache extends MetaData implements MetaDataInterface
+class Xcache extends MetaData
 {
 
 	protected _prefix = "";
@@ -91,4 +90,4 @@ class Xcache extends MetaData implements MetaDataInterface
 	{
 		xcache_set("$PMM$" . this->_prefix . key, data, this->_ttl);
 	}
-}
+}