-Change default rule from PS2 to Symphony (#8)

-Removed rules that are already default in Symphony
-Added rule to sort imports in Alphabetical order

.php_cs.dist

@@ -3,14 +3,9 @@
 return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setRules([
-        '@PSR2' => true,
+        '@Symfony' => true,
         'concat_space' => ['spacing' => 'one'],
-        'no_empty_statement' => true,
-        'no_unused_imports' => true,
-        'no_whitespace_in_blank_line' => true,
-        'phpdoc_scalar' => true,
-        'phpdoc_inline_tag' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'ordered_imports' =>  ['sort_algorithm' => 'alpha'],
     ])
     ->setUsingCache(false)
     ->setFinder(

README.md

@@ -315,7 +315,7 @@ Run `composer test` from the root of the Package.
 ### Contributing to this Repo
 
 Feel free to submit a pull request for a feature or bug fix. However, do note that before your pull request can be merged it must have test written or updated as the case maybe.
-The project run's automatic checks for PSR-1 and PSR-2 code standards using [php-cs-fixer](https://symfony.com/doc/current/contributing/code/standards.html). 
+The project run's automatic checks to make sure that the Symphony code standards are met using [php-cs-fixer](https://symfony.com/doc/current/contributing/code/standards.html). 
 
 So, before pushing or making any pull request run the below command:
 

index.php

@@ -1,17 +1,18 @@
 <?php
+
 require 'vendor/autoload.php';
 
 use Oshomo\CsvUtils\Converter\JsonConverter;
 use Oshomo\CsvUtils\Converter\XmlConverter;
 use Oshomo\CsvUtils\Validator\Validator;
 
 $file_path = realpath(dirname(__FILE__));
-$file = $file_path . "/sample/sample.csv";
+$file = $file_path . '/sample/sample.csv';
 $validator = new Validator($file, ',', [
-    "stars" => ["between:0,5"],
-    "name" => ["ascii_only"],
-    "uri"   => ["url", function ($value, $fail) {
-        if (strpos($value, "https://") !== 0) {
+    'stars' => ['between:0,5'],
+    'name' => ['ascii_only'],
+    'uri' => ['url', function ($value, $fail) {
+        if (0 !== strpos($value, 'https://')) {
             return $fail('The URL passed must be https i.e it must start with https://');
         }
     }],

src/Contracts/ConverterHandlerInterface.php

@@ -6,7 +6,7 @@ interface ConverterHandlerInterface
 {
     /**
      * Get the converter file extension. If the file extension
-     * for this converter is csv just return "csv"
+     * for this converter is csv just return "csv".
      *
      * @return string
      */
@@ -23,7 +23,7 @@ public function getExtension();
     public function convert($data);
 
     /**
-     * Writes the converted data to the path specified
+     * Writes the converted data to the path specified.
      *
      * @param string $filename
      *

src/Contracts/ValidationRuleInterface.php

@@ -7,17 +7,17 @@ interface ValidationRuleInterface
     /**
      * Get the number of parameters that should be supplied.
      * If no parameter should be supplied return 0 else
-     * return the number of parameters that should be returned
+     * return the number of parameters that should be returned.
      *
      * @return int
      */
     public function parameterCount();
 
     /**
      * Determines if the validation rule passes. This is where we do the
-     * actual validation. If the validation passes return true else false
+     * actual validation. If the validation passes return true else false.
      *
-     * @param  mixed $value
+     * @param mixed $value
      * @param array $parameters
      *
      * @return bool
@@ -27,7 +27,7 @@ public function passes($value, $parameters);
     /**
      * Get the validation error message. Specify the message that should
      * be returned if the validation fails. You can make use of the
-     * :attribute and :value placeholders in the message string
+     * :attribute and :value placeholders in the message string.
      *
      * @return string
      */
@@ -42,10 +42,10 @@ public function message();
      *      [':custom_a', ':custom_b'],
      *      [$parameters[0], $parameters[1]],
      *      $message
-     * );
+     * );.
      *
      * @param string $message
-     * @param array $parameters
+     * @param array  $parameters
      *
      * @return string
      */

src/Converter/JsonConverter.php

@@ -6,10 +6,10 @@
 
 class JsonConverter implements ConverterHandlerInterface
 {
-    const FILE_EXTENSION = "json";
+    const FILE_EXTENSION = 'json';
 
     /**
-     * The converted data
+     * The converted data.
      *
      * @var string
      */

src/Converter/XmlConverter.php

@@ -8,23 +8,22 @@
 
 class XmlConverter implements ConverterHandlerInterface
 {
-    const FILE_EXTENSION = "xml";
-    const DEFAULT_ROOT_ELEMENT = "data";
-    const DEFAULT_RECORD_ELEMENT = "item";
+    const FILE_EXTENSION = 'xml';
+    const DEFAULT_ROOT_ELEMENT = 'data';
+    const DEFAULT_RECORD_ELEMENT = 'item';
 
     /**
-     * XML node root element
+     * XML node root element.
      */
     protected $recordElement;
 
     /**
-     * The converted data
+     * The converted data.
      *
      * @var string
      */
     protected $data;
 
-
     /**
      * XmlConverter constructor.
      *

src/Helpers/FormatsMessages.php

@@ -9,17 +9,17 @@ trait FormatsMessages
     /**
      * Get the validation message for an attribute and rule.
      *
-     * @param string $attribute
+     * @param string                  $attribute
      * @param ValidationRuleInterface $rule
-     * @param string $actualRule
+     * @param string                  $actualRule
      *
      * @return string
      */
     protected function getMessage($attribute, $rule, $actualRule)
     {
         $inlineMessage = $this->getInlineMessage($attribute, $actualRule);
 
-        if (! is_null($inlineMessage)) {
+        if (!is_null($inlineMessage)) {
             return $inlineMessage;
         }
 
@@ -81,11 +81,11 @@ protected function ruleToLower($rule)
     /**
      * Replace all error message place-holders with actual values.
      *
-     * @param string $message
-     * @param string $attribute
-     * @param mixed $value
+     * @param string                  $message
+     * @param string                  $attribute
+     * @param mixed                   $value
      * @param ValidationRuleInterface $rule
-     * @param array $parameters
+     * @param array                   $parameters
      *
      * @return string
      */

src/Rules/AsciiOnly.php

@@ -7,7 +7,7 @@
 class AsciiOnly implements ValidationRuleInterface
 {
     /**
-     * Get the number of parameters that should be supplied
+     * Get the number of parameters that should be supplied.
      *
      * @return int
      */
@@ -19,7 +19,7 @@ public function parameterCount()
     /**
      * Determine if the validation rule passes.
      *
-     * @param  mixed $value
+     * @param mixed $value
      * @param $parameters
      *
      * @return bool
@@ -36,14 +36,14 @@ public function passes($value, $parameters)
      */
     public function message()
     {
-        return "The :attribute value :value contains a non-ascii character";
+        return 'The :attribute value :value contains a non-ascii character';
     }
 
     /**
      * Replace error messages parameter with right values.
      *
      * @param string $message
-     * @param array $parameters
+     * @param array  $parameters
      *
      * @return string
      */

src/Rules/Between.php

@@ -40,14 +40,14 @@ public function passes($value, $parameters)
      */
     public function message()
     {
-        return "The :attribute value :value is not between :min - :max.";
+        return 'The :attribute value :value is not between :min - :max.';
     }
 
     /**
-     * Replace error messages parameter with right values
+     * Replace error messages parameter with right values.
      *
      * @param string $message
-     * @param array $parameters
+     * @param array  $parameters
      *
      * @return string
      */

src/Rules/ClosureValidationRule.php

@@ -30,9 +30,7 @@ class ClosureValidationRule implements ValidationRuleInterface
     /**
      * Create a new Closure based validation rule.
      *
-     * @param  \Closure  $callback
-     *
-     * @return void
+     * @param \Closure $callback
      */
     public function __construct($callback)
     {
@@ -52,7 +50,7 @@ public function parameterCount()
     /**
      * Determine if the validation rule passes.
      *
-     * @param  mixed $value
+     * @param mixed $value
      * @param $parameters
      *
      * @return bool
@@ -67,7 +65,7 @@ public function passes($value, $parameters)
             $this->message = $message;
         });
 
-        return ! $this->failed;
+        return !$this->failed;
     }
 
     /**
@@ -84,7 +82,7 @@ public function message()
      * Replace error messages parameter with right values.
      *
      * @param string $message
-     * @param array $parameters
+     * @param array  $parameters
      *
      * @return string
      */

src/Rules/Url.php

@@ -57,14 +57,14 @@ public function passes($value, $parameters)
      */
     public function message()
     {
-        return "The :attribute value :value is not a valid url";
+        return 'The :attribute value :value is not a valid url';
     }
 
     /**
      * Replace error messages parameter with right values.
      *
      * @param string $message
-     * @param array $parameters
+     * @param array  $parameters
      *
      * @return string
      */

src/Validator/ValidationRuleParser.php

@@ -42,7 +42,7 @@ protected static function parseStringRule($rule)
         // The format for specifying validation rules and parameters follows an
         // easy {rule}:{parameters} formatting convention. For instance the
         // rule "Between:3,5" states that the value may only be between 3 - 5.
-        if (strpos($rule, ':') !== false) {
+        if (false !== strpos($rule, ':')) {
             list($rule, $parameter) = explode(':', $rule, 2);
 
             $parameters = static::parseParameters($parameter);