created TestCase base class

updated readme

Author: shabbyrobe

README.rst

@@ -11,15 +11,17 @@ 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. 
 
-  New in version 0.6.1:
+  New in version 0.7.0:
 
     - API has changed slightly. ``Docopt\docopt`` has been renamed to ``Docopt::handle``
       to fix autoloader support. See issue #3.
 
     - Compatibility with Python master branch at commit `d5b96f878a 
       <https://github.com/docopt/docopt/commit/d5b96f878abbda51b62f1e28010d2b42b19a27dc>`_
 
-    - Potentially serious BC break in `issue 102 <https://github.com/docopt/docopt/issues/102>`_
+    - Significant BC break. Existing users should read the information below about Usage and
+      Option sections. See `issue 102 <https://github.com/docopt/docopt/issues/102>`_ for more
+      info.
 
 Please see the `Python version's README <https://github.com/docopt/docopt/blob/master/README.rst>`_ 
 for any new and breaking changes that are not specific to the PHP version.
@@ -85,7 +87,7 @@ Create a ``composer.json`` file for your project
 
     {
         "require": {
-            "docopt/docopt": ">=0.6.*"
+            "docopt/docopt": ">=0.7.*"
         }
     }
 

test/lib/PythonPortedTest.php

@@ -11,7 +11,7 @@
 use Docopt\Response;
 use Docopt\Command;
 
-class PythonPortedTest extends \PHPUnit_Framework_TestCase
+class PythonPortedTest extends TestCase
 {
     /**
      * The arguments from the docopt test file are the other way around.
@@ -858,13 +858,6 @@ public function testIssue71DoubleDashIsNotAValidOptionArgument()
         $result = $this->docopt("usage: prog [-l LEVEL] [--] <args>...\noptions: -l LEVEL", "-l -- 1 2");
         $this->assertFalse($result->success);
     }
-
-    private function docopt($usage, $args='', $extra=array())
-    {
-        $extra = array_merge(array('exit'=>false, 'help'=>false), $extra);
-        $handler = new \Docopt\Handler($extra);
-        return call_user_func(array($handler, 'handle'), $usage, $args);
-    }
 
     public function testParseSection()
     {

test/lib/TestCase.php

@@ -0,0 +1,12 @@
+<?php
+namespace Docopt\Test;
+
+abstract class TestCase extends \PHPUnit_Framework_TestCase
+{
+    protected function docopt($usage, $args='', $extra=array())
+    {
+        $extra = array_merge(array('exit'=>false, 'help'=>false), $extra);
+        $handler = new \Docopt\Handler($extra);
+        return call_user_func(array($handler, 'handle'), $usage, $args);
+    }
+}

test/run.php

@@ -4,8 +4,9 @@
 require $basePath.'/src/docopt.php';
 require_once 'PHPUnit/Autoload.php';
 
-require $testPath.'/lib/PythonPortedTest.php';
+require $testPath.'/lib/TestCase.php';
 require $testPath.'/lib/LanguageAgnosticTest.php';
+require $testPath.'/lib/PythonPortedTest.php';
 
 $options = array(
     'filter'=>null,