Commit 9157fd1b authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'zf-3.x'

parents cd3af6df cb01545b

.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
vendor/

.idea/
 
 No newline at end of file

.idea/encodings.xml

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

<project version="4">

  <component name="Encoding" addBOMForNewFiles="with NO BOM">

    <file url="PROJECT" charset="UTF-8" />

  </component>

</project>
 
 No newline at end of file

.idea/faq.iml

0 → 100644
+10 −0
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" />

    </content>

    <orderEntry type="inheritedJdk" />

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

  </component>

</module>
 
 No newline at end of file

.idea/inspectionProfiles/Project_Default.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<component name="InspectionProjectProfileManager">

  <profile version="1.0">

    <option name="myName" value="Project Default" />

    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">

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

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

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

    </inspection_tool>

  </profile>

</component>
 
 No newline at end of file

.idea/misc.xml

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

<project version="4">

  <component name="JavaScriptSettings">

    <option name="languageLevel" value="ES6" />

  </component>

  <component name="NodePackageJsonFileManager">

    <packageJsonPaths />

  </component>

  <component name="ProjectDictionaryState">

    <dictionary name="gauthierb" />

  </component>

  <component name="ProjectInspectionProfilesVisibleTreeState">

    <entry key="Project Default">

      <profile-state>

        <expanded-state>

          <State>

            <id />

          </State>

          <State>

            <id>Bitwise operation issuesJavaScript</id>

          </State>

          <State>

            <id>Blade files</id>

          </State>

          <State>

            <id>CSS</id>

          </State>

          <State>

            <id>Code StylePHP</id>

          </State>

          <State>

            <id>Code quality toolsJavaScript</id>

          </State>

          <State>

            <id>Data flow issuesJavaScript</id>

          </State>

          <State>

            <id>GeneralPHP</id>

          </State>

          <State>

            <id>JavaScript</id>

          </State>

          <State>

            <id>Naming conventionsJavaScript</id>

          </State>

          <State>

            <id>PHP</id>

          </State>

          <State>

            <id>Potentially confusing code constructsJavaScript</id>

          </State>

          <State>

            <id>Probable bugsJavaScript</id>

          </State>

          <State>

            <id>SQL</id>

          </State>

          <State>

            <id>XPath</id>

          </State>

          <State>

            <id>XSLT</id>

          </State>

        </expanded-state>

        <selected-state>

          <State>

            <id>Blade files</id>

          </State>

        </selected-state>

      </profile-state>

    </entry>

  </component>

</project>
 
 No newline at end of file