Merge pull request #3 from cafuego/php8-updates-for-staging

Php8 updates for staging

Author: cafuego

.github/workflows/php.yml

@@ -20,6 +20,10 @@ jobs:
           tools: composer
         env:
           fail-fast: true
+      - name: Lint
+        run: make lint-ci
+        env:
+          fail-fast: true
       - name: composer
         run: composer install
         env:
@@ -28,7 +32,7 @@ jobs:
         run: composer validate
         env:
           fail-fast: true
-      - name: Lint
-        run: make lint-ci
+      - name: phpcs
+        run: make phpcs-ci
         env:
           fail-fast: true

Makefile

@@ -24,10 +24,15 @@ docker-run:
 docker: docker-build docker-run
 
 lint:
-	./vendor/bin/phpcs --tab-width=4 --report=summary www scripts
+	find -L www scripts -iregex '.*\.php$$' -print0 | xargs -0 -n 1 -P 4 php -l
 
-lint-verbose:
-	./vendor/bin/phpcs --tab-width=4 www scripts
+lint-ci: lint
 
-lint-ci:
-	./vendor/bin/phpcs --tab-width=4 www scripts --report=json --report-file=phpcs-report.json
+phpcs:
+	./vendor/bin/phpcs --standard=phpcs.xml --tab-width=4 --report=summary www scripts
+
+phpcs-verbose:
+	./vendor/bin/phpcs --standard=phpcs.xml --tab-width=4 www scripts
+
+phpcs-ci:
+	./vendor/bin/phpcs --standard=phpcs.xml --tab-width=4 www scripts --report=json --report-file=phpcs-report.json

phpcs.xml

@@ -14,11 +14,22 @@
   <!-- Disable a few sniffs. -->
   <rule ref="Drupal">
     <exclude name="Drupal.Arrays.Array"/>
+    <exclude name="Drupal.Classes.ClassFileName"/>
     <exclude name="Drupal.Commenting.DocComment"/>
+    <exclude name="Drupal.Commenting.VariableComment"/>
+    <exclude name="Drupal.NamingConventions.ValidClassName"/>
     <exclude name="Drupal.NamingConventions.ValidGlobal"/>
+    <exclude name="Drupal.NamingConventions.ValidFunctionName"/>
     <exclude name="Drupal.NamingConventions.ValidVariableName"/>
   </rule>
 
+  <!-- Override some settings -->
+  <rule ref="Drupal.WhiteSpace.ScopeIndent">
+    <properties>
+      <property name="indent" value="4"/>
+    </properties>
+  </rule>
+
   <!--Exclude third party code.-->
   <exclude-pattern>./vendor/*</exclude-pattern>
 

www/includes/data.php

@@ -72,13 +72,16 @@
  */
 class DATA {
 
+  private $metadata;
+
   /**
    *
    */
-  public function Data() {
+  public function __construct() {
 
     // Defined in config.php.
     include_once METADATAPATH;
+    $this->metadata = new Metadata();
 
   }
 
@@ -103,14 +106,14 @@ public function set_section() {
    * $key is the element of metadata you want to retrieve.
    */
   public function page_metadata($page, $key) {
-    return $this->_get_metadata(["page" => $page, "key" => $key], "page");
+    return $this->metadata->get_metadata(["page" => $page, "key" => $key], "page");
   }
 
   /**
    *
    */
   public function section_metadata($section, $key) {
-    return $this->_get_metadata(["section" => $section, "key" => $key], "section");
+    return $this->metadata->get_metadata(["section" => $section, "key" => $key], "section");
   }
 
   // Setting page and section.
@@ -119,14 +122,14 @@ public function section_metadata($section, $key) {
    * $page/$section, $key and $value should make sense...
    */
   public function set_page_metadata($page, $key, $value) {
-    $this->_set_metadata(["page" => $page, "key" => $key, "value" => $value]);
+    $this->metadata->set_metadata(["page" => $page, "key" => $key, "value" => $value]);
   }
 
   /**
    *
    */
   public function set_section_metadata($section, $key, $value) {
-    $this->_set_metadata(["section" => $section, "key" => $key, "value" => $value]);
+    $this->metadata->set_metadata(["section" => $section, "key" => $key, "value" => $value]);
   }
 
   // DEPRECATED.
@@ -135,97 +138,9 @@ public function set_section_metadata($section, $key, $value) {
    * Directly access an item.
    */
   public function metadata($type, $item, $key) {
-    if ($this->test_for_metadata($type, $item, $key)) {
-      return $this->$type[$item][$key];
-    }
-    else {
-      return "INVALID METADATA: $type[$item][$key]";
-    }
-  }
-
-  // Test for the presence of something.
-
-  /**
-   * Eg $exists = $DATA->test_for_metadata("page", "about", "title")
-   */
-  public function test_for_metadata($type, $item, $key) {
-    $dataarray =& $this->$type;
-
-    if (isset($dataarray[$item][$key])) {
-      return TRUE;
-    }
-    else {
-      return FALSE;
-    }
+    return "ACCESS DEBIED FOR type[$item][$key] USE THE PUBLIC METHODS";
   }
 
-  //
-  // PRIVATE METADATA ACCESS FUNCTIONS //
-  // .
-
-  /**
-   * Only accessed through page_metadata() or section_metadata()
-   */
-  public function _get_metadata($args = "", $type) {
-    // $type is either 'page' or 'section'
-    global $this_page, $this_section;
-
-    if (is_array($args)) {
-      $item = $args[$type];
-      $key = $args['key'];
-    }
-    else {
-      $var = "this_" . $type;
-      // $this_page or $this_section.
-      $item = $$var;
-      $key = $args;
-    }
-
-    twfy_debug("DATA", "$type: $item, $key");
-    $dataarray =& $this->$type;
-
-    if ($this->test_for_metadata($type, $item, $key)) {
-      $return = $dataarray[$item][$key];
-      $debugtext = "Key: " . $type . "[" . $item . "][" . $key . "]";
-
-    }
-    elseif ($this->test_for_metadata($type, "default", $key)) {
-      $return = $dataarray["default"][$key];
-      $debugtext = "Key: " . $type . "['default'][" . $key . "]";
-
-    }
-    else {
-      $return = FALSE;
-      $debugtext = "No metadata found for key '$key'";
-    }
-
-    twfy_debug("DATA", "$debugtext, returning '" . print_r($return, TRUE) . "'.");
-
-    return $return;
-  }
-
-  /**
-   *
-   */
-  public function _set_metadata($args) {
-
-    if (isset($args["section"])) {
-      $type = "section";
-      $item = $args["section"];
-    }
-    else {
-      $type = "page";
-      $item = $args["page"];
-    }
-
-    $key = $args["key"];
-    $value = $args["value"];
-
-    twfy_debug("DATA", "Setting: " . $type . "[" . $item . "][" . $key . "] = '" . print_r($value, TRUE) . "'");
-
-    $dataarray =& $this->$type;
-    $dataarray[$item][$key] = $value;
-  }
 
 }
 

www/includes/easyparliament/commentlist.php

@@ -35,12 +35,13 @@
 class COMMENTLIST
 {
 
-    /**
-     *
-     */
-    public function COMMENTLIST()
-    {
-        global $this_page;
+  private $db  = null;
+
+  /**
+   *
+   */
+  public function __construct() {
+    global $this_page;
 
         $this->db = new ParlDB();
 

www/includes/easyparliament/hansardlist.php

@@ -49,6 +49,8 @@
 class HANSARDLIST
 {
 
+    private $db;
+
     // We add 'wrans' or 'debate' onto the end of this in the appropriate classes'
     // constructors.
     // If you change this, change it in COMMENTSLIST->_fix_gid() too!
@@ -116,7 +118,7 @@ class HANSARDLIST
     /**
      *
      */
-    public function HANSARDLIST()
+    public function __construct()
     {
         $this->db = new ParlDB();
     }