Gregwar · chippyash · May 21, 2018 · May 21, 2018 · May 21, 2018 · May 21, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 composer.lock
 vendor
 **.swp
+docs/contract.html
diff --git a/README.md b/README.md
@@ -454,3 +454,5 @@ to set the cache directory.
 V2.0.0 End support for PHP <5.6
 
 V2.1.0 Remove hard dependency on Captcha library
+
+V2.1.1 Standardise code structure
diff --git a/autoload.php b/autoload.php
diff --git a/composer.json b/composer.json
@@ -33,10 +33,9 @@
  "suggest": {
  "gregwar/captcha": "To implement Captcha capability into forms"
  },
- "target-dir": "Gregwar/Formidable",
  "autoload": {
- "psr-0": {
- "Gregwar\\Formidable": ""
+ "psr-4": {
+ "Gregwar\\Formidable\\": "src"
  }
  }
 }
diff --git a/docs/.gitkeep b/docs/.gitkeep
diff --git a/examples/basic.php b/examples/basic.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
  What\'s your name? <input type="text" name="nom" /><br />

diff --git a/examples/cache-file.php b/examples/cache-file.php
@@ -1,7 +1,7 @@
 <?php
 $_SESSION = array();
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('forms/performances.html', null, true);
 

diff --git a/examples/cache.php b/examples/cache.php
@@ -1,7 +1,7 @@
 <?php
 $_SESSION = array();
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
  What\'s your name? <input type="text" name="nom" /><br />

diff --git a/examples/custom.php b/examples/custom.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
  <custom source="something" />

diff --git a/examples/index.php b/examples/index.php
@@ -1,6 +1,6 @@
 <?php
 session_start(); // required for CSRF
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 include('person.php');
 
 $form = new Gregwar\Formidable\Form('forms/demoform.html', array());
@@ -35,7 +35,7 @@
  <h1>Formidable Demo</h1>
  <?php if ($errors) { ?>
  <div style="color:red">
- <h2>Validations error</h1>
+ <h1>Validations error</h1>
  <ul>
  <?php foreach ($errors as $error) { ?>
  <li><?php echo $error; ?></li>

diff --git a/examples/mapping.php b/examples/mapping.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 class Person
 {

diff --git a/examples/minmax.php b/examples/minmax.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
  How old are you? <input type="int" name="age" min="18" max="130" />

diff --git a/examples/multiple.php b/examples/multiple.php
@@ -6,7 +6,7 @@ class Film
  public $actors;
 }
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
 

diff --git a/examples/performances.php b/examples/performances.php
@@ -1,5 +1,5 @@
 <?php
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $iterations = 5000;
 

diff --git a/examples/placeholder.php b/examples/placeholder.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
  <span style="color:{{ color }}">Hello</span>

diff --git a/examples/select.php b/examples/select.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
  <select name="colour">

diff --git a/examples/source.php b/examples/source.php
@@ -1,6 +1,6 @@
 <?php
 
-include(__DIR__.'/../autoload.php');
+include(__DIR__ . '/../vendor/autoload.php');
 
 $form = new Gregwar\Formidable\Form('<form method="post">
  <select name="animal">

diff --git a/phpunit.xml b/phpunit.xml
@@ -9,15 +9,20 @@
  processIsolation="false"
  stopOnFailure="false"
  syntaxCheck="false"
- bootstrap="tests/bootstrap.php"
+ bootstrap="./vendor/autoload.php"
 >
  <testsuites>
- <testsuite name="Formidable Test Suite">
- <file>./tests/ParserTests.php</file>
- <file>./tests/FormTests.php</file>
- <file>./tests/ContextTests.php</file>
- <file>./tests/ConstraintsTests.php</file>
+ <testsuite name="Default">
+ <directory suffix="Test.php">./test</directory>
  </testsuite>
  </testsuites>
+ <filter>
+ <whitelist processUncoveredFilesFromWhitelist="true">
+ <directory suffix=".php">./src</directory>
+ </whitelist>
+ </filter>
+ <logging>
+ <log type="testdox-html" target="./docs/contract.html"/>
+ </logging>
 
 </phpunit>
diff --git a/DataForm.php → src/DataForm.php b/DataForm.php → src/DataForm.php
diff --git a/Error.php → src/Error.php b/Error.php → src/Error.php
diff --git a/Factory.php → src/Factory.php b/Factory.php → src/Factory.php
diff --git a/Fields/ButtonField.php → src/Fields/ButtonField.php b/Fields/ButtonField.php → src/Fields/ButtonField.php
diff --git a/Fields/CaptchaField.php → src/Fields/CaptchaField.php b/Fields/CaptchaField.php → src/Fields/CaptchaField.php
diff --git a/Fields/CheckboxField.php → src/Fields/CheckboxField.php b/Fields/CheckboxField.php → src/Fields/CheckboxField.php
diff --git a/Fields/DateField.php → src/Fields/DateField.php b/Fields/DateField.php → src/Fields/DateField.php
diff --git a/Fields/EmailField.php → src/Fields/EmailField.php b/Fields/EmailField.php → src/Fields/EmailField.php
diff --git a/Fields/Field.php → src/Fields/Field.php b/Fields/Field.php → src/Fields/Field.php
diff --git a/Fields/FileField.php → src/Fields/FileField.php b/Fields/FileField.php → src/Fields/FileField.php
diff --git a/Fields/Group.php → src/Fields/Group.php b/Fields/Group.php → src/Fields/Group.php
diff --git a/Fields/HiddenField.php → src/Fields/HiddenField.php b/Fields/HiddenField.php → src/Fields/HiddenField.php
diff --git a/Fields/IntField.php → src/Fields/IntField.php b/Fields/IntField.php → src/Fields/IntField.php
diff --git a/Fields/MulticheckboxField.php → src/Fields/MulticheckboxField.php b/Fields/MulticheckboxField.php → src/Fields/MulticheckboxField.php
diff --git a/Fields/Multiple.php → src/Fields/Multiple.php b/Fields/Multiple.php → src/Fields/Multiple.php
diff --git a/Fields/MultiradioField.php → src/Fields/MultiradioField.php b/Fields/MultiradioField.php → src/Fields/MultiradioField.php
diff --git a/Fields/NumberField.php → src/Fields/NumberField.php b/Fields/NumberField.php → src/Fields/NumberField.php
diff --git a/Fields/Option.php → src/Fields/Option.php b/Fields/Option.php → src/Fields/Option.php
diff --git a/Fields/Options.php → src/Fields/Options.php b/Fields/Options.php → src/Fields/Options.php
diff --git a/Fields/PasswordField.php → src/Fields/PasswordField.php b/Fields/PasswordField.php → src/Fields/PasswordField.php
diff --git a/Fields/RadioField.php → src/Fields/RadioField.php b/Fields/RadioField.php → src/Fields/RadioField.php
diff --git a/Fields/Radios.php → src/Fields/Radios.php b/Fields/Radios.php → src/Fields/Radios.php
diff --git a/Fields/Select.php → src/Fields/Select.php b/Fields/Select.php → src/Fields/Select.php
diff --git a/Fields/TextField.php → src/Fields/TextField.php b/Fields/TextField.php → src/Fields/TextField.php
diff --git a/Fields/Textarea.php → src/Fields/Textarea.php b/Fields/Textarea.php → src/Fields/Textarea.php
Original file line number	Diff line number	Diff line change
Expand Up		@@ -454,3 +454,5 @@ to set the cache directory.
		V2.0.0 End support for PHP <5.6

		V2.1.0 Remove hard dependency on Captcha library

		V2.1.1 Standardise code structure