Merge pull request #27 from mmoreram/feature/add-stricts

Add stricts fixer

Author: mmoreram

.formatter.yml

@@ -6,11 +6,12 @@ use-sort:
     sort-type: alph
     sort-direction: asc
 
+strict: ~
 header: |
     /*
      * This file is part of the php-formatter package
      *
-     * Copyright (c) 2014 Marc Morera
+     * Copyright (c) 2014-2016 Marc Morera
      *
      * For the full copyright and license information, please view the LICENSE
      * file that was distributed with this source code.

.travis.yml

@@ -1,23 +1,16 @@
 language: php
 
+sudo: false
+
 php:
-    - 5.4
-    - 5.5
-    - 5.6
     - 7.0
-    - hhvm-nightly
-
-matrix:
-    fast_finish: true
-    allow_failures:
-        - php: 7.0
-        - php: hhvm-nightly
+    - 7.1
 
 install:
-    - composer install --prefer-source --no-interaction
+    - composer update --prefer-source --no-interaction
 
 script:
-    - phpunit --coverage-text
+    - vendor/bin/phpunit --coverage-text
 
 notifications:
     email: false

README.md

@@ -88,6 +88,7 @@ use-sort:
     sort-type: alph
     sort-direction: asc
 
+strict: ~
 header: |
     /*
      * This file is part of the php-formatter package
@@ -347,3 +348,29 @@ header: |
      * @author Marc Morera <yuhu@mmoreram.com>
      */
 ```
+
+### Fix all strict declarations
+
+In your >=7.0 PHP applications you can use simple type declarations in your
+methods. You can define your application as relaxed as you want by declaring the
+`strict_mode` variable in your files. Each php file must be configured itself,
+so in order to make sure all your files have the definition after the header if
+exists and before the namespace declaration, you can use this command.
+
+* command: `php-formatter formatter:strict:fix`
+* argument: path
+* option: --dry-run [***no value***]
+
+You can have three values here. If you define a boolean, then each file found
+will have the declaration with the boolean given.
+
+``` yml
+strict: true
+```
+
+Otherwise, if you define a '~' value then your declaration lines will be
+removed.
+
+``` yml
+strict: '~'
+```

build/php-formatter.phar

@@ -13,25 +13,22 @@
         }
     ],
     "require": {
-        "php": "^5.4|^7.0",
-        "symfony/console": "^2.2|^3.0",
-        "symfony/process": "^2.2|^3.0",
-        "symfony/finder": "^2.2|^3.0",
-        "symfony/filesystem": "^2.2|^3.0",
-        "symfony/yaml": "^2.2|^3.0",
-        "symfony/event-dispatcher": "^2.2|^3.0",
-        "symfony/property-access": "^2.2|^3.0"
+        "php": ">=7.0",
+        "symfony/console": "^3.0",
+        "symfony/process": "^3.0",
+        "symfony/finder": "^3.0",
+        "symfony/filesystem": "^3.0",
+        "symfony/yaml": "^3.0",
+        "symfony/event-dispatcher": "^3.0",
+        "symfony/property-access": "^3.0"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "1.4.2",
-        "phpunit/phpunit": "4.5.0"
+        "friendsofphp/php-cs-fixer": "^1.12.4",
+        "phpunit/phpunit": "^5.6.4"
     },
     "bin": [
         "bin/php-formatter"
     ],
-    "config": {
-        "bin-dir": "bin"
-    },
     "autoload": {
         "psr-4": {"Mmoreram\\PHPFormatter\\": "src/PHPFormatter"}
     },
@@ -42,5 +39,13 @@
         "branch-alias": {
             "dev-master": "1.0-dev"
         }
+    },
+    "scripts": {
+        "fix-code": [
+            "vendor/bin/php-cs-fixer fix --config-file=.php_cs",
+            "vendor/bin/php-formatter f:h:f .",
+            "vendor/bin/php-formatter f:u:s ."
+        ],
+        "test": "vendor/bin/phpunit"
     }
 }

composer.json

@@ -3,7 +3,7 @@
 /*
  * This file is part of the php-formatter package
  *
- * Copyright (c) 2014 Marc Morera
+ * Copyright (c) 2014-2016 Marc Morera
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -29,7 +29,7 @@
 use Mmoreram\PHPFormatter\Loader\ConfigLoader;
 
 /**
- * Class HeaderCommand
+ * Class HeaderCommand.
  */
 class HeaderCommand extends Command
 {
@@ -41,13 +41,13 @@ class HeaderCommand extends Command
     const COMMAND_NAME = 'header';
 
     /**
-     * configure
+     * configure.
      */
     protected function configure()
     {
         $this
             ->setName('formatter:header:fix')
-            ->setDescription('Ensures that all PHP files has header defined in config file')
+            ->setDescription('Ensures that all PHP files have the header defined in the config file')
             ->addArgument(
                 'path',
                 InputArgument::REQUIRED,
@@ -57,19 +57,19 @@ protected function configure()
                 '--config',
                 '-c',
                 InputOption::VALUE_OPTIONAL,
-                "Config file directory",
+                'Config file directory',
                 getcwd()
             )
             ->addOption(
                 'dry-run',
                 null,
                 InputOption::VALUE_NONE,
-                "Just print the result, nothing is overwritten"
+                'Just print the result, nothing is overwritten'
             );
     }
 
     /**
-     * Execute command
+     * Execute command.
      *
      * @param InputInterface  $input  Input
      * @param OutputInterface $output Output
@@ -101,11 +101,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         );
 
         if (empty($header)) {
-            throw new Exception('Header definition must be defined in .formatter.yml file under');
+            throw new Exception('Header definition must be defined in .formatter.yml file under header');
         }
 
         /**
-         * Building the real directory or file to work in
+         * Building the real directory or file to work in.
          */
         $filesystem = new Filesystem();
         if (!$filesystem->isAbsolutePath($path)) {
@@ -116,7 +116,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw new Exception('Directory or file "' . $path . '" does not exist');
         }
 
-        /**
+        /*
          * Dry-run message
          */
         if ($dryRun && $verbose >= OutputInterface::VERBOSITY_VERBOSE) {
@@ -128,13 +128,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         /**
-         * Creates the new HeaderFixer
+         * Creates the new HeaderFixer.
          */
         $headerFixer = new HeaderFixer($header);
 
         $files = $fileFinder->findPHPFilesByPath($path);
 
-        /**
+        /*
          * If verbose level is higher or equal than -vv, we print the config
          * file data, if is not empty.
          */
@@ -144,11 +144,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $output->writeln('#');
 
-        /**
+        /*
          * Each found php file is processed
          */
         foreach ($files as $file) {
-            $data = file_get_contents($file);
+            $data = $file->getContents();
             $result = $headerFixer->fix($data);
 
             if ($result === false || $data === $result) {
@@ -160,7 +160,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             if (!$dryRun) {
-                file_put_contents($file, $result);
+                file_put_contents($file->getRealPath(), $result);
             }
         }
     }