1.0.2

Author: shabbyrobe

README.rst

@@ -13,9 +13,9 @@ As a result, unless a bug is present only in the PHP version, pull requests
 are unlikely to be accepted unless they are themselves direct transliterations
 of bugfixes in the Python version. 
 
-**This port has been marked version 1.0.0**. It is based on the Python version at
-commit `3e0b80a32c8478c076171e0cffcf754141a9950d
-<https://github.com/docopt/docopt/commit/3e0b80a32c8478c076171e0cffcf754141a9950d>`_
+**This port has been marked version 1.0**. It is based on the Python version at
+commit `463d780a698cbacb1cf5590ae849b8f890baf25d
+<https://github.com/docopt/docopt/commit/463d780a698cbacb1cf5590ae849b8f890baf25d>`_
 (labelled **0.6.1**).
 
 It has been quite stable for a long time and has barely been changed.  The Python version
@@ -56,22 +56,22 @@ and instead can write only the help message--*the way you want it*.
     <?php
     $doc = <<<DOC
     Naval Fate.
-
+   
     Usage:
       naval_fate.php ship new <name>...
       naval_fate.php ship <name> move <x> <y> [--speed=<kn>]
       naval_fate.php ship shoot <x> <y>
       naval_fate.php mine (set|remove) <x> <y> [--moored | --drifting]
       naval_fate.php (-h | --help)
       naval_fate.php --version
-
+   
     Options:
       -h --help     Show this screen.
       --version     Show version.
       --speed=<kn>  Speed in knots [default: 10].
       --moored      Moored (anchored) mine.
       --drifting    Drifting mine.
-
+   
     DOC;
     
     require('path/to/src/docopt.php');
@@ -92,21 +92,9 @@ information in it to make a parser*.
 Installation
 ======================================================================
 
-``docopt.php`` is available on `Packagist <http://packagist.org/packages/docopt/docopt>`_. 
-Create a ``composer.json`` file for your project
-
-.. code-block:: javascript
-
-    {
-        "require": {
-            "docopt/docopt": "1.0.0"
-        }
-    }
-
-Install using composer::
-    
-    php composer.phar install
+Install ``docopt.php`` using `Composer <http://getcomposer.org>`_::
 
+    composer require docopt/docopt
 
 Alternatively, you can just drop ``docopt.php`` file into your project--it is
 self-contained. `Get source on github <http://github.com/docopt/docopt.php>`_.

composer.json

@@ -2,7 +2,7 @@
     "name": "docopt/docopt",
     "type": "library",
     "description": "Port of Python's docopt for PHP 5.3",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "keywords": ["cli","docs"],
     "homepage": "http://github.com/docopt/docopt.php",
     "license": "MIT",

examples/any-options.php

@@ -1,8 +1,7 @@
 <?php
+require __DIR__.'/../src/docopt.php';
 
-require(__DIR__.'/../src/docopt.php');
-
-$doc = "
+$doc = <<<'DOCOPT'
 Example of program which uses [options] shortcut in pattern.
 
 Usage:
@@ -16,8 +15,8 @@
   --apply                  apply changes to database
   -q                       operate in quiet mode
 
-";
+DOCOPT;
 
-$result = Docopt\docopt($doc, array('version'=>'1.0.0rc2'));
+$result = Docopt::handle($doc, array('version'=>'1.0.0rc2'));
 foreach ($result as $k=>$v)
     echo $k.': '.json_encode($v).PHP_EOL;

examples/arguments.php

@@ -1,8 +1,7 @@
 <?php
+require __DIR__.'/../src/docopt.php';
 
-require(__DIR__.'/../src/docopt.php');
-
-$doc = "
+$doc = <<<'DOCOPT'
 Process FILE and optionally apply correction to either left-hand side or
 right-hand side.
 
@@ -21,8 +20,8 @@
   --left   use left-hand side
   --right  use right-hand side
 
-";
+DOCOPT;
 
-$result = Docopt\docopt($doc, array('version'=>'1.0.0rc2'));
+$result = Docopt::handle($doc, array('version'=>'1.0.0rc2'));
 foreach ($result as $k=>$v)
     echo $k.': '.json_encode($v).PHP_EOL;

py

@@ -1035,6 +1035,7 @@ function extras($help, $version, $options, $doc)
     class Handler
     {
         public $exit = true;
+        public $exitFullUsage = false;
         public $help = true;
         public $optionsFirst = false;
         public $version;
@@ -1059,8 +1060,8 @@ function handle($doc, $argv=null)
                 $usage = $usageSections[0];
 
                 // temp fix until python port provides solution
-                ExitException::$usage = $usage;
-                
+                ExitException::$usage = !$this->exitFullUsage ? $usage : $doc;
+
                 $options = parse_defaults($doc);
 
                 $formalUse = formal_usage($usage);