From 858675bc3be664164e8731bc70dcf8d426a1e8bf Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 2 Mar 2020 17:22:43 +0100 Subject: [PATCH] update composer cs fixes --- .gitignore | 5 +- UI/Component/AdvancedInput.js | 10 ++-- composer.json | 4 +- composer.lock | 108 ++++++++++++++++++++++++++++++++++ 4 files changed, 119 insertions(+), 8 deletions(-) create mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 2af8fc2..8e5580e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -tests/jasmin* \ No newline at end of file +tests/jasmin* +vendor +.vscode +.php_cs.cache \ No newline at end of file diff --git a/UI/Component/AdvancedInput.js b/UI/Component/AdvancedInput.js index 36331bd..065b624 100644 --- a/UI/Component/AdvancedInput.js +++ b/UI/Component/AdvancedInput.js @@ -116,8 +116,8 @@ export class AdvancedInput observer.observe(this.tagElement, { childList: true, attributes: false, subtree: false }); eventManager.attach(this.id + '-tags-childList', function(data) { - const removes = data.target.querySelectorAll('.fa-times'), - removesLength = removes === null ? 0 : removes.length; + const removes = data.target.querySelectorAll('.fa-times'); + const removesLength = removes === null ? 0 : removes.length; if (removesLength < 1) { return; @@ -332,9 +332,9 @@ export class AdvancedInput } // set innerHtml (e.g. styles) {/path} - const regex = /{\/.*?}/g; - const matches = newTag.firstElementChild.outerHTML.match(regex), - matchLength = matches === null ? 0 : matches.length; + const regex = /{\/.*?}/g; + const matches = newTag.firstElementChild.outerHTML.match(regex); + const matchLength = matches === null ? 0 : matches.length; for (let i = 0; i < matchLength; ++i) { newTag.firstElementChild.outerHTML = newTag.firstElementChild.outerHTML.replace( diff --git a/composer.json b/composer.json index 8df9f80..39449f7 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,7 @@ } ], "require-dev": { - "squizlabs/php_codesniffer": "~3.2", - "phpstan/phpstan": "~0.10.1" + "squizlabs/php_codesniffer": "^3.5", + "phpstan/phpstan": "^0.12.11" } } diff --git a/composer.lock b/composer.lock new file mode 100644 index 0000000..b1bf5a4 --- /dev/null +++ b/composer.lock @@ -0,0 +1,108 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "content-hash": "783e0b4a1c0f9033759bc7b1db49de97", + "packages": [], + "packages-dev": [ + { + "name": "phpstan/phpstan", + "version": "0.12.13", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "d74fb5ce1ab9f24a7128db90e99dec82440975c3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d74fb5ce1ab9f24a7128db90e99dec82440975c3", + "reference": "d74fb5ce1ab9f24a7128db90e99dec82440975c3", + "shasum": "" + }, + "require": { + "php": "^7.1" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.12-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "time": "2020-03-02T13:08:55+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.5.4", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "dceec07328401de6211037abbb18bda423677e26" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", + "reference": "dceec07328401de6211037abbb18bda423677e26", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2020-01-30T22:20:29+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": [], + "platform-dev": [] +}