Version information is now printed when installed via composer or run…

… from a Git clone (request #20050)
winmillwill · Sep 5, 2013 · 44b0a9e · 44b0a9e
1 parent bec30bc
commit 44b0a9e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/CodeSniffer.php b/CodeSniffer.php
@@ -68,6 +68,20 @@
 class PHP_CodeSniffer
 {
 
+    /**
+     * The current version.
+     *
+     * @var string
+     */
+    const VERSION = '1.4.7';
+
+    /**
+     * Package stability; either stable or beta.
+     *
+     * @var string
+     */
+    const STABILITY = 'stable';
+
     /**
      * The file or directory that is currently being processed.
      *

diff --git a/CodeSniffer/CLI.php b/CodeSniffer/CLI.php
@@ -307,8 +307,9 @@ public function processLongArgument($arg, $pos, $values)
             exit(0);
             break;
         case 'version':
-            echo 'PHP_CodeSniffer version @package_version@ (@package_state@) ';
-            echo 'by Squiz Pty Ltd. (http://www.squiz.com.au)'.PHP_EOL;
+            $phpcs = new PHP_CodeSniffer();
+            echo 'PHP_CodeSniffer version '.$phpcs::VERSION.' ('.$phpcs::STABILITY.') ';
+            echo 'by Squiz (http://www.squiz.net)'.PHP_EOL;
             exit(0);
             break;
         case 'config-set':

diff --git a/package.xml b/package.xml
@@ -28,6 +28,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <notes>
   - Added support for the PHP 5.4 callable type hint
   - Fixed problem where some file content could be ignored when checking STDIN
+  - Version information is now printed when installed via composer or run from a Git clone (request #20050)
   - PEAR MultiLineConditionSniff now has a setting to specify how many spaces code should be indented
     -- Default remains at 4; override the 'indent' setting in a ruleset.xml file to change
     -- Thanks to Szabolcs Sulik for the patch
@@ -2215,7 +2216,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
     </dir>
     <file baseinstalldir="PHP" name="CLI.php" role="php">
      <tasks:replace from="@package_version@" to="version" type="package-info" />
-     <tasks:replace from="@package_state@" to="state" type="package-info" />
     </file>
     <file baseinstalldir="PHP" name="Exception.php" role="php">
      <tasks:replace from="@package_version@" to="version" type="package-info" />