Merge pull request #1 from HitArrowLegend/patch-3

Patch 3

.github/workflows/utilities/library-switcher

@@ -1,5 +1,11 @@
 #!/usr/bin/env php
 <?php
+/**
+ * Storm library switch for CI
+ *
+ * Switches the version of the Storm library being required through Composer. The only argument is the branch or tag
+ * to switch to.
+ */
 if (empty($argv[1])) {
     echo 'You must provide a version to switch the library dependency to.';
     echo "\n";

.github/workflows/utilities/phpcs-pr

@@ -1,5 +1,11 @@
 #!/usr/bin/env php
 <?php
+/**
+ * Run PHPCS tests against a PR.
+ *
+ * The only argument is for the PR's base branch, which is then compared to the HEAD of the PR to retrieve the list
+ * of changed files. The PHPCS tests are only run against these changed files, to speed up the tests.
+ */
 if (empty($argv[1])) {
     echo 'You must provide a base branch to check this PR against.';
     echo "\n";

.github/workflows/utilities/phpcs-push

@@ -1,5 +1,11 @@
 #!/usr/bin/env php
 <?php
+/**
+ * Run PHPCS tests against a push.
+ *
+ * The only argument is for the commit, which a list of changed files is retrieved from. The PHPCS tests are only run
+ * against these changed files, to speed up the tests.
+ */
 if (empty($argv[1])) {
     echo 'You must provide a commit SHA to check.';
     echo "\n";

README.md

@@ -13,15 +13,15 @@ Winter's mission is to show the world that web development is not rocket science
 
 Instructions on how to install Winter can be found at the [installation guide](https://wintercms.com/docs/setup/installation).
 
-### Quick start installation
+### Quick Start Installation
 
 For advanced users, run this in your terminal to install Winter from command line:
 
 ```shell
 composer create-project wintercms/winter example.com "dev-develop"
 ```
 
-If you plan on using a database, run this command:
+If you plan on using a database, run this command inside the application directory.
 
 ```shell
 php artisan winter:install

config/cache.php

@@ -11,6 +11,11 @@
     | using this caching library. This connection is used when another is
     | not explicitly specified when executing a given caching function.
     |
+    | WARNING! Do not use anything that is used for other information in your
+    | application. Example: If you are using redis for managing queues and / or
+    | sessions, you should NOT be using the EXACT SAME redis connection for the
+    | Cache store, as calling Cache::flush() will flush the entire redis store.
+    |
     */
 
     'default' => 'file',
@@ -29,16 +34,16 @@
     'stores' => [
 
         'apc' => [
-            'driver' => 'apc'
+            'driver' => 'apc',
         ],
 
         'array' => [
-            'driver' => 'array'
+            'driver' => 'array',
         ],
 
         'database' => [
-            'driver' => 'database',
-            'table'  => 'cache',
+            'driver'     => 'database',
+            'table'      => 'cache',
             'connection' => null,
         ],
 
@@ -59,7 +64,7 @@
         ],
 
         'redis' => [
-            'driver' => 'redis',
+            'driver'     => 'redis',
             'connection' => 'default',
         ],
 

config/database.php

@@ -48,7 +48,7 @@
 
         'sqlite' => [
             'driver'   => 'sqlite',
-            'database' => 'storage/database.sqlite',
+            'database' => base_path('storage/database.sqlite'),
             'prefix'   => '',
         ],
 
@@ -144,4 +144,5 @@
     */
 
     'useConfigForTesting' => false,
+
 ];

config/mail.php

@@ -55,7 +55,10 @@
     |
     */
 
-    'from' => ['address' => '[email protected]', 'name' => 'Winter CMS'],
+    'from' => [
+        'address' => '[email protected]',
+        'name'    => 'Winter CMS',
+    ],
 
     /*
     |--------------------------------------------------------------------------

config/queue.php

@@ -44,31 +44,31 @@
 
         'beanstalkd' => [
             'driver' => 'beanstalkd',
-            'host'   => 'localhost',
-            'queue'  => 'default',
-            'ttr'    => 60,
+            'host' => 'localhost',
+            'queue' => 'default',
+            'ttr' => 60,
         ],
 
         'sqs' => [
             'driver' => 'sqs',
-            'key'    => 'your-public-key',
+            'key' => 'your-public-key',
             'secret' => 'your-secret-key',
-            'queue'  => 'your-queue-url',
+            'queue' => 'your-queue-url',
             'region' => 'us-east-1',
         ],
 
         'iron' => [
-            'driver'  => 'iron',
-            'host'    => 'mq-aws-us-east-1.iron.io',
-            'token'   => 'your-token',
+            'driver' => 'iron',
+            'host' => 'mq-aws-us-east-1.iron.io',
+            'token' => 'your-token',
             'project' => 'your-project-id',
-            'queue'   => 'your-queue-name',
+            'queue' => 'your-queue-name',
             'encrypt' => true,
         ],
 
         'redis' => [
             'driver' => 'redis',
-            'queue'  => 'default',
+            'queue' => 'default',
             'expire' => 60,
         ],
 
@@ -86,7 +86,8 @@
     */
 
     'failed' => [
-        'database' => 'mysql', 'table' => 'failed_jobs',
+        'database' => 'mysql',
+        'table' => 'failed_jobs',
     ],
 
 ];

config/testing/cms.php

@@ -119,6 +119,6 @@
     |
     */
 
-    'enableCsrfProtection' => false
+    'enableCsrfProtection' => false,
 
 ];

modules/backend/classes/NavigationManager.php

@@ -237,7 +237,7 @@ public function registerMenuItems($owner, array $definitions)
      */
     public function registerOwnerAlias(string $owner, string $alias)
     {
-        $this->aliases[$alias] = $owner;
+        $this->aliases[strtoupper($alias)] = strtoupper($owner);
     }
 
     /**
@@ -632,7 +632,7 @@ public function setContext($owner, $mainMenuItemCode, $sideMenuItemCode = null)
      */
     public function setContextOwner($owner)
     {
-        $this->contextOwner = $owner;
+        $this->contextOwner = strtoupper($owner);
     }
 
     /**
@@ -685,7 +685,7 @@ public function setContextSideMenu($sideMenuItemCode)
      */
     public function isMainMenuItemActive($item)
     {
-        return $this->getContextOwner() === $item->owner && $this->contextMainMenuItemCode === $item->code;
+        return $this->getContextOwner() === strtoupper($item->owner) && $this->contextMainMenuItemCode === $item->code;
     }
 
     /**
@@ -716,7 +716,7 @@ public function isSideMenuItemActive($item)
             return true;
         }
 
-        return $this->getContextOwner() === $item->owner && $this->contextSideMenuItemCode === $item->code;
+        return $this->getContextOwner() === strtoupper($item->owner) && $this->contextSideMenuItemCode === $item->code;
     }
 
     /**
@@ -741,7 +741,7 @@ public function registerContextSidenavPartial($owner, $mainMenuItemCode, $partia
      */
     public function getContextSidenavPartial($owner, $mainMenuItemCode)
     {
-        $owner = $this->aliases[$owner] ?? $owner;
+        $owner = $this->aliases[strtoupper($owner)] ?? $owner;
         $key = $owner.$mainMenuItemCode;
 
         return $this->contextSidenavPartials[$key] ?? null;
@@ -778,6 +778,7 @@ protected function filterItemPermissions($user, array $items)
      */
     protected function makeItemKey($owner, $code)
     {
-        return strtoupper($this->aliases[$owner] ?? $owner).'.'.strtoupper($code);
+        $owner = strtoupper($owner);
+        return ($this->aliases[$owner] ?? $owner) . '.' . strtoupper($code);
     }
 }

modules/backend/formwidgets/RecordFinder.php

@@ -147,6 +147,11 @@ public function init()
             throw new ApplicationException(Lang::get('backend::lang.recordfinder.invalid_model_class', ['modelClass' => $this->modelClass]));
         }
 
+        $modelKey = $this->getRecordModel()->getKeyName();
+        if ($this->keyFrom === 'id' && $modelKey !== 'id') {
+            $this->keyFrom = $modelKey;
+        }
+
         if (post('recordfinder_flag')) {
             $this->listWidget = $this->makeListWidget();
             $this->listWidget->bindToController();
@@ -302,16 +307,27 @@ public function onFindRecord()
         return $this->makePartial('recordfinder_form');
     }
 
-    protected function makeListWidget()
+    /**
+     * Gets the base model instance used by this field
+     *
+     * @return \Winter\Storm\Database\Model
+     */
+    protected function getRecordModel()
     {
-        $config = $this->makeConfig($this->getConfig('list'));
-
+        $model = null;
         if ($this->useRelation) {
-            $config->model = $this->getRelationModel();
+            $model = $this->getRelationModel();
         } else {
-            $config->model = new $this->modelClass;
+            $model = new $this->modelClass;
         }
+        return $model;
+    }
+
+    protected function makeListWidget()
+    {
+        $config = $this->makeConfig($this->getConfig('list'));
 
+        $config->model = $this->getRecordModel();
         $config->alias = $this->alias . 'List';
         $config->showSetup = false;
         $config->showCheckboxes = false;

modules/backend/formwidgets/taglist/partials/_taglist.htm

@@ -1,18 +1,32 @@
 <?php
     $selectedValues = is_array($selectedValues) ? $selectedValues : [];
     $availableOptions = $useKey ? $fieldOptions : array_unique(array_merge($selectedValues, $fieldOptions));
+    $displayOnlyOptions = [];
+
+    foreach ($availableOptions as $key => $option) {
+        if (!strlen($option)) {
+            continue;
+        }
+        if (($useKey && in_array($key, $selectedValues)) || (!$useKey && in_array($option, $selectedValues))) {
+            $displayOnlyOptions[] = $option;
+        }
+    }
 ?>
 <!-- Tag List -->
 <?php if ($this->previewMode || $field->readOnly || $field->disabled): ?>
     <ul class="form-control taglist--preview" <?= $field->readOnly || $field->disabled ? 'disabled="disabled"' : ''; ?>>
-        <?php foreach ($availableOptions as $key => $option): ?>
-            <?php if (!strlen($option)) continue ?>
-            <?php if (($useKey && in_array($key, $selectedValues)) || (!$useKey && in_array($option, $selectedValues))): ?>
-                <li class="taglist__item"><?= e(trans($option)) ?></li>
-            <?php endif ?>
+        <?php foreach ($displayOnlyOptions as $option): ?>
+            <li class="taglist__item"><?= e(trans($option)) ?></li>
         <?php endforeach ?>
     </ul>
-    <?php if ($field->readOnly): ?>
+    <?php if ($field->readOnly && is_array($field->value)): ?>
+        <?php foreach ($displayOnlyOptions as $option): ?>
+        <input
+            type="hidden"
+            name="<?= $field->getName() ?>[]"
+            value="<?= $option ?>">
+        <?php endforeach ?>
+    <?php else: ?>
         <input
             type="hidden"
             name="<?= $field->getName() ?>"

modules/backend/lang/be/lang.php

@@ -528,6 +528,10 @@
         'selection_mode' => "Рэжым выбару",
         'resize_image' => "Змяніць памер",
         'image_size' => "Памер выявы:",
-        'selected_size' => "Выбрана:"
+        'selected_size' => "Выбрана:",
+        'rename_popup_title' => "Пераіменаваць",
+        'rename_new_name' => "Новае імя",
+        'move_please_select' => "калі ласка, выберыце",
+        'move_button' => "Перамясціць",
     ]
 ];

modules/backend/lang/bg/lang.php

@@ -432,6 +432,10 @@
         'selection_mode' => 'Режимът на избиране (селекция)',
         'resize_image' => 'Преоразмеряване изображение',
         'image_size' => 'Размер на изображение:',
-        'selected_size' => 'Избран:'
+        'selected_size' => 'Избран:',
+        'rename_popup_title' => 'Преименувай',
+        'rename_new_name' => 'Ново име',
+        'move_please_select' => 'Моля изберете',
+        'move_button' => 'Премести',
     ]
 ];

modules/backend/lang/ca/lang.php

@@ -590,6 +590,10 @@
         'selection_mode' => 'Selecciona mode',
         'resize_image' => 'Redimensionar imatge',
         'image_size' => "Mida d'imatge:",
-        'selected_size' => 'Seleccionat:'
+        'selected_size' => 'Seleccionat:',
+        'rename_popup_title' => 'Reanomenar',
+        'rename_new_name' => 'Nou nom',
+        'move_please_select' => 'si us plau selecciona',
+        'move_button' => 'Moure',
     ],
 ];

modules/backend/lang/cs/lang.php

@@ -554,6 +554,10 @@
         'selection_mode' => 'Způsob označování (selection mode)',
         'resize_image' => 'Změnit velikost obrázku',
         'image_size' => 'Velikost obrázku:',
-        'selected_size' => 'Vybráno:'
+        'selected_size' => 'Vybráno:',
+        'rename_popup_title' => 'Přejmenovat',
+        'rename_new_name' => 'Nový název',
+        'move_please_select' => 'prosím vyberte',
+        'move_button' => 'Přesunout',
     ],
 ];

modules/backend/lang/da/lang.php

@@ -539,6 +539,10 @@
         'selection_mode' => 'Udvælgelsesmetode',
         'resize_image' => 'Skaler billede',
         'image_size' => 'Billedstørrelse:',
-        'selected_size' => 'Valgt:'
+        'selected_size' => 'Valgt:',
+        'rename_popup_title' => 'Omdøb',
+        'rename_new_name' => 'Nyt navn',
+        'move_please_select' => 'Vælg venligst',
+        'move_button' => 'Flyt',
     ]
 ];

modules/backend/lang/de/lang.php

@@ -616,6 +616,10 @@
         'selection_mode' => 'Auswahlmodus',
         'resize_image' => 'Bildgröße anpassen',
         'image_size' => 'Dimensionen:',
-        'selected_size' => 'Ausgewählt:'
+        'selected_size' => 'Ausgewählt:',
+        'rename_popup_title' => 'Umbenennen',
+        'rename_new_name' => 'Neuer Name',
+        'move_please_select' => 'Bitte auswählen',
+        'move_button' => 'Verschieben',
     ]
 ];