ProjectCommon made dynamic

classes/Application.php

@@ -1,7 +1,7 @@
 <?php
 namespace GodsDev\MyCMS;
 
-use \GodsDev\Tools\Tools;
+//use GodsDev\Tools\Tools;
 
 class Application {
 

classes/MyAdmin.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace GodsDev\MyCMS;
+
+/**
+ * Parent for deployed Admin instance
+ * 
+ */
+class MyAdmin extends MyCommon
+{
+
+    /**
+     * Child may pre-populate $acceptedAttributes by addAcceptedmethod, all of them MUST be declared as protected/public variables
+     * 
+     * @param \GodsDev\MyCMS\MyCMS $MyCMS
+     * @param array $options that overides default values within constructor
+     */
+    public function __construct(MyCMS $MyCMS, array $options = array())
+    {
+        //nothing by default: $this->addAccepted('');
+        parent::__construct($MyCMS, $options);
+    }
+
+}

classes/MyCMS.php

@@ -109,7 +109,7 @@ public function __construct(array $myCmsConf = array())
      * 
      * @param array $getArray $_GET or its equivalent
      * @param array $sessionArray $_SESSION or its equivalent
-     * @return bool $makeInclude for testing may be set to false as mycms itself does not contain the language-XX.inc.php files
+     * @param bool $makeInclude for testing may be set to false as mycms itself does not contain the language-XX.inc.php files
      * @return string to be used as $_SESSION['language']
      * 
      * constant TAB_PREFIX expected

classes/MyCommon.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace GodsDev\MyCMS;
+
+/**
+ * Generic ancestor for classes that uses MyCMS
+ * 
+ */
+class MyCommon
+{
+
+    use \Nette\SmartObject;
+
+    /** @var \GodsDev\MyCMS\MyCMS */
+    protected $MyCMS;
+
+    /** @var array */
+    protected $acceptedAttributes;
+
+    /**
+     * accepted attributes:
+     */
+
+
+    /**
+     * Child may pre-populate $acceptedAttributes by addAcceptedmethod, all of them MUST be declared as protected/public variables
+     * 
+     * @param \GodsDev\MyCMS\MyCMS $MyCMS
+     * @param array $options that overides default values within constructor
+     */
+    public function __construct(MyCMS $MyCMS, array $options = array())
+    {
+        //nothing by default $this->addAccepted('get session');
+        foreach (array_merge(
+                array(//default values
+                ), $options) as $optionVariable => $optionContent) {
+            if (in_array($optionVariable, $this->acceptedAttributes, true)) {
+                $this->{$optionVariable} = $optionContent;
+            }
+        }
+        $this->MyCMS = $MyCMS;
+    }
+
+    /**
+     * 
+     * @param string $acceptedList space delimited
+     */
+    protected function addAccepted($acceptedList)
+    {
+        $this->acceptedAttributes = array_merge(explode(' ', $acceptedList), $this->acceptedAttributes ? $this->acceptedAttributes : array());
+    }
+
+}

classes/MyController.php

@@ -7,56 +7,34 @@
  * 
  * The default template is `home`
  */
-class MyController
+class MyController extends MyCommon
 {
 
-    use \Nette\SmartObject;
-
-    /** @var \GodsDev\MyCMS\MyCMS */
-    protected $MyCMS;
-
     /** @var array */
     protected $result;
-
-    /** @var array */
-    protected $acceptedAttributes;
-
-    //accepted attributes:
+
+    /**
+     * accepted attributes:
+     */
     /** @var array */
     protected $get;
 
     /** @var array */
     protected $session;
 
     /**
-     * Child may pre-populate $acceptedAttributes by addAcceptedmethod, all of them MUST be declared as variables
+     * Child may pre-populate $acceptedAttributes by addAcceptedmethod, all of them MUST be declared as protected/public variables
      * 
      * @param \GodsDev\MyCMS\MyCMS $MyCMS
      * @param array $options that overides default values within constructor
      */
     public function __construct(MyCMS $MyCMS, array $options = array())
     {
         $this->addAccepted('get session');
-        foreach (array_merge(
-                array(//default values
-                ), $options) as $optionVariable => $optionContent) {
-            if (in_array($optionVariable, $this->acceptedAttributes, true)) {
-                $this->{$optionVariable} = $optionContent;
-            }
-        }
-        $this->MyCMS = $MyCMS;
+        parent::__construct($MyCMS, $options);
         $this->result = array("template" => "home", "context" => ($this->MyCMS->context ? $this->MyCMS->context : array()));
     }
 
-    /**
-     * 
-     * @param string $acceptedList space delimited
-     */
-    protected function addAccepted($acceptedList)
-    {
-        $this->acceptedAttributes = array_merge(explode(' ', $acceptedList), $this->acceptedAttributes ? $this->acceptedAttributes : array());
-    }
-
     /**
      * Outputs changed $MyCMS->template and $MyCMS->context as fields of an array
      * 

classes/ProjectCommon.php

@@ -2,17 +2,29 @@
 
 namespace GodsDev\MyCMS;
 
-use Psr\Log\LoggerInterface;
-
 class ProjectCommon
-{    
+{
+
     use \Nette\SmartObject;
 
-    /** 
+    /** @var \GodsDev\MyCMS\MyCMS */
+    protected $MyCMS;
+
+    /**
+     * 
+     * @param \GodsDev\MyCMS\MyCMS $MyCMS
+     */
+    public function __construct(MyCMS $MyCMS)
+    {
+        $this->MyCMS = $MyCMS;
+    }
+
+    /**
      * Shortcut for echo'<pre>'; var_dump(); and exit;
      * @param mixed variable(s) or expression to display
      */
-    public static function dump($var) {
+    public static function dump($var)
+    {
         echo '<pre>';
         foreach (func_get_args() as $arg) {
             var_dump($arg);
@@ -21,7 +33,8 @@ public static function dump($var) {
     }
 
     //@todo refactor as getTexy() which returns Texy object that is initialized in this dynamic class
-    public static function prepareTexy() {
+    public static function prepareTexy()
+    {
         global $Texy;
         if (!is_object($Texy)) {
             $Texy = new \Texy();
@@ -37,7 +50,8 @@ public static function prepareTexy() {
      * @param string $stringOfTime
      * @param string $language
      */
-    public static function localDate($stringOfTime, $language) {
+    public static function localDate($stringOfTime, $language)
+    {
         switch ($language) {
             case 'cs': return date('j.n.Y', strtotime($stringOfTime));
         }

classes/TableAdmin.php

@@ -2,7 +2,7 @@
 
 namespace GodsDev\MyCMS;
 
-use \GodsDev\Tools\Tools;
+use GodsDev\Tools\Tools;
 
 /**
  * This class facilitates administration of a database table

classes/TableLister.php

@@ -2,7 +2,7 @@
 
 namespace GodsDev\MyCMS;
 
-use \GodsDev\Tools\Tools;
+use GodsDev\Tools\Tools;
 
 /**
  * Class that can list rows of a database table, with editable search/filter