diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | composer.lock | 31 | ||||
| -rw-r--r-- | package-lock.json | 6 | ||||
| -rw-r--r-- | psalm.xml | 32 |
4 files changed, 70 insertions, 3 deletions
diff --git a/composer.json b/composer.json index 65b7e58..5b0f97d 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,12 @@ ], "require-dev": { "wp-phpunit/wp-phpunit": "^5.7", +<<<<<<< HEAD + "vimeo/psalm": "^4.7" +======= "vimeo/psalm": "^4.7", "humanmade/psalm-plugin-wordpress": "^2.0" +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d }, "scripts": { "test": "npm run wp-env run phpunit 'phpunit -c /var/www/html/wp-content/plugins/giglogadmin/phpunit.xml'" diff --git a/composer.lock b/composer.lock index 9a24a89..559c225 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,11 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], +<<<<<<< HEAD + "content-hash": "d330d5838bd28a6e9b15fe464962953a", +======= "content-hash": "da8593c79fc71116e3079512611bb8ec", +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d "packages": [], "packages-dev": [ { @@ -329,6 +333,18 @@ }, { "name": "composer/xdebug-handler", +<<<<<<< HEAD + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", + "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496", +======= "version": "2.0.0", "source": { "type": "git", @@ -339,6 +355,7 @@ "type": "zip", "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/31d57697eb1971712a08031cfaff5a846d10bdf5", "reference": "31d57697eb1971712a08031cfaff5a846d10bdf5", +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d "shasum": "" }, "require": { @@ -373,7 +390,11 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", +<<<<<<< HEAD + "source": "https://github.com/composer/xdebug-handler/tree/2.0.1" +======= "source": "https://github.com/composer/xdebug-handler/tree/2.0.0" +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d }, "funding": [ { @@ -389,7 +410,11 @@ "type": "tidelift" } ], +<<<<<<< HEAD + "time": "2021-05-05T19:37:51+00:00" +======= "time": "2021-04-09T19:40:06+00:00" +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d }, { "name": "dnoegel/php-xdg-base-dir", @@ -530,6 +555,8 @@ "time": "2021-02-22T14:02:09+00:00" }, { +<<<<<<< HEAD +======= "name": "humanmade/psalm-plugin-wordpress", "version": "2.0.4", "source": { @@ -649,6 +676,7 @@ "time": "2020-08-29T20:58:28+00:00" }, { +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d "name": "netresearch/jsonmapper", "version": "v2.1.0", "source": { @@ -809,6 +837,8 @@ "time": "2019-03-29T20:06:56+00:00" }, { +<<<<<<< HEAD +======= "name": "php-stubs/wordpress-stubs", "version": "v5.7.0", "source": { @@ -853,6 +883,7 @@ "time": "2021-03-10T10:29:23+00:00" }, { +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d "name": "phpdocumentor/reflection-common", "version": "2.2.0", "source": { diff --git a/package-lock.json b/package-lock.json index ed63f0b..99a7168 100644 --- a/package-lock.json +++ b/package-lock.json @@ -665,9 +665,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, "log-symbols": { @@ -1,10 +1,13 @@ <?xml version="1.0"?> +<<<<<<< HEAD +======= <!-- SPDX-FileCopyrightText: 2021 Andrea Chirulescu <andrea.chirulescu@gmail.com> SPDX-FileCopyrightText: 2021 Harald Eilertsen <haraldei@anduin.net> SPDX-License-Identifier: CC0-1.0 --> +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d <psalm errorLevel="4" resolveFromConfigFile="true" @@ -13,6 +16,34 @@ SPDX-License-Identifier: CC0-1.0 xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" > <projectFiles> +<<<<<<< HEAD + <file name="generate-sample-gig-data.php" /> + <file name="giglogadmin.php" /> + <file name="includes/band.php" /> + <file name="includes/concert.php" /> + <file name="includes/concertlogs.php" /> + <file name="includes/venue.php" /> + <file name="tests/BandTest.php" /> + <file name="tests/bootstrap.php" /> + <file name="tests/ConcertTest.php" /> + <file name="tests/VenueTest.php" /> + <file name="vendor/autoload.php" /> + <file name="includes/admin/register_db_tables.php" /> + <file name="vendor/composer/autoload_classmap.php" /> + <file name="vendor/composer/autoload_files.php" /> + <file name="vendor/composer/autoload_namespaces.php" /> + <file name="vendor/composer/autoload_psr4.php" /> + <file name="vendor/composer/autoload_real.php" /> + <file name="vendor/composer/autoload_static.php" /> + <file name="vendor/composer/ClassLoader.php" /> + <file name="vendor/composer/installed.php" /> + <file name="vendor/composer/InstalledVersions.php" /> + <ignoreFiles> + <directory name="vendor" /> + </ignoreFiles> + </projectFiles> +</psalm> +======= <file name="generate-sample-gig-data.php"/> <file name="giglogadmin.php"/> <directory name="includes"/> @@ -26,3 +57,4 @@ SPDX-License-Identifier: CC0-1.0 <InvalidGlobal errorLevel="suppress" /> </issueHandlers> <plugins><pluginClass class="PsalmWordPress\Plugin"/></plugins></psalm> +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d |