Initial attempt at a namespace-based cleanup of the code. Almost noth…

…ing is working right now.
ktomk · Mar 24, 2015 · f61025c · f61025c
1 parent 081f49a
commit f61025c
Show file tree

Hide file tree

Showing 921 changed files with 6,837 additions and 7,241 deletions.
diff --git a/CodeSniffer.php b/CodeSniffer.php
diff --git a/CodeSniffer/File.php b/CodeSniffer/File.php
diff --git a/scripts/phpcbf → bin/phpcbf b/scripts/phpcbf → bin/phpcbf
diff --git a/scripts/phpcs → bin/phpcs b/scripts/phpcs → bin/phpcs
@@ -9,17 +9,14 @@
  * @category  PHP
  * @package   PHP_CodeSniffer
  * @author    Greg Sherwood <[email protected]>
- * @author    Marc McIntyre <[email protected]>
  * @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
  * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
-if (is_file(dirname(__FILE__).'/../CodeSniffer/CLI.php') === true) {
-    include_once dirname(__FILE__).'/../CodeSniffer/CLI.php';
-} else {
-    include_once 'PHP/CodeSniffer/CLI.php';
-}
+require_once 'vendor/autoload.php';
 
-$cli = new PHP_CodeSniffer_CLI();
-$cli->runphpcs();
+use PHP_CodeSniffer\Runner;
+
+$runner = new Runner();
+$runner->runPHPCS();
diff --git a/composer.json b/composer.json
@@ -25,39 +25,14 @@
         }
     },
     "autoload": {
-        "classmap": [
-            "CodeSniffer.php",
-            "CodeSniffer/CLI.php",
-            "CodeSniffer/Exception.php",
-            "CodeSniffer/File.php",
-            "CodeSniffer/Fixer.php",
-            "CodeSniffer/Report.php",
-            "CodeSniffer/Reporting.php",
-            "CodeSniffer/Sniff.php",
-            "CodeSniffer/Tokens.php",
-            "CodeSniffer/Reports/",
-            "CodeSniffer/Tokenizers/",
-            "CodeSniffer/DocGenerators/",
-            "CodeSniffer/Standards/AbstractPatternSniff.php",
-            "CodeSniffer/Standards/AbstractScopeSniff.php",
-            "CodeSniffer/Standards/AbstractVariableSniff.php",
-            "CodeSniffer/Standards/IncorrectPatternException.php",
-            "CodeSniffer/Standards/Generic/Sniffs/",
-            "CodeSniffer/Standards/MySource/Sniffs/",
-            "CodeSniffer/Standards/PEAR/Sniffs/",
-            "CodeSniffer/Standards/PSR1/Sniffs/",
-            "CodeSniffer/Standards/PSR2/Sniffs/",
-            "CodeSniffer/Standards/Squiz/Sniffs/",
-            "CodeSniffer/Standards/Zend/Sniffs/"
-        ]
+        "psr-4": {"PHP_CodeSniffer\\": "src/"}
     },
     "require": {
         "php": ">=5.1.2",
         "ext-tokenizer": "*",
         "ext-xmlwriter": "*"
     },
     "bin": [
-        "scripts/phpcs",
-        "scripts/phpcbf"
+        "bin/phpcs"
     ]
 }