MDL-57273 persistent: Improved style

Use \blah::class instead of '\\blah' in define_class functions. Allow chaining of setters by returning $this.
valmynd · Jan 23, 2017 · d581862 · d581862
1 parent 599acbe
commit d581862
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 20 deletions.
diff --git a/admin/tool/lp/classes/external/user_evidence_summary_exporter.php b/admin/tool/lp/classes/external/user_evidence_summary_exporter.php
@@ -38,7 +38,7 @@
 class user_evidence_summary_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\user_evidence';
+        return \core_competency\user_evidence::class;
     }
 
     protected static function define_other_properties() {

diff --git a/competency/classes/external/competency_exporter.php b/competency/classes/external/competency_exporter.php
@@ -33,7 +33,7 @@
 class competency_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\competency';
+        return \core_competency\competency::class;
     }
 
     protected static function define_related() {

diff --git a/competency/classes/external/competency_framework_exporter.php b/competency/classes/external/competency_framework_exporter.php
@@ -41,7 +41,7 @@ class competency_framework_exporter extends \core\external\persistent_exporter {
      * @return string
      */
     protected static function define_class() {
-        return 'core_competency\\competency_framework';
+        return \core_competency\competency_framework::class;
     }
 
     /**

diff --git a/competency/classes/external/course_competency_exporter.php b/competency/classes/external/course_competency_exporter.php
@@ -33,6 +33,6 @@
 class course_competency_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\course_competency';
+        return \core_competency\course_competency::class;
     }
 }
diff --git a/competency/classes/external/course_competency_settings_exporter.php b/competency/classes/external/course_competency_settings_exporter.php
@@ -34,7 +34,7 @@
 class course_competency_settings_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\course_competency_settings';
+        return \core_competency\course_competency_settings::class;
     }
 
 }
diff --git a/competency/classes/external/course_module_competency_exporter.php b/competency/classes/external/course_module_competency_exporter.php
@@ -33,6 +33,6 @@
 class course_module_competency_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\course_module_competency';
+        return \core_competency\course_module_competency::class;
     }
 }
diff --git a/competency/classes/external/evidence_exporter.php b/competency/classes/external/evidence_exporter.php
@@ -66,7 +66,7 @@ protected static function define_related() {
     }
 
     protected static function define_class() {
-        return 'core_competency\\evidence';
+        return evidence::class;
     }
 
     protected function get_other_values(renderer_base $output) {

diff --git a/competency/classes/external/plan_competency_exporter.php b/competency/classes/external/plan_competency_exporter.php
@@ -33,6 +33,6 @@
 class plan_competency_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\plan_competency';
+        return \core_competency\plan_competency::class;
     }
 }
diff --git a/competency/classes/external/plan_exporter.php b/competency/classes/external/plan_exporter.php
@@ -41,7 +41,7 @@
 class plan_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\plan';
+        return \core_competency\plan::class;
     }
 
     protected static function define_related() {

diff --git a/competency/classes/external/related_competency_exporter.php b/competency/classes/external/related_competency_exporter.php
@@ -33,6 +33,6 @@
 class related_competency_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\related_competency';
+        return \core_competency\related_competency::class;
     }
 }
diff --git a/competency/classes/external/template_competency_exporter.php b/competency/classes/external/template_competency_exporter.php
@@ -33,6 +33,6 @@
 class template_competency_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\template_competency';
+        return \core_competency\template_competency::class;
     }
 }
diff --git a/competency/classes/external/template_exporter.php b/competency/classes/external/template_exporter.php
@@ -38,7 +38,7 @@
 class template_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\template';
+        return \core_competency\template::class;
     }
 
     protected function get_other_values(renderer_base $output) {

diff --git a/competency/classes/external/user_competency_course_exporter.php b/competency/classes/external/user_competency_course_exporter.php
@@ -37,7 +37,7 @@
 class user_competency_course_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\user_competency_course';
+        return \core_competency\user_competency_course::class;
     }
 
     protected static function define_related() {

diff --git a/competency/classes/external/user_competency_exporter.php b/competency/classes/external/user_competency_exporter.php
@@ -41,7 +41,7 @@
 class user_competency_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\user_competency';
+        return user_competency::class;
     }
 
     protected static function define_related() {

diff --git a/competency/classes/external/user_competency_plan_exporter.php b/competency/classes/external/user_competency_plan_exporter.php
@@ -37,7 +37,7 @@
 class user_competency_plan_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\user_competency_plan';
+        return \core_competency\user_competency_plan::class;
     }
 
     protected static function define_related() {

diff --git a/competency/classes/external/user_evidence_competency_exporter.php b/competency/classes/external/user_evidence_competency_exporter.php
@@ -35,7 +35,7 @@
 class user_evidence_competency_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\user_evidence_competency';
+        return \core_competency\user_evidence_competency::class;
     }
 
 }
diff --git a/competency/classes/external/user_evidence_exporter.php b/competency/classes/external/user_evidence_exporter.php
@@ -39,7 +39,7 @@
 class user_evidence_exporter extends \core\external\persistent_exporter {
 
     protected static function define_class() {
-        return 'core_competency\\user_evidence';
+        return \core_competency\user_evidence::class;
     }
 
     protected static function define_other_properties() {

diff --git a/lib/classes/persistent.php b/lib/classes/persistent.php
@@ -109,12 +109,13 @@ final protected function verify_protected_methods() {
      * raw records from the DB.
      *
      * @param  string $property The property name.
-     * @return mixed
+     * @return $this
      */
     final public function set($property, $value) {
         $methodname = 'set_' . $property;
         if (method_exists($this, $methodname)) {
-            return $this->$methodname($value);
+            $this->$methodname($value);
+            return $this;
         }
         return $this->raw_set($property, $value);
     }
@@ -177,7 +178,7 @@ final protected function raw_get($property) {
      *
      * @param  string $property The property name.
      * @param  mixed $value The value.
-     * @return mixed
+     * @return $this
      */
     final protected function raw_set($property, $value) {
         if (!static::has_property($property)) {
@@ -188,6 +189,8 @@ final protected function raw_set($property, $value) {
             $this->validated = false;
         }
         $this->data[$property] = $value;
+
+        return $this;
     }
 
     /**