Merge pull request #9 from mmoreram/fix/some-minor-style-fixes

mmoreram · mmoreram · commit 05908d006176 · 2014-11-03T11:26:29.000+01:00
Some minor style fixes
diff --git a/.formatter.yml b/.formatter.yml
@@ -7,7 +7,7 @@ use-sort:
     sort-direction: asc
 
 header: |
-    /**
+    /*
      * This file is part of the php-formatter package
      *
      * Copyright (c) 2014 Marc Morera
diff --git a/src/PHPFormatter/Command/HeaderCommand.php b/src/PHPFormatter/Command/HeaderCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
@@ -83,9 +83,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $verbose = $output->getVerbosity();
         $path = $input->getArgument('path');
         $dryRun = $input->getOption('dry-run');
-        $fileFinder = new FileFinder;
-        $configLoader = new ConfigLoader;
-        $configFinder = new ConfigFinder;
+        $fileFinder = new FileFinder();
+        $configLoader = new ConfigLoader();
+        $configFinder = new ConfigFinder();
 
         /**
          * This section is just for finding the right values to work with in
diff --git a/src/PHPFormatter/Command/UseSortCommand.php b/src/PHPFormatter/Command/UseSortCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
@@ -142,7 +142,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $options
         );
 
-        $fileFinder = new FileFinder;
+        $fileFinder = new FileFinder();
         $files = $fileFinder->findPHPFilesByPath($path);
 
         /**
@@ -165,8 +165,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     private function getUsableConfig(InputInterface $input)
     {
-        $configLoader = new ConfigLoader;
-        $configFinder = new ConfigFinder;
+        $configLoader = new ConfigLoader();
+        $configFinder = new ConfigFinder();
 
         /**
          * This section is just for finding the right values to work with in
diff --git a/src/PHPFormatter/Compiler/Compiler.php b/src/PHPFormatter/Compiler/Compiler.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
@@ -167,7 +167,7 @@ protected function addStub(Phar $phar)
 #!/usr/bin/env php
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/src/PHPFormatter/Console/Application.php b/src/PHPFormatter/Console/Application.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/src/PHPFormatter/Finder/ConfigFinder.php b/src/PHPFormatter/Finder/ConfigFinder.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
@@ -37,7 +37,7 @@ public function findConfigFile($path)
         $config = array();
         if (is_file($configFilePath)) {
 
-            $yamlParser = new YamlParser;
+            $yamlParser = new YamlParser();
             $config = $yamlParser->parse(file_get_contents($configFilePath));
         }
 
diff --git a/src/PHPFormatter/Finder/FileFinder.php b/src/PHPFormatter/Finder/FileFinder.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/src/PHPFormatter/Fixer/HeaderFixer.php b/src/PHPFormatter/Fixer/HeaderFixer.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/src/PHPFormatter/Fixer/Interfaces/FixerInterface.php b/src/PHPFormatter/Fixer/Interfaces/FixerInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/src/PHPFormatter/Loader/ConfigLoader.php b/src/PHPFormatter/Loader/ConfigLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
@@ -80,6 +80,6 @@ public function loadConfigValue(
         return isset($configValues[$commandName])
             ? $configValues[$commandName]
             : $commandValue
-                ? : $defaultValue;
+                ?: $defaultValue;
     }
 }
diff --git a/src/PHPFormatter/PHPFormatter.php b/src/PHPFormatter/PHPFormatter.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/src/PHPFormatter/Sorter/Interfaces/SorterInterface.php b/src/PHPFormatter/Sorter/Interfaces/SorterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/src/PHPFormatter/Sorter/UseSorter.php b/src/PHPFormatter/Sorter/UseSorter.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/src/bootstrap.php b/src/bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/tests/PHPFormatter/Finder/ConfigFinderTest.php b/tests/PHPFormatter/Finder/ConfigFinderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/tests/PHPFormatter/Finder/FileFinderTest.php b/tests/PHPFormatter/Finder/FileFinderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/tests/PHPFormatter/Fixer/HeaderFixerTest.php b/tests/PHPFormatter/Fixer/HeaderFixerTest.php
@@ -1,24 +1,24 @@
 <?php
 
-/**
- * This file is part of the Elcodi package.
+/*
+ * This file is part of the php-formatter package
  *
- * Copyright (c) 2014 Elcodi.com
+ * Copyright (c) 2014 Marc Morera
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
  * Feel free to edit as you please, and have fun.
  *
  * @author Marc Morera <yuhu@mmoreram.com>
- * @author Aldo Chiecchia <zimage@tiscali.it>
  */
 
 namespace Mmoreram\PHPFormatter\Tests\Fixer;
 
-use Mmoreram\PHPFormatter\Fixer\HeaderFixer;
 use PHPUnit_Framework_TestCase;
 
+use Mmoreram\PHPFormatter\Fixer\HeaderFixer;
+
 /**
  * Class HeaderFixerTest
  */
diff --git a/tests/PHPFormatter/Loader/ConfigLoaderTest.php b/tests/PHPFormatter/Loader/ConfigLoaderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
@@ -17,8 +17,8 @@
 
 use PHPUnit_Framework_TestCase;
 
-use Mmoreram\PHPFormatter\Loader\ConfigLoader;
 use Mmoreram\PHPFormatter\Command\UseSortCommand;
+use Mmoreram\PHPFormatter\Loader\ConfigLoader;
 
 /**
  * Class ConfigLoaderTest
diff --git a/tests/PHPFormatter/Mocks/MyClass.php b/tests/PHPFormatter/Mocks/MyClass.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/tests/PHPFormatter/Mocks/MyOtherClass.php b/tests/PHPFormatter/Mocks/MyOtherClass.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/tests/PHPFormatter/Mocks/directory/MyThirdClass.php b/tests/PHPFormatter/Mocks/directory/MyThirdClass.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera
diff --git a/tests/PHPFormatter/Sorter/UseSorterTest.php b/tests/PHPFormatter/Sorter/UseSorterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of the php-formatter package
  *
  * Copyright (c) 2014 Marc Morera

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use-sort:`
`7`	`7`	`sort-direction: asc`
`8`	`8`
`9`	`9`	`header: \|`
`10`		`- /**`
	`10`	`+ /*`
`11`	`11`	`* This file is part of the php-formatter package`
`12`	`12`	`*`
`13`	`13`	`* Copyright (c) 2014 Marc Morera`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-/**`
	`3`	`+/*`
`4`	`4`	`* This file is part of the php-formatter package`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2014 Marc Morera`
`@@ -167,7 +167,7 @@ protected function addStub(Phar $phar)`
`167`	`167`	`#!/usr/bin/env php`
`168`	`168`	`<?php`
`169`	`169`
`170`		`-/**`
	`170`	`+/*`
`171`	`171`	`* This file is part of the php-formatter package`
`172`	`172`	`*`
`173`	`173`	`* Copyright (c) 2014 Marc Morera`