From c838c0b7459628e8bf3115eab57b718995b71722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 01:29:54 +0000 Subject: [PATCH 1/2] Bump webpack from 5.72.1 to 5.76.1 Bumps [webpack](https://github.com/webpack/webpack) from 5.72.1 to 5.76.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.72.1...v5.76.1) --- updated-dependencies: - dependency-name: webpack dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6977a36e..11814e5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6210,9 +6210,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -15329,9 +15329,9 @@ "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==" }, "node_modules/watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -15413,20 +15413,20 @@ } }, "node_modules/webpack": { - "version": "5.72.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz", - "integrity": "sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung==", + "version": "5.76.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", + "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==", "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/wasm-edit": "1.11.1", "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", + "acorn": "^8.7.1", "acorn-import-assertions": "^1.7.6", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.9.3", + "enhanced-resolve": "^5.10.0", "es-module-lexer": "^0.9.0", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -15439,7 +15439,7 @@ "schema-utils": "^3.1.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, "bin": { @@ -21301,9 +21301,9 @@ } }, "enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "requires": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -28561,9 +28561,9 @@ } }, "watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", "requires": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -28631,20 +28631,20 @@ } }, "webpack": { - "version": "5.72.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz", - "integrity": "sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung==", + "version": "5.76.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz", + "integrity": "sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==", "requires": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/wasm-edit": "1.11.1", "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", + "acorn": "^8.7.1", "acorn-import-assertions": "^1.7.6", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.9.3", + "enhanced-resolve": "^5.10.0", "es-module-lexer": "^0.9.0", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -28657,7 +28657,7 @@ "schema-utils": "^3.1.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, "dependencies": { From d1e1d0d36d28df51e9246dc19318a62362e96520 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Wed, 15 Mar 2023 01:30:16 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- src/Console/Commands/GeneratorCommand.php | 2 +- src/Display/Column/Checkbox.php | 2 +- src/Display/Column/Editable/DateTime.php | 2 +- src/Display/Column/Editable/EditableColumn.php | 1 - src/Form/Element/NamedFormElement.php | 1 - src/Form/Element/Select.php | 2 +- src/Form/FormDefault.php | 1 - src/Form/Related/Elements.php | 1 - src/Form/Related/Forms/HasManyLocal.php | 6 +++--- src/Http/Controllers/AdminController.php | 6 +++--- src/Http/Controllers/AlterPaginateDisplayController.php | 1 - src/Http/Controllers/DisplayController.php | 1 - tests/Admin/Display/Column/Filter/BaseColumnFilterTest.php | 1 + 13 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/Console/Commands/GeneratorCommand.php b/src/Console/Commands/GeneratorCommand.php index 8b35b819..9b43396b 100755 --- a/src/Console/Commands/GeneratorCommand.php +++ b/src/Console/Commands/GeneratorCommand.php @@ -48,7 +48,7 @@ public function handle() } $helpers = ''; - if ($this->option('helpers') || ($this->config->get('ide-helper.include_helpers'))) { + if ($this->option('helpers') || $this->config->get('ide-helper.include_helpers')) { foreach ($this->config->get('ide-helper.helper_files', []) as $helper) { if (file_exists($helper)) { $helpers .= str_replace([''], '', $this->files->get($helper)); diff --git a/src/Display/Column/Checkbox.php b/src/Display/Column/Checkbox.php index 0d2a787b..d5b4b5e5 100755 --- a/src/Display/Column/Checkbox.php +++ b/src/Display/Column/Checkbox.php @@ -26,7 +26,7 @@ public function __construct($label = null) parent::__construct($label); $this->setLabel( Form::checkbox(null, 1, false, ['class' => 'adminCheckboxAll'] - )); + )); } /** diff --git a/src/Display/Column/Editable/DateTime.php b/src/Display/Column/Editable/DateTime.php index 64403e9f..8685c893 100755 --- a/src/Display/Column/Editable/DateTime.php +++ b/src/Display/Column/Editable/DateTime.php @@ -215,7 +215,7 @@ public function save(Request $request) if ($request->input('value')) { $value = Carbon::createFromFormat( - $this->format, $request->input('value'), $this->getTimezone() + $this->format, $request->input('value'), $this->getTimezone() ); } else { $value = null; diff --git a/src/Display/Column/Editable/EditableColumn.php b/src/Display/Column/Editable/EditableColumn.php index f208edec..dfbd0437 100755 --- a/src/Display/Column/Editable/EditableColumn.php +++ b/src/Display/Column/Editable/EditableColumn.php @@ -162,7 +162,6 @@ public function setEditableMode(?string $mode) */ public function isReadonly() { - // Add policy if ($this->getModelConfiguration()->isEditable($this->getModel())) { if (is_callable($this->readonlyEditable)) { diff --git a/src/Form/Element/NamedFormElement.php b/src/Form/Element/NamedFormElement.php index 3a514a6b..d4775111 100755 --- a/src/Form/Element/NamedFormElement.php +++ b/src/Form/Element/NamedFormElement.php @@ -532,7 +532,6 @@ protected function getModelByPath($path) if ($previousModel->getAttribute($relation) instanceof Model) { $relatedModel = $previousModel->getAttribute($relation); } elseif (method_exists($previousModel, $relation)) { - /* @var Relation $relation */ $relationObject = $previousModel->{$relation}(); diff --git a/src/Form/Element/Select.php b/src/Form/Element/Select.php index 081c4e4f..bb764da3 100755 --- a/src/Form/Element/Select.php +++ b/src/Form/Element/Select.php @@ -324,7 +324,7 @@ public function getForeignKey() */ public function toArray() { - $this->setHtmlAttribute('id', ($this->getHtmlAttribute('id') ?: $this->getId())); + $this->setHtmlAttribute('id', $this->getHtmlAttribute('id') ?: $this->getId()); $this->setHtmlAttributes([ 'size' => 2, 'data-select-type' => 'single', diff --git a/src/Form/FormDefault.php b/src/Form/FormDefault.php index 84b1d644..922f79b4 100644 --- a/src/Form/FormDefault.php +++ b/src/Form/FormDefault.php @@ -109,7 +109,6 @@ public function initialize() parent::initialize(); if (! $this->hasHtmlAttribute('enctype')) { - // Recursive iterate subset of form elements // and if subset contains an upload element then add to for $this->recursiveIterateElements(function ($element) { diff --git a/src/Form/Related/Elements.php b/src/Form/Related/Elements.php index 60ef7afc..6c501d01 100644 --- a/src/Form/Related/Elements.php +++ b/src/Form/Related/Elements.php @@ -398,7 +398,6 @@ protected function loadRelationValues() $query = $this->getRelation(); if (count($this->queryCallbacks) > 0) { - //get $query instance Illuminate\Database\Eloquent\Builder for HasMany $query = $query->getQuery(); diff --git a/src/Form/Related/Forms/HasManyLocal.php b/src/Form/Related/Forms/HasManyLocal.php index 8269e1ce..aab66830 100644 --- a/src/Form/Related/Forms/HasManyLocal.php +++ b/src/Form/Related/Forms/HasManyLocal.php @@ -508,9 +508,9 @@ protected function createGroup($attributes, $old = false, $key = null): Group $model = $attributes instanceof Model ? $attributes : ( - null != ($instanceModel = $this->getInstance()) - ? $this->safeFillModel(clone $instanceModel, $attributes) - : $this->safeCreateModel($this->getModelClassForElements(), $attributes) + null != ($instanceModel = $this->getInstance()) + ? $this->safeFillModel(clone $instanceModel, $attributes) + : $this->safeCreateModel($this->getModelClassForElements(), $attributes) ); $group = new Group($model); diff --git a/src/Http/Controllers/AdminController.php b/src/Http/Controllers/AdminController.php index cd33cb0c..9ea8ab2e 100644 --- a/src/Http/Controllers/AdminController.php +++ b/src/Http/Controllers/AdminController.php @@ -172,8 +172,8 @@ public function getEnvEditor() */ protected function validatePolicy($permission, $key) { - return ($this->envPolicy && ((method_exists($this->envPolicy, $permission) - && $this->envPolicy->$permission(Auth::user(), $key) !== false))) + return ($this->envPolicy && (method_exists($this->envPolicy, $permission) + && $this->envPolicy->$permission(Auth::user(), $key) !== false)) || ! method_exists($this->envPolicy, $permission) || ! $this->envPolicy || $this->validateBeforePolicy($key); } @@ -183,7 +183,7 @@ protected function validatePolicy($permission, $key) */ protected function validateBeforePolicy($key) { - return ($this->envPolicy && (method_exists($this->envPolicy, 'before')) + return ($this->envPolicy && method_exists($this->envPolicy, 'before') && $this->envPolicy->before(Auth::user(), $key) == true) || ! method_exists($this->envPolicy, 'before') || ! $this->envPolicy; } diff --git a/src/Http/Controllers/AlterPaginateDisplayController.php b/src/Http/Controllers/AlterPaginateDisplayController.php index 10a35061..f8dda5b2 100755 --- a/src/Http/Controllers/AlterPaginateDisplayController.php +++ b/src/Http/Controllers/AlterPaginateDisplayController.php @@ -39,7 +39,6 @@ public function async(ModelConfigurationInterface $model, Request $request, Appl if ($content instanceof FormElements) { foreach ($content->getElements() as $element) { - //Return data-table if inside FormElements if ($element instanceof DisplayDatatablesAsyncAlterPaginate) { if ($element->getName() == $name) { diff --git a/src/Http/Controllers/DisplayController.php b/src/Http/Controllers/DisplayController.php index 2fc35c24..30dfa5d2 100755 --- a/src/Http/Controllers/DisplayController.php +++ b/src/Http/Controllers/DisplayController.php @@ -40,7 +40,6 @@ public function async(ModelConfigurationInterface $model, Request $request, Appl if ($content instanceof FormElements) { foreach ($content->getElements() as $element) { - /* * Return data-table if inside FormElements */ diff --git a/tests/Admin/Display/Column/Filter/BaseColumnFilterTest.php b/tests/Admin/Display/Column/Filter/BaseColumnFilterTest.php index 4ab83b0c..0400d99d 100755 --- a/tests/Admin/Display/Column/Filter/BaseColumnFilterTest.php +++ b/tests/Admin/Display/Column/Filter/BaseColumnFilterTest.php @@ -34,6 +34,7 @@ public function getFilter($operator = 'equal') * @throws ReflectionException * * @dataProvider sqlOperatorsProvider + * * @doesNotPerformAssertions */ public function testApply($operator, $condition, $args)