Commit ca2f7d60 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/master' into php84 

# Conflicts:
#	composer.json
parents 0ca0c686 03a23679

.idea/.gitignore

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
# Default ignored files

/shelf/

/workspace.xml

# Editor-based HTTP Client requests

/httpRequests/

# Datasource local storage ignored files

/dataSources/

/dataSources.local.xml

.idea/authentification.iml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<module type="WEB_MODULE" version="4">

  <component name="NewModuleRootManager">

    <content url="file://$MODULE_DIR$">

      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />

    </content>

    <orderEntry type="inheritedJdk" />

    <orderEntry type="sourceFolder" forTests="false" />

  </component>

</module>
 
 No newline at end of file

.idea/modules.xml

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="ProjectModuleManager">

    <modules>

      <module fileurl="file://$PROJECT_DIR$/.idea/authentification.iml" filepath="$PROJECT_DIR$/.idea/authentification.iml" />

    </modules>

  </component>

</project>
 
 No newline at end of file

.idea/php.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="MessDetectorOptionsConfiguration">

    <option name="transferred" value="true" />

  </component>

  <component name="PHPCSFixerOptionsConfiguration">

    <option name="transferred" value="true" />

  </component>

  <component name="PHPCodeSnifferOptionsConfiguration">

    <option name="highlightLevel" value="WARNING" />

    <option name="transferred" value="true" />

  </component>

  <component name="PhpProjectSharedConfiguration" php_language_level="7.4">

    <option name="suggestChangeDefaultLanguageLevel" value="false" />

  </component>

  <component name="PhpStanOptionsConfiguration">

    <option name="transferred" value="true" />

  </component>

  <component name="PsalmOptionsConfiguration">

    <option name="transferred" value="true" />

  </component>

</project>
 
 No newline at end of file

.idea/phpunit.xml

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="PHPUnit">

    <option name="directories">

      <list>

        <option value="$PROJECT_DIR$/tests" />

      </list>

    </option>

  </component>

</project>
 
 No newline at end of file