Add method to ArrayHelper, add TestHelper

derUli · Apr 5, 2020 · dba8bee · dba8bee
1 parent 5e6591d
commit dba8bee
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 25 deletions.
diff --git a/doc-src/Neue Features in UliCMS 2020.2.odt b/doc-src/Neue Features in UliCMS 2020.2.odt
diff --git a/doc/Neue Features in UliCMS 2020.2.pdf b/doc/Neue Features in UliCMS 2020.2.pdf
diff --git a/doc/changelog.txt b/doc/changelog.txt
@@ -17,6 +17,7 @@ Neue API-Methoden:
 * User->getGroupCollection(): GroupCollection
 * User->isOnline(): bool
 * User->isCurrent(): bool
+* ArrayHelper::getValueOrDefault(?array $input, $key, $default)
 
 Entfernte API-Methoden:
 * BackendHelper::formatDatasetCount(int $count): void

diff --git a/ulicms/admin/inc/registerform.php b/ulicms/admin/inc/registerform.php
@@ -1,5 +1,5 @@
 <?php
-if (Settings::get("visitors_can_register") == "off" or!Settings::get("visitors_can_register")) {
+if (Settings::get("visitors_can_register") == "off" or !Settings::get("visitors_can_register")) {
     translate("FUNCTION_IS_DISABLED");
 } else {
     // TODO: Move logic to RegistrationController
@@ -8,7 +8,7 @@
 
     $errors = false;
     if (isset($_POST["register_user"])) {
-        if ($checkbox->isEnabled() and!$checkbox->isChecked()) {
+        if ($checkbox->isEnabled() and !$checkbox->isChecked()) {
             echo "<p style='color:red;'>" . get_translation("please_accept_privacy_conditions") . "</p>";
         } else if (empty($_POST["username"]) or empty($_POST["password"]) or empty($_POST["firstname"]) or empty($_POST["lastname"])) {
             echo "<p style='color:red;'>" . get_translation("FILL_ALL_FIELDS") . "</p>";

diff --git a/ulicms/classes/helpers/ArrayHelper.php b/ulicms/classes/helpers/ArrayHelper.php
@@ -26,7 +26,7 @@ public static function insertBefore(
                 break;
             }
             $tmpArray[$key] = $value;
-            $originalIndex ++;
+            $originalIndex++;
         }
         array_splice($input, 0, $originalIndex, $tmpArray);
         return $input;
@@ -45,7 +45,7 @@ public static function insertAfter(
         $originalIndex = 0;
         foreach ($input as $key => $value) {
             $tmpArray[$key] = $value;
-            $originalIndex ++;
+            $originalIndex++;
             if ($key === $index) {
                 $tmpArray[] = $element;
                 break;
@@ -80,7 +80,7 @@ public static function getSingle(array $input) {
     }
 
     // flatten a nested array structure to one layer
-    public static function flatten($input) {
+    public static function flatten($input): array {
         if (!is_array($input)) {
             // nothing to do if it's not an array
             return [$input];
@@ -95,4 +95,12 @@ public static function flatten($input) {
         return $result;
     }
 
+    public static function getValueOrDefault(?array $input, $key, $default) {
+        if (!$input) {
+            return $default;
+        }
+
+        return isset($input[$key]) ? $input[$key] : $default;
+    }
+
 }
diff --git a/ulicms/classes/helpers/TestHelper.php b/ulicms/classes/helpers/TestHelper.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace UliCMS\Helpers;
+
+class TestHelper extends \Helper {
+
+    // Check if PHP is running in context of a Unit test
+    public static function isRunningPHPUnit(): bool {
+        return defined('PHPUNIT_COMPOSER_INSTALL') or defined('__PHPUNIT_PHAR__');
+    }
+
+}
diff --git a/ulicms/classes/helpers/load.php b/ulicms/classes/helpers/load.php
@@ -8,7 +8,8 @@
     "NumberFormatHelper",
     "StringHelper",
     "UrlHelper",
-    "DataTablesHelper"
+    "DataTablesHelper",
+    "TestHelper"
 );
 foreach ($classes as $class) {
     require_once dirname(__file__) . "/$class.php";

diff --git a/ulicms/classes/objects/users/User.php b/ulicms/classes/objects/users/User.php
@@ -311,7 +311,7 @@ public function resetPassword(): void {
     }
 
     public function getFullName(): string {
-        return (!empty($this->firstname) and!empty($this->lastname)) ?
+        return (!empty($this->firstname) and !empty($this->lastname)) ?
                 "{$this->firstname} {$this->lastname}" : "";
     }
 

diff --git a/ulicms/content/modules/core_content/controllers/PageController.php b/ulicms/content/modules/core_content/controllers/PageController.php
@@ -577,7 +577,7 @@ public function getLanguageSelection(): array {
                     $language,
                     getLanguageNameByCode($language)
             );
-            if (count($userLanguages) and!in_array($language, $userLanguages)) {
+            if (count($userLanguages) and !in_array($language, $userLanguages)) {
                 continue;
             }
 

diff --git a/ulicms/content/modules/core_content/templates/categories.php b/ulicms/content/modules/core_content/templates/categories.php
@@ -23,7 +23,7 @@
     $categories = Categories::getAllCategories($order);
     ?>
     <?php
-    if (!isset($_GET["add"]) and!isset($_GET["edit"])
+    if (!isset($_GET["add"]) and !isset($_GET["edit"])
             and $permissionChecker->hasPermission("categories_create")) {
         ?>
         <?php
@@ -48,8 +48,8 @@ class="fa fa-plus"></i>
     }
     ?>
     <?php
-    if (count($categories) > 0 and!isset($_GET["add"])
-            and!isset($_GET["edit"])) {
+    if (count($categories) > 0 and !isset($_GET["add"])
+            and !isset($_GET["edit"])) {
         ?>
         <div class="scroll">
             <table class="tablesorter">

diff --git a/ulicms/content/modules/core_content/templates/pages/edit.php b/ulicms/content/modules/core_content/templates/pages/edit.php
@@ -64,7 +64,7 @@
         $can_edit_this = $checker->canWrite($row->id);
 
         $languageAssignment = getAllLanguages(true);
-        if (count($languageAssignment) > 0 and!in_array($row->language, $languageAssignment)) {
+        if (count($languageAssignment) > 0 and !in_array($row->language, $languageAssignment)) {
             $can_edit_this = false;
         }
 
@@ -1036,7 +1036,7 @@ class="btn btn-default" target="_blank"><i class="fa fa-comments"></i> <?php tra
                                             echo $th;
                                             ?>"
                                             <?php
-                                            if (!is_null($row->theme) and!empty($row->theme) and $row->theme == $th)
+                                            if (!is_null($row->theme) and !empty($row->theme) and $row->theme == $th)
                                                 echo "selected";
                                             ?>>
                                                 <?php

diff --git a/ulicms/content/modules/core_content/utils/PageTableRenderer.php b/ulicms/content/modules/core_content/utils/PageTableRenderer.php
@@ -146,7 +146,7 @@ public function getData(
     }
 
     protected function buildFilterSQL($where, $filters): string {
-        if (isset($filters["type"]) and!empty($filters["type"])) {
+        if (isset($filters["type"]) and !empty($filters["type"])) {
             $where .= " and type ='" .
                     Database::escapeValue($filters["type"]) .
                     "'";

diff --git a/ulicms/content/modules/core_forms/templates/edit.php b/ulicms/content/modules/core_forms/templates/edit.php
@@ -3,7 +3,7 @@
 use UliCMS\Models\Content\Categories;
 
 $permissionChecker = new ACL();
-if (!$permissionChecker->hasPermission("forms") or!$permissionChecker->hasPermission("forms_edit")) {
+if (!$permissionChecker->hasPermission("forms") or !$permissionChecker->hasPermission("forms_edit")) {
     noPerms();
 } else {
     $forms = Forms::getAllForms();

diff --git a/ulicms/content/modules/core_settings/templates/open_graph/form.php b/ulicms/content/modules/core_settings/templates/open_graph/form.php
@@ -6,7 +6,7 @@
 if ($permissionChecker->hasPermission("open_graph")) {
     $og_image = Settings::get("og_image");
     $og_url = "";
-    if (!empty($og_image) and!startsWith($og_image, "http")) {
+    if (!empty($og_image) and !startsWith($og_image, "http")) {
         $og_url = get_protocol_and_domain() . $og_image;
     }
     ?>

diff --git a/ulicms/tests/environment/DependenciesTest.php b/ulicms/tests/environment/DependenciesTest.php
diff --git a/ulicms/tests/environment/SystemRequirementsTest.php b/ulicms/tests/environment/SystemRequirementsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use UliCMS\Helpers\TestHelper;
+
 class SystemRequirementsTest extends \PHPUnit\Framework\TestCase {
 
 	public function testPhpVersion() {
@@ -49,5 +51,12 @@ public function testPhpModuleXml() {
 	public function testConnectToUliCMSServices() {
 		$this->assertNotNull(file_get_contents_wrapper("https://www.ulicms.de/", true));
 	}
+
+    public function testPhpIcoInstalled() {
+        $this->assertTrue(class_exists("PHP_ICO"));
+    }
 
+    public function testIsRunningPHPUnit(){
+        $this->assertTrue(TestHelper::isRunningPHPUnit());
+    }
 }
diff --git a/ulicms/tests/helpers/ArrayHelperTest.php b/ulicms/tests/helpers/ArrayHelperTest.php
@@ -181,4 +181,23 @@ public function testFlattenWithString() {
                 ArrayHelper::flatten("ulicms"));
     }
 
+    public function testGetValueOrDefaultWithNullReturnsDefault() {
+        $this->assertEquals("foobar",
+                ArrayHelper::getValueOrDefault(null, "hello", "foobar"));
+    }
+
+    public function testGetValueOrDefaultWithArrayReturnsDefault() {
+        $this->assertEquals("foobar",
+                ArrayHelper::getValueOrDefault(
+                        ["gibts" => "not"], "hello", "foobar")
+        );
+    }
+
+    public function testGetValueOrDefaultWithArrayReturnsValue() {
+        $this->assertEquals("world",
+                ArrayHelper::getValueOrDefault(
+                        ["hello" => "world"], "hello", "foobar")
+        );
+    }
+
 }