diff options
author | AndreaChirulescu <andrea.chirulescu@gmail.com> | 2021-05-09 21:58:23 +0200 |
---|---|---|
committer | AndreaChirulescu <andrea.chirulescu@gmail.com> | 2021-05-09 21:58:23 +0200 |
commit | 11570d3e87707396674bdf5179df48c641bb154d (patch) | |
tree | 5c4677689569dbece70de222d1869b4049698f6d /psalm.xml | |
parent | cfc0341c66e5c24ee4c1b8a8e53afac99587244b (diff) | |
parent | 142ff436282844677b8b4e7d8ececd44440ec96d (diff) | |
download | gigologadmin-11570d3e87707396674bdf5179df48c641bb154d.tar.gz gigologadmin-11570d3e87707396674bdf5179df48c641bb154d.tar.bz2 gigologadmin-11570d3e87707396674bdf5179df48c641bb154d.zip |
Tried to fix the psalm local changes done when I manually installed it
Diffstat (limited to 'psalm.xml')
-rw-r--r-- | psalm.xml | 25 |
1 files changed, 25 insertions, 0 deletions
@@ -1,4 +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" @@ -7,6 +16,7 @@ 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" /> @@ -33,3 +43,18 @@ </ignoreFiles> </projectFiles> </psalm> +======= + <file name="generate-sample-gig-data.php"/> + <file name="giglogadmin.php"/> + <directory name="includes"/> + <ignoreFiles> + <directory name="vendor"/> + <directory name="includes/public/shortcodes" /> + </ignoreFiles> + </projectFiles> + + <issueHandlers> + <InvalidGlobal errorLevel="suppress" /> + </issueHandlers> +<plugins><pluginClass class="PsalmWordPress\Plugin"/></plugins></psalm> +>>>>>>> 142ff436282844677b8b4e7d8ececd44440ec96d |