4.4.4 Release

userfrosting · Nov 20, 2020 · f8b2a8f · f8b2a8f
2 parents 90f3790 + 9467ddf
commit f8b2a8f
Show file tree

Hide file tree

Showing 30 changed files with 77 additions and 62 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,6 +28,8 @@ cache:
     - $HOME/.composer/cache
 
 before_install:
+  # Force use of Composer 1.x
+  - composer self-update --1
   # copy sprinkles.json
   - cp app/sprinkles.example.json app/sprinkles.json
   # set up db

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v4.4.4]
+
+### Fixed
+- Replaced AdminLTE credit in default footer (old link was dead).
+- Lock Travis to Composer V1 to avoid error until Composer V2 support can be fixed.
+- Remove whitespace at top of page templates ([#1107])
+- Deep extend when adding global query params in ufTable ([#1114])
+- Check for null key in Unique::buildTertiaryDictionary ([#1109])
+- Client-side assets containing glob characters causing crashes when building assets.
+- Fixed issue where merging of package dependencies would show as "undefined", resulting in debugging challenges where there are issues.
+
 ## [v4.4.3]
 
 ### Fixed
@@ -969,6 +980,9 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 [#1078]: https://github.com/userfrosting/UserFrosting/issues/1078
 [#1087]: https://github.com/userfrosting/UserFrosting/issues/1087
 [#1092]: https://github.com/userfrosting/UserFrosting/issues/1092
+[#1107]: https://github.com/userfrosting/UserFrosting/pull/1107
+[#1109]: https://github.com/userfrosting/UserFrosting/pull/1109
+[#1114]: https://github.com/userfrosting/UserFrosting/pull/1114
 
 [v4.2.0]: https://github.com/userfrosting/UserFrosting/compare/v4.1.22...v4.2.0
 [v4.2.1]: https://github.com/userfrosting/UserFrosting/compare/v4.2.0...v.4.2.1

diff --git a/README.md b/README.md
@@ -107,7 +107,7 @@ Srinivas's a web applications architect, with a passion for open source technolo
 
 This project exists thanks to all the people who contribute. If you're interested in contributing to the UserFrosting codebase, please see our [contributing guidelines](.github/CONTRIBUTING.md) as well as our [style guidelines](STYLE-GUIDE.md).
 
-<a href="graphs/contributors"><img src="https://opencollective.com/userfrosting/contributors.svg?width=890" /></a>
+[![](https://opencollective.com/userfrosting/contributors.svg?width=890&button=false)](https://github.com/userfrosting/UserFrosting/graphs/contributors)
 
 ### Thanks to our translators!
 

diff --git a/app/defines.php b/app/defines.php
@@ -11,7 +11,7 @@
 namespace UserFrosting;
 
 // Some standard defines
-define('UserFrosting\VERSION', '4.4.3');
+define('UserFrosting\VERSION', '4.4.4');
 define('UserFrosting\DS', '/');
 define('UserFrosting\PHP_MIN_VERSION', '7.1');
 define('UserFrosting\PHP_RECOMMENDED_VERSION', '7.3');

diff --git a/app/sprinkles/account/src/Database/Models/Activity.php b/app/sprinkles/account/src/Database/Models/Activity.php
@@ -21,11 +21,11 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @property string $ip_address
- * @property int $user_id
- * @property string $type
+ * @property string   $ip_address
+ * @property int      $user_id
+ * @property string   $type
  * @property datetime $occurred_at
- * @property string $description
+ * @property string   $description
  */
 class Activity extends Model
 {

diff --git a/app/sprinkles/account/src/Database/Models/PasswordReset.php b/app/sprinkles/account/src/Database/Models/PasswordReset.php
@@ -19,9 +19,9 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @property int $user_id
- * @property hash $token
- * @property bool $completed
+ * @property int      $user_id
+ * @property hash     $token
+ * @property bool     $completed
  * @property datetime $expires_at
  * @property datetime $completed_at
  */

diff --git a/app/sprinkles/account/src/Database/Models/User.php b/app/sprinkles/account/src/Database/Models/User.php
@@ -25,20 +25,20 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @property int $id
- * @property string $user_name
- * @property string $first_name
- * @property string $last_name
- * @property string $email
- * @property string $locale
- * @property string $theme
- * @property int $group_id
- * @property bool $flag_verified
- * @property bool $flag_enabled
- * @property int $last_activity_id
+ * @property int       $id
+ * @property string    $user_name
+ * @property string    $first_name
+ * @property string    $last_name
+ * @property string    $email
+ * @property string    $locale
+ * @property string    $theme
+ * @property int       $group_id
+ * @property bool      $flag_verified
+ * @property bool      $flag_enabled
+ * @property int       $last_activity_id
  * @property timestamp $created_at
  * @property timestamp $updated_at
- * @property string $password
+ * @property string    $password
  * @property timestamp $deleted_at
  */
 class User extends Model implements UserInterface

diff --git a/app/sprinkles/account/src/Database/Models/Verification.php b/app/sprinkles/account/src/Database/Models/Verification.php
@@ -19,9 +19,9 @@
  *
  * @author Alex Weissman (https://alexanderweissman.com)
  *
- * @property int $user_id
- * @property hash $token
- * @property bool $completed
+ * @property int      $user_id
+ * @property hash     $token
+ * @property bool     $completed
  * @property datetime $expires_at
  * @property datetime $completed_at
  */

diff --git a/app/sprinkles/admin/src/Controller/GroupController.php b/app/sprinkles/admin/src/Controller/GroupController.php
@@ -107,7 +107,7 @@ public function create(Request $request, Response $response, $args)
 
         // All checks passed!  log events/activities and create group
         // Begin transaction - DB will be rolled back if an exception occurs
-        Capsule::transaction(function () use ($classMapper, $data, $ms, $config, $currentUser) {
+        Capsule::transaction(function () use ($classMapper, $data, $ms, $currentUser) {
             // Create the group
             $group = $classMapper->createInstance('group', $data);
 

diff --git a/app/sprinkles/admin/src/Controller/RoleController.php b/app/sprinkles/admin/src/Controller/RoleController.php
@@ -107,7 +107,7 @@ public function create(Request $request, Response $response, $args)
 
         // All checks passed!  log events/activities and create role
         // Begin transaction - DB will be rolled back if an exception occurs
-        Capsule::transaction(function () use ($classMapper, $data, $ms, $config, $currentUser) {
+        Capsule::transaction(function () use ($classMapper, $data, $ms, $currentUser) {
             // Create the role
             $role = $classMapper->createInstance('role', $data);
 

diff --git a/app/sprinkles/core/assets/userfrosting/js/uf-table.js b/app/sprinkles/core/assets/userfrosting/js/uf-table.js
@@ -437,7 +437,7 @@
         $.extend(table.config.pager.ajaxObject.data, tableState);
 
         // Merge in any additional parameters
-        $.extend(table.config.pager.ajaxObject.data, this.settings.addParams);
+        $.extend(true, table.config.pager.ajaxObject.data, this.settings.addParams);
 
         return url;
     };
@@ -526,7 +526,7 @@
         delete tableState.size;
 
         // Merge in any additional request parameters
-        $.extend(tableState, this.settings.addParams);
+        $.extend(true, tableState, this.settings.addParams);
 
         // Causes download to begin
         window.location = this.settings.dataUrl + '?' + $.param(tableState);

diff --git a/app/sprinkles/core/locale/ar/messages.php b/app/sprinkles/core/locale/ar/messages.php
@@ -96,6 +96,6 @@
     'NO'                       => 'لا',
     'OPTIONAL'                 => 'اختياري',
     'BUILT_WITH_UF'            => 'بنيت مع <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY'        => 'فكرة رئيسية <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a></strong> كل الحقوق محفوظة',
+    'ADMINLTE_THEME_BY'        => 'فكرة رئيسية <strong><a href="https://adminlte.io">AdminLTE</a></strong> كل الحقوق محفوظة',
     'WELCOME_TO'               => 'مرحبا بك في {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/de_DE/messages.php b/app/sprinkles/core/locale/de_DE/messages.php
@@ -118,6 +118,6 @@
 
     // Misc.
     'BUILT_WITH_UF'                     => 'Errichtet mit <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY'                 => 'Theme von <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> Alle Rechte vorbehalten',
+    'ADMINLTE_THEME_BY'                 => 'Theme von <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> Alle Rechte vorbehalten',
     'WELCOME_TO'                        => 'Willkommen auf {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/el/messages.php b/app/sprinkles/core/locale/el/messages.php
@@ -90,7 +90,7 @@
     'YES'                      => 'Ναι',
     'NO'                       => 'Όχι',
     'OPTIONAL'                 => 'Προαιρετικό',
-    'BUILT_WITH_UF'            => 'Κατασκευάστηκε με το <a href="http://www.userfrosting.com">UserFrosting </a>',
-    'ADMINLTE_THEME_BY'        => 'Θέμα από <strong> <a href="http://almsaeedstudio.com\\>> Almsaeed Studio </a>. </ Strong> Όλα τα δικαιώματα διατηρούνται',
+    'BUILT_WITH_UF'            => 'Κατασκευάστηκε με το <a href="http://www.userfrosting.com">UserFrosting</a>',
+    'ADMINLTE_THEME_BY'        => 'Θέμα από <strong><a href="https://adminlte.io">AdminLTE</a>. </strong>Όλα τα δικαιώματα διατηρούνται',
     'WELCOME_TO'               => 'Καλώς ορίσατε στο {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/en_US/messages.php b/app/sprinkles/core/locale/en_US/messages.php
@@ -115,6 +115,6 @@
 
     // Misc.
     'BUILT_WITH_UF'     => 'Built with <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY' => 'Theme by <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights reserved',
+    'ADMINLTE_THEME_BY' => 'Theme by <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> All rights reserved',
     'WELCOME_TO'        => 'Welcome to {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/es_ES/messages.php b/app/sprinkles/core/locale/es_ES/messages.php
@@ -96,6 +96,6 @@
     'NO'                       => 'No',
     'OPTIONAL'                 => 'Opcional',
     'BUILT_WITH_UF'            => 'Construido con <a href="http://www.userfrosting.com"> UserFrosting </a>',
-    'ADMINLTE_THEME_BY'        => 'Theme by <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights reserved',
+    'ADMINLTE_THEME_BY'        => 'Theme by <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> All rights reserved',
     'WELCOME_TO'               => '¡Bienvenido a {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/fa/messages.php b/app/sprinkles/core/locale/fa/messages.php
@@ -96,6 +96,6 @@
     'NO'                       => 'خیر',
     'OPTIONAL'                 => 'اختیاری',
     'BUILT_WITH_UF'            => 'ساخته شده با <a href="http://www.userfrosting.com">یوزرفراستینگ</a>',
-    'ADMINLTE_THEME_BY'        => 'قالب از <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> تمامی حقوق محفوظ است',
+    'ADMINLTE_THEME_BY'        => 'قالب از <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> تمامی حقوق محفوظ است',
     'WELCOME_TO'               => 'خوش آمدید به {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/fr_FR/messages.php b/app/sprinkles/core/locale/fr_FR/messages.php
@@ -96,6 +96,6 @@
     'NO'                       => 'Non',
     'OPTIONAL'                 => 'Facultatif',
     'BUILT_WITH_UF'            => 'Créé avec <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY'        => 'Thème par <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> Tous droits réservés',
+    'ADMINLTE_THEME_BY'        => 'Thème par <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> Tous droits réservés',
     'WELCOME_TO'               => 'Bienvenue à {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/it_IT/messages.php b/app/sprinkles/core/locale/it_IT/messages.php
@@ -117,6 +117,6 @@
 
     // Misc.
     'BUILT_WITH_UF'     => 'Construito con <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY' => 'Tema di <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> Tutti i diritti riservati',
+    'ADMINLTE_THEME_BY' => 'Tema di <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> Tutti i diritti riservati',
     'WELCOME_TO'        => 'Benvenuto su {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/pt_BR/messages.php b/app/sprinkles/core/locale/pt_BR/messages.php
@@ -96,6 +96,6 @@
     'NO'                       => 'Não',
     'OPTIONAL'                 => 'Opcional',
     'BUILT_WITH_UF'            => 'Desenvolvido sobre <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY'        => 'Tema por <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> Todos os direitos reservados',
+    'ADMINLTE_THEME_BY'        => 'Tema por <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> Todos os direitos reservados',
     'WELCOME_TO'               => 'Bem-vindo ao {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/pt_PT/messages.php b/app/sprinkles/core/locale/pt_PT/messages.php
@@ -96,6 +96,6 @@
     'NO'                       => 'Não',
     'OPTIONAL'                 => 'Opcional',
     'BUILT_WITH_UF'            => 'Desenvolvido sobre <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY'        => 'Tema por <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> Todos os direitos reservados',
+    'ADMINLTE_THEME_BY'        => 'Tema por <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> Todos os direitos reservados',
     // 'WELCOME_TO'               => 'Welcome to {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/ru_RU/messages.php b/app/sprinkles/core/locale/ru_RU/messages.php
@@ -115,6 +115,6 @@
 
     // Misc.
     'BUILT_WITH_UF'     => 'Создано через <a href="http://www.userfrosting.com"> UserFrosting</a>',
-    'ADMINLTE_THEME_BY' => 'Тема от <strong><a href="http://almsaeedstudio.com"> Almsaeed Studio</a>.</strong> Все права защищены',
+    'ADMINLTE_THEME_BY' => 'Тема от <strong><a href="https://adminlte.io"> AdminLTE</a>.</strong> Все права защищены',
     'WELCOME_TO'        => 'Добро пожаловать на {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/sr_RS/messages.php b/app/sprinkles/core/locale/sr_RS/messages.php
@@ -115,6 +115,6 @@
 
     // Misc.
     'BUILT_WITH_UF'     => 'Napravljeno sa <a href="http://www.userfrosting.com">UserFrosting-om</a>',
-    'ADMINLTE_THEME_BY' => 'Temu napravio <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> Sva prava zadržana',
+    'ADMINLTE_THEME_BY' => 'Temu napravio <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> Sva prava zadržana',
     'WELCOME_TO'        => 'Dobrodočšli na {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/th_TH/messages.php b/app/sprinkles/core/locale/th_TH/messages.php
@@ -97,6 +97,6 @@
     'NO'                       => 'ไม่',
     'OPTIONAL'                 => 'ตัวเลือกเพิ่มเติม',
     'BUILT_WITH_UF'            => 'สร้างด้วย <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY'        => 'ธีมโดย <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a></strong> สงวนลิขสิทธิ์',
+    'ADMINLTE_THEME_BY'        => 'ธีมโดย <strong><a href="https://adminlte.io">AdminLTE</a></strong> สงวนลิขสิทธิ์',
     'WELCOME_TO'               => 'ยินดีต้อนรับสู่ {{title}}!',
 ];
diff --git a/app/sprinkles/core/locale/tr/messages.php b/app/sprinkles/core/locale/tr/messages.php
@@ -93,7 +93,7 @@
     'NO'                       => 'No',
     'OPTIONAL'                 => 'Optional',
     'BUILT_WITH_UF'            => 'Built with <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY'        => 'Theme by <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong> All rights reserved',
+    'ADMINLTE_THEME_BY'        => 'Theme by <strong><a href="https://adminlte.io">AdminLTE</a>.</strong> All rights reserved',
     'WELCOME_TO'               => 'Welcome to {{title}}!',
     */
 ];
diff --git a/app/sprinkles/core/locale/zh_CN/messages.php b/app/sprinkles/core/locale/zh_CN/messages.php
@@ -96,6 +96,6 @@
     'NO'                       => '不是',
     'OPTIONAL'                 => '可选择的',
     'BUILT_WITH_UF'            => '使用 <a href="http://www.userfrosting.com">UserFrosting</a>',
-    'ADMINLTE_THEME_BY'        => '主题作者 <strong><a href="http://almsaeedstudio.com">Almsaeed Studio</a>.</strong>保留所有权',
+    'ADMINLTE_THEME_BY'        => '主题作者 <strong><a href="https://adminlte.io">AdminLTE</a>.</strong>保留所有权',
     // 'WELCOME_TO'               => 'Welcome to {{title}}!',
 ];
diff --git a/app/sprinkles/core/src/Database/Relations/Concerns/Unique.php b/app/sprinkles/core/src/Database/Relations/Concerns/Unique.php
@@ -500,11 +500,13 @@ protected function buildTertiaryDictionary(array $models)
         foreach ($models as $model) {
             $tertiaryKeyValue = $model->pivot->{$this->tertiaryKey};
 
-            $tertiaryModel = clone $tertiaryModels[$tertiaryKeyValue];
+            if (!is_null($tertiaryKeyValue)) {
+                $tertiaryModel = clone $tertiaryModels[$tertiaryKeyValue];
 
-            $this->transferPivotsToTertiary($model, $tertiaryModel);
+                $this->transferPivotsToTertiary($model, $tertiaryModel);
 
-            $dictionary[$model->getKey()][] = $tertiaryModel;
+                $dictionary[$model->getKey()][] = $tertiaryModel;
+            }
         }
 
         return $dictionary;

diff --git a/app/sprinkles/core/templates/pages/abstract/base.html.twig b/app/sprinkles/core/templates/pages/abstract/base.html.twig
@@ -1,5 +1,4 @@
 {# This is the base layout template for all pages.  #}
-
 {% block page %}
 <!DOCTYPE html>
 <html lang="{{ currentLocale }}">

diff --git a/build/package.json b/build/package.json
@@ -3,10 +3,10 @@
   "dependencies": {
     "@userfrosting/browserify-dependencies": "^3.1.0",
     "@userfrosting/gulp-bundle-assets": "^4.0.1",
-    "@userfrosting/merge-package-dependencies": "^1.2.1",
-    "@userfrosting/vinyl-fs-vpath": "^1.0.0",
+    "@userfrosting/merge-package-dependencies": "^2.1.0",
+    "@userfrosting/vinyl-fs-vpath": "^2.0.0",
     "bower": "^1.8.8",
-    "del": "^5.1.0",
+    "del": "^6.0.0",
     "dotenv": "^8.2.0",
     "esm": "^3.2.25",
     "gulp": "^4.0.2",
@@ -16,6 +16,7 @@
     "gulp-if": "^3.0.0",
     "gulp-prune": "^0.2.0",
     "gulp-rev": "^9.0.0",
+    "gulp-sourcemaps": "^2.6.5",
     "gulp-terser": "^1.2.0",
     "gulplog": "^1.0.0",
     "strip-ansi": "^6.0.0"

diff --git a/build/tasks/build.js b/build/tasks/build.js
@@ -12,6 +12,7 @@ import { readFileSync, writeFileSync } from "fs";
 import { src } from "@userfrosting/vinyl-fs-vpath";
 import { Logger, vendorAssetsDir, sprinklesDir, sprinkles, sprinkleBundleFile, publicAssetsDir } from "./util.js";
 import gulpIf from "gulp-if";
+import gulpSourcemaps from "gulp-sourcemaps";
 
 /**
  * Compiles frontend assets. Mapped to npm script "uf-bundle".
@@ -135,11 +136,15 @@ export function build() {
 
     // Open stream
     log.info("Starting bundle process proper...");
-    return src({ globs: sources, pathMappings, base: publicAssetsDir, sourcemaps: true })
+    return src({ globs: sources, pathMappings, base: publicAssetsDir })
+        .pipe(gulpSourcemaps.init({ loadMaps: true }))
         .pipe(gulpIf(stylesAndScriptsFilter, new Bundler(rawConfig, bundleBuilder, resultsCallback)))
         .pipe(prune(publicAssetsDir))
-        .pipe(gulpIf(stylesAndScriptsFilter, gulp.dest(publicAssetsDir, { sourcemaps: "." })))
-        .pipe(gulpIf(everythingElseFilter, gulp.dest(publicAssetsDir)));
+        .pipe(gulpIf(
+            stylesAndScriptsFilter,
+            gulp.dest(publicAssetsDir, { sourcemaps: true }),
+            gulp.dest(publicAssetsDir)
+        ));
 };
 
 /**
@@ -165,11 +170,3 @@ function stylesFilter(fs) {
 function scriptsFilter(fs) {
     return fs.extname === ".js";
 }
-
-/**
- * Used to filter to everything but styles and scripts.
- * @param {import("vinyl").NullFile} fs
- */
-function everythingElseFilter(fs) {
-    return (fs.extname !== ".js") && (fs.extname !== ".css");
-}