using static in models

matthi4s · matthi4s · commit d770c9b66314 · 2019-01-25T20:53:58.000+01:00
diff --git a/src/BaseModel.php b/src/BaseModel.php
@@ -56,7 +56,7 @@ public function __construct($id = null)
      */
     public function getId()
     {
-        return $this->{self::$idField};
+        return $this->{static::$idField};
     }
 
     /**
@@ -66,7 +66,7 @@ public function getId()
      */
     public function setId($id)
     {
-        $this->{self::$idField} = $id;
+        $this->{static::$idField} = $id;
     }
 
     /**
@@ -76,23 +76,22 @@ public function setId($id)
      */
     public function getIdField(): string
     {
-        return self::$idField;
+        return static::$idField;
     }
 
     /**
      * Generate an unique identifier for the model
      */
     protected function generateId()
     {
-        $class = get_called_class();
         $characters = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
         $charactersLength = strlen($characters);
         do {
             $id = '';
-            for ($i = 0; $i < $class::$idLength; $i++) {
+            for ($i = 0; $i < static::$idLength; $i++) {
                 $id .= $characters[rand(0, $charactersLength - 1)];
             }
-        } while ($class::get($id));
+        } while (static::get($id));
 
         $this->setId($id);
     }
diff --git a/src/GenericModel.php b/src/GenericModel.php
@@ -74,22 +74,21 @@ protected static function getDriverFactory()
      *
      * @param string $id
      * @param bool $update
-     * @return GenericModel|bool
+     * @return static|bool
      */
     public static function get(string $id, bool $update = false)
     {
-        $class = get_called_class();
         $registry = ModelRegistry::getInstance();
-        $factory = self::getDriverFactory();
+        $factory = static::getDriverFactory();
 
         /**
-         * @var GenericModel $model
+         * @var static $model
          */
-        $model = new $class($id);
+        $model = new static($id);
 
         // try to get the model from the registry
-        if ($class::$registry) {
-            if ($registryModel = $registry->get($class::getName(), $id)) {
+        if (static::$registry) {
+            if ($registryModel = $registry->get(static::getName(), $id)) {
                 $model = $registryModel;
                 if (!$update) {
                     return $model;
@@ -98,38 +97,38 @@ public static function get(string $id, bool $update = false)
         }
 
         // try to get the model from cache
-        if ($class::$cache && !$update && $factory->assembleCacheDriver()->get($model)) {
-            if ($class::$registry) {
+        if (static::$cache && !$update && $factory->assembleCacheDriver()->get($model)) {
+            if (static::$registry) {
                 $registry->save($model);
             }
 
             return $model;
         }
 
         // try to get the model from nosql database
-        if ($class::$nosql && $factory->assembleNoSQLDriver()->get($model)) {
-            if ($class::$registry) {
+        if (static::$nosql && $factory->assembleNoSQLDriver()->get($model)) {
+            if (static::$registry) {
                 $registry->save($model);
             }
 
-            if ($class::$cache) {
+            if (static::$cache) {
                 $factory->assembleCacheDriver()->save($model);
             }
 
             return $model;
         }
 
         // try to get the model from relational database
-        if ($class::$relational && $factory->assembleRelationalDriver()->get($model)) {
-            if ($class::$registry) {
+        if (static::$relational && $factory->assembleRelationalDriver()->get($model)) {
+            if (static::$registry) {
                 $registry->save($model);
             }
 
-            if ($class::$cache) {
+            if (static::$cache) {
                 $factory->assembleCacheDriver()->save($model);
             }
 
-            if ($class::$nosql) {
+            if (static::$nosql) {
                 $factory->assembleNoSQLDriver()->save($model);
             }
 
@@ -147,19 +146,18 @@ public static function get(string $id, bool $update = false)
      */
     public static function query(Query $query): QueryResult
     {
-        $class = get_called_class();
-        $factory = self::getDriverFactory();
+        $factory = static::getDriverFactory();
 
-        $query->modelClassName = $class;
+        $query->modelClassName = static::class;
 
         /** @var QueryableDriverInterface $driver */
         $driver = $factory->assembleRelationalDriver();
 
-        if ($class::$relational) {
+        if (static::$relational) {
             /** @var QueryResult $result */
             $result = $driver->query($query);
 
-            if ($class::$registry) {
+            if (static::$registry) {
                 if ($result->wasSuccessful() && count($result) > 0) {
                     foreach ($result as $model) {
                         ModelRegistry::getInstance()->save($model);
@@ -188,7 +186,7 @@ public static function query(Query $query): QueryResult
      */
     public static function select($where = null, $order = null, $fields = null, $limit = null): QueryResult
     {
-        return self::query(new SelectQuery($where, $order, $fields, $limit));
+        return static::query(new SelectQuery($where, $order, $fields, $limit));
     }
 
     /**
@@ -198,41 +196,40 @@ public static function select($where = null, $order = null, $fields = null, $lim
      */
     public function save(): bool
     {
-        $class = get_called_class();
-        $factory = self::getDriverFactory();
+        $factory = static::getDriverFactory();
 
         // new model, generate id and save in registry
         if (!$this->getId()) {
             $this->generateId();
 
-            if ($class::$registry) {
+            if (static::$registry) {
                 ModelRegistry::getInstance()->save($this);
             }
         }
 
         // save in relational database
-        if ($class::$relational) {
+        if (static::$relational) {
             if (!$factory->assembleRelationalDriver()->save($this)) {
                 return false;
             }
         }
 
         // save in nosql database
-        if ($class::$nosql) {
+        if (static::$nosql) {
             if (!$factory->assembleNoSQLDriver()->save($this)) {
                 return false;
             }
         }
 
         // save in search database
-        if ($class::$search) {
+        if (static::$search) {
             if (!$factory->assembleSearchDriver()->save($this)) {
                 return false;
             }
         }
 
         // save in cache
-        if ($class::$cache) {
+        if (static::$cache) {
             if (!$factory->assembleCacheDriver()->save($this)) {
                 return false;
             }
@@ -248,33 +245,32 @@ public function save(): bool
      */
     public function delete(): bool
     {
-        $class = get_called_class();
-        $factory = self::getDriverFactory();
+        $factory = static::getDriverFactory();
         $success = true;
 
         // delete in relational database
-        if ($class::$relational) {
+        if (static::$relational) {
             if (!$factory->assembleRelationalDriver()->delete($this)) {
                 $success = false;
             }
         }
 
         // delete in nosql database
-        if ($class::$nosql) {
+        if (static::$nosql) {
             if (!$factory->assembleNoSQLDriver()->delete($this)) {
                 $success = false;
             }
         }
 
         // delete in search database
-        if ($class::$search) {
+        if (static::$search) {
             if (!$factory->assembleSearchDriver()->delete($this)) {
                 $success = false;
             }
         }
 
         // delete in cache
-        if ($class::$cache) {
+        if (static::$cache) {
             if (!$factory->assembleCacheDriver()->delete($this)) {
                 $success = false;
             }
@@ -290,7 +286,6 @@ public function delete(): bool
      */
     public function getCacheTime(): int
     {
-        $class = get_called_class();
-        return $class::$cache ?: 0;
+        return static::$cache ?: 0;
     }
 }
diff --git a/src/ModelInterface.php b/src/ModelInterface.php
@@ -53,7 +53,7 @@ public function getIdField(): string;
      *
      * @param string $id
      * @param bool $update
-     * @return ModelInterface|bool
+     * @return static|bool
      */
     public static function get(string $id, bool $update = false);
 
diff --git a/src/SimpleModel.php b/src/SimpleModel.php
@@ -21,7 +21,7 @@ abstract class SimpleModel extends BaseModel
      */
     public static function get(string $id, bool $update = false)
     {
-        $model = new (get_called_class())($id);
+        $model = new static($id);
         if (DriverFactory::getInstance()->assembleNoSQLDriver()->get($model)) {
             return $model;
         }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function __construct($id = null)`
`56`	`56`	`*/`
`57`	`57`	`public function getId()`
`58`	`58`	`{`
`59`		`- return $this->{self::$idField};`
	`59`	`+ return $this->{static::$idField};`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`
`@@ -66,7 +66,7 @@ public function getId()`
`66`	`66`	`*/`
`67`	`67`	`public function setId($id)`
`68`	`68`	`{`
`69`		`- $this->{self::$idField} = $id;`
	`69`	`+ $this->{static::$idField} = $id;`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/**`
`@@ -76,23 +76,22 @@ public function setId($id)`
`76`	`76`	`*/`
`77`	`77`	`public function getIdField(): string`
`78`	`78`	`{`
`79`		`- return self::$idField;`
	`79`	`+ return static::$idField;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`/**`
`83`	`83`	`* Generate an unique identifier for the model`
`84`	`84`	`*/`
`85`	`85`	`protected function generateId()`
`86`	`86`	`{`
`87`		`- $class = get_called_class();`
`88`	`87`	`$characters = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";`
`89`	`88`	`$charactersLength = strlen($characters);`
`90`	`89`	`do {`
`91`	`90`	`$id = '';`
`92`		`- for ($i = 0; $i < $class::$idLength; $i++) {`
	`91`	`+ for ($i = 0; $i < static::$idLength; $i++) {`
`93`	`92`	`$id .= $characters[rand(0, $charactersLength - 1)];`
`94`	`93`	`}`
`95`		`- } while ($class::get($id));`
	`94`	`+ } while (static::get($id));`
`96`	`95`
`97`	`96`	`$this->setId($id);`
`98`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,22 +74,21 @@ protected static function getDriverFactory()`
`74`	`74`	`*`
`75`	`75`	`* @param string $id`
`76`	`76`	`* @param bool $update`
`77`		`- * @return GenericModel\|bool`
	`77`	`+ * @return static\|bool`
`78`	`78`	`*/`
`79`	`79`	`public static function get(string $id, bool $update = false)`
`80`	`80`	`{`
`81`		`- $class = get_called_class();`
`82`	`81`	`$registry = ModelRegistry::getInstance();`
`83`		`- $factory = self::getDriverFactory();`
	`82`	`+ $factory = static::getDriverFactory();`
`84`	`83`
`85`	`84`	`/**`
`86`		`- * @var GenericModel $model`
	`85`	`+ * @var static $model`
`87`	`86`	`*/`
`88`		`- $model = new $class($id);`
	`87`	`+ $model = new static($id);`
`89`	`88`
`90`	`89`	`// try to get the model from the registry`
`91`		`- if ($class::$registry) {`
`92`		`- if ($registryModel = $registry->get($class::getName(), $id)) {`
	`90`	`+ if (static::$registry) {`
	`91`	`+ if ($registryModel = $registry->get(static::getName(), $id)) {`
`93`	`92`	`$model = $registryModel;`
`94`	`93`	`if (!$update) {`
`95`	`94`	`return $model;`
`@@ -98,38 +97,38 @@ public static function get(string $id, bool $update = false)`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`// try to get the model from cache`
`101`		`- if ($class::$cache && !$update && $factory->assembleCacheDriver()->get($model)) {`
`102`		`- if ($class::$registry) {`
	`100`	`+ if (static::$cache && !$update && $factory->assembleCacheDriver()->get($model)) {`
	`101`	`+ if (static::$registry) {`
`103`	`102`	`$registry->save($model);`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`return $model;`
`107`	`106`	`}`
`108`	`107`
`109`	`108`	`// try to get the model from nosql database`
`110`		`- if ($class::$nosql && $factory->assembleNoSQLDriver()->get($model)) {`
`111`		`- if ($class::$registry) {`
	`109`	`+ if (static::$nosql && $factory->assembleNoSQLDriver()->get($model)) {`
	`110`	`+ if (static::$registry) {`
`112`	`111`	`$registry->save($model);`
`113`	`112`	`}`
`114`	`113`
`115`		`- if ($class::$cache) {`
	`114`	`+ if (static::$cache) {`
`116`	`115`	`$factory->assembleCacheDriver()->save($model);`
`117`	`116`	`}`
`118`	`117`
`119`	`118`	`return $model;`
`120`	`119`	`}`
`121`	`120`
`122`	`121`	`// try to get the model from relational database`
`123`		`- if ($class::$relational && $factory->assembleRelationalDriver()->get($model)) {`
`124`		`- if ($class::$registry) {`
	`122`	`+ if (static::$relational && $factory->assembleRelationalDriver()->get($model)) {`
	`123`	`+ if (static::$registry) {`
`125`	`124`	`$registry->save($model);`
`126`	`125`	`}`
`127`	`126`
`128`		`- if ($class::$cache) {`
	`127`	`+ if (static::$cache) {`
`129`	`128`	`$factory->assembleCacheDriver()->save($model);`
`130`	`129`	`}`
`131`	`130`
`132`		`- if ($class::$nosql) {`
	`131`	`+ if (static::$nosql) {`
`133`	`132`	`$factory->assembleNoSQLDriver()->save($model);`
`134`	`133`	`}`
`135`	`134`
`@@ -147,19 +146,18 @@ public static function get(string $id, bool $update = false)`
`147`	`146`	`*/`
`148`	`147`	`public static function query(Query $query): QueryResult`
`149`	`148`	`{`
`150`		`- $class = get_called_class();`
`151`		`- $factory = self::getDriverFactory();`
	`149`	`+ $factory = static::getDriverFactory();`
`152`	`150`
`153`		`- $query->modelClassName = $class;`
	`151`	`+ $query->modelClassName = static::class;`
`154`	`152`
`155`	`153`	`/** @var QueryableDriverInterface $driver */`
`156`	`154`	`$driver = $factory->assembleRelationalDriver();`
`157`	`155`
`158`		`- if ($class::$relational) {`
	`156`	`+ if (static::$relational) {`
`159`	`157`	`/** @var QueryResult $result */`
`160`	`158`	`$result = $driver->query($query);`
`161`	`159`
`162`		`- if ($class::$registry) {`
	`160`	`+ if (static::$registry) {`
`163`	`161`	`if ($result->wasSuccessful() && count($result) > 0) {`
`164`	`162`	`foreach ($result as $model) {`
`165`	`163`	`ModelRegistry::getInstance()->save($model);`
`@@ -188,7 +186,7 @@ public static function query(Query $query): QueryResult`
`188`	`186`	`*/`
`189`	`187`	`public static function select($where = null, $order = null, $fields = null, $limit = null): QueryResult`
`190`	`188`	`{`
`191`		`- return self::query(new SelectQuery($where, $order, $fields, $limit));`
	`189`	`+ return static::query(new SelectQuery($where, $order, $fields, $limit));`
`192`	`190`	`}`
`193`	`191`
`194`	`192`	`/**`
`@@ -198,41 +196,40 @@ public static function select($where = null, $order = null, $fields = null, $lim`
`198`	`196`	`*/`
`199`	`197`	`public function save(): bool`
`200`	`198`	`{`
`201`		`- $class = get_called_class();`
`202`		`- $factory = self::getDriverFactory();`
	`199`	`+ $factory = static::getDriverFactory();`
`203`	`200`
`204`	`201`	`// new model, generate id and save in registry`
`205`	`202`	`if (!$this->getId()) {`
`206`	`203`	`$this->generateId();`
`207`	`204`
`208`		`- if ($class::$registry) {`
	`205`	`+ if (static::$registry) {`
`209`	`206`	`ModelRegistry::getInstance()->save($this);`
`210`	`207`	`}`
`211`	`208`	`}`
`212`	`209`
`213`	`210`	`// save in relational database`
`214`		`- if ($class::$relational) {`
	`211`	`+ if (static::$relational) {`
`215`	`212`	`if (!$factory->assembleRelationalDriver()->save($this)) {`
`216`	`213`	`return false;`
`217`	`214`	`}`
`218`	`215`	`}`
`219`	`216`
`220`	`217`	`// save in nosql database`
`221`		`- if ($class::$nosql) {`
	`218`	`+ if (static::$nosql) {`
`222`	`219`	`if (!$factory->assembleNoSQLDriver()->save($this)) {`
`223`	`220`	`return false;`
`224`	`221`	`}`
`225`	`222`	`}`
`226`	`223`
`227`	`224`	`// save in search database`
`228`		`- if ($class::$search) {`
	`225`	`+ if (static::$search) {`
`229`	`226`	`if (!$factory->assembleSearchDriver()->save($this)) {`
`230`	`227`	`return false;`
`231`	`228`	`}`
`232`	`229`	`}`
`233`	`230`
`234`	`231`	`// save in cache`
`235`		`- if ($class::$cache) {`
	`232`	`+ if (static::$cache) {`
`236`	`233`	`if (!$factory->assembleCacheDriver()->save($this)) {`
`237`	`234`	`return false;`
`238`	`235`	`}`
`@@ -248,33 +245,32 @@ public function save(): bool`
`248`	`245`	`*/`
`249`	`246`	`public function delete(): bool`
`250`	`247`	`{`
`251`		`- $class = get_called_class();`
`252`		`- $factory = self::getDriverFactory();`
	`248`	`+ $factory = static::getDriverFactory();`
`253`	`249`	`$success = true;`
`254`	`250`
`255`	`251`	`// delete in relational database`
`256`		`- if ($class::$relational) {`
	`252`	`+ if (static::$relational) {`
`257`	`253`	`if (!$factory->assembleRelationalDriver()->delete($this)) {`
`258`	`254`	`$success = false;`
`259`	`255`	`}`
`260`	`256`	`}`
`261`	`257`
`262`	`258`	`// delete in nosql database`
`263`		`- if ($class::$nosql) {`
	`259`	`+ if (static::$nosql) {`
`264`	`260`	`if (!$factory->assembleNoSQLDriver()->delete($this)) {`
`265`	`261`	`$success = false;`
`266`	`262`	`}`
`267`	`263`	`}`
`268`	`264`
`269`	`265`	`// delete in search database`
`270`		`- if ($class::$search) {`
	`266`	`+ if (static::$search) {`
`271`	`267`	`if (!$factory->assembleSearchDriver()->delete($this)) {`
`272`	`268`	`$success = false;`
`273`	`269`	`}`
`274`	`270`	`}`
`275`	`271`
`276`	`272`	`// delete in cache`
`277`		`- if ($class::$cache) {`
	`273`	`+ if (static::$cache) {`
`278`	`274`	`if (!$factory->assembleCacheDriver()->delete($this)) {`
`279`	`275`	`$success = false;`
`280`	`276`	`}`
`@@ -290,7 +286,6 @@ public function delete(): bool`
`290`	`286`	`*/`
`291`	`287`	`public function getCacheTime(): int`
`292`	`288`	`{`
`293`		`- $class = get_called_class();`
`294`		`- return $class::$cache ?: 0;`
	`289`	`+ return static::$cache ?: 0;`
`295`	`290`	`}`
`296`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function getIdField(): string;`
`53`	`53`	`*`
`54`	`54`	`* @param string $id`
`55`	`55`	`* @param bool $update`
`56`		`- * @return ModelInterface\|bool`
	`56`	`+ * @return static\|bool`
`57`	`57`	`*/`
`58`	`58`	`public static function get(string $id, bool $update = false);`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ abstract class SimpleModel extends BaseModel`
`21`	`21`	`*/`
`22`	`22`	`public static function get(string $id, bool $update = false)`
`23`	`23`	`{`
`24`		`- $model = new (get_called_class())($id);`
	`24`	`+ $model = new static($id);`
`25`	`25`	`if (DriverFactory::getInstance()->assembleNoSQLDriver()->get($model)) {`
`26`	`26`	`return $model;`
`27`	`27`	`}`