Skip to content
This repository
Browse code

Revert "Use SebastianBergmann\Version"

This reverts commit ca756f0.
  • Loading branch information...
commit f5f23143ebb4519bdd23313471e3e4b6571bf6d9 1 parent ca756f0
Sebastian Bergmann authored January 05, 2013
4  PHP/CodeCoverage/Autoload.php
@@ -46,7 +46,6 @@
46 46
 require_once 'File/Iterator/Autoload.php';
47 47
 require_once 'PHP/Token/Stream/Autoload.php';
48 48
 require_once 'Text/Template/Autoload.php';
49  
-require_once 'SebastianBergmann/Version/autoload.php';
50 49
 
51 50
 spl_autoload_register(
52 51
   function ($class)
@@ -77,7 +76,8 @@ function ($class)
77 76
             'php_codecoverage_report_php' => '/CodeCoverage/Report/PHP.php',
78 77
             'php_codecoverage_report_text' => '/CodeCoverage/Report/Text.php',
79 78
             'php_codecoverage_util' => '/CodeCoverage/Util.php',
80  
-            'php_codecoverage_util_invalidargumenthelper' => '/CodeCoverage/Util/InvalidArgumentHelper.php'
  79
+            'php_codecoverage_util_invalidargumenthelper' => '/CodeCoverage/Util/InvalidArgumentHelper.php',
  80
+            'php_codecoverage_version' => '/CodeCoverage/Version.php'
81 81
           );
82 82
 
83 83
           $path = dirname(dirname(__FILE__));
1  PHP/CodeCoverage/Autoload.php.in
@@ -46,7 +46,6 @@
46 46
 require_once 'File/Iterator/Autoload.php';
47 47
 require_once 'PHP/Token/Stream/Autoload.php';
48 48
 require_once 'Text/Template/Autoload.php';
49  
-require_once 'SebastianBergmann/Version/autoload.php';
50 49
 
51 50
 spl_autoload_register(
52 51
   function ($class)
10  PHP/CodeCoverage/Report/HTML/Renderer.php
@@ -87,11 +87,6 @@
87 87
     protected $highLowerBound;
88 88
 
89 89
     /**
90  
-     * @var string
91  
-     */
92  
-    protected $version;
93  
-
94  
-    /**
95 90
      * Constructor.
96 91
      *
97 92
      * @param string  $templatePath
@@ -103,15 +98,12 @@
103 98
      */
104 99
     public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound)
105 100
     {
106  
-        $version = new SebastianBergmann\Version;
107  
-
108 101
         $this->templatePath   = $templatePath;
109 102
         $this->charset        = $charset;
110 103
         $this->generator      = $generator;
111 104
         $this->date           = $date;
112 105
         $this->lowUpperBound  = $lowUpperBound;
113 106
         $this->highLowerBound = $highLowerBound;
114  
-        $this->version        = $version->getVersion('1.3', __DIR__);
115 107
     }
116 108
 
117 109
     /**
@@ -202,7 +194,7 @@ protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeC
202 194
             'breadcrumbs'      => $this->getBreadcrumbs($node),
203 195
             'charset'          => $this->charset,
204 196
             'date'             => $this->date,
205  
-            'version'          => $this->version,
  197
+            'version'          => PHP_CodeCoverage_Version::id(),
206 198
             'php_version'      => PHP_VERSION,
207 199
             'generator'        => $this->generator,
208 200
             'low_upper_bound'  => $this->lowUpperBound,
92  PHP/CodeCoverage/Version.php
... ...
@@ -0,0 +1,92 @@
  1
+<?php
  2
+/**
  3
+ * PHP_CodeCoverage
  4
+ *
  5
+ * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
  6
+ * All rights reserved.
  7
+ *
  8
+ * Redistribution and use in source and binary forms, with or without
  9
+ * modification, are permitted provided that the following conditions
  10
+ * are met:
  11
+ *
  12
+ *   * Redistributions of source code must retain the above copyright
  13
+ *     notice, this list of conditions and the following disclaimer.
  14
+ *
  15
+ *   * Redistributions in binary form must reproduce the above copyright
  16
+ *     notice, this list of conditions and the following disclaimer in
  17
+ *     the documentation and/or other materials provided with the
  18
+ *     distribution.
  19
+ *
  20
+ *   * Neither the name of Sebastian Bergmann nor the names of his
  21
+ *     contributors may be used to endorse or promote products derived
  22
+ *     from this software without specific prior written permission.
  23
+ *
  24
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  25
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  26
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  27
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  28
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  29
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  30
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  31
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  32
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  33
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  34
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  35
+ * POSSIBILITY OF SUCH DAMAGE.
  36
+ *
  37
+ * @category   PHP
  38
+ * @package    CodeCoverage
  39
+ * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
  40
+ * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
  41
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  42
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
  43
+ * @since      File available since Release 1.2.1
  44
+ */
  45
+
  46
+/**
  47
+ * 
  48
+ *
  49
+ * @category   PHP
  50
+ * @package    CodeCoverage
  51
+ * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
  52
+ * @copyright  2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
  53
+ * @license    http://www.opensource.org/licenses/BSD-3-Clause  The BSD 3-Clause License
  54
+ * @link       http://github.com/sebastianbergmann/php-code-coverage
  55
+ * @since      Class available since Release 1.2.1
  56
+ */
  57
+class PHP_CodeCoverage_Version
  58
+{
  59
+    const VERSION = '1.3';
  60
+    protected static $version;
  61
+
  62
+    /**
  63
+     * Returns the version of PHP_CodeCoverage.
  64
+     *
  65
+     * @return string
  66
+     */
  67
+    public static function id()
  68
+    {
  69
+        if (self::$version === NULL) {
  70
+            self::$version = self::VERSION;
  71
+
  72
+            if (is_dir(dirname(dirname(__DIR__)) . '/.git')) {
  73
+                $dir = getcwd();
  74
+                chdir(__DIR__);
  75
+                $version = exec('git describe --tags');
  76
+                chdir($dir);
  77
+
  78
+                if ($version) {
  79
+                    if (count(explode('.', self::VERSION)) == 3) {
  80
+                        self::$version = $version;
  81
+                    } else {
  82
+                        $version = explode('-', $version);
  83
+
  84
+                        self::$version = self::VERSION . '-' . $version[2];
  85
+                    }
  86
+                }
  87
+            }
  88
+        }
  89
+
  90
+        return self::$version;
  91
+    }
  92
+}
3  composer.json
@@ -24,8 +24,7 @@
24 24
         "php": ">=5.4.7",
25 25
         "phpunit/php-file-iterator": ">=1.3.0",
26 26
         "phpunit/php-token-stream": ">=1.1.3",
27  
-        "phpunit/php-text-template": ">=1.1.1",
28  
-        "sebastian/version": ">=1.0.0"
  27
+        "phpunit/php-text-template": ">=1.1.1"
29 28
     },
30 29
     "suggest": {
31 30
         "ext-dom": "*",
6  package.xml
@@ -92,6 +92,7 @@
92 92
      <file baseinstalldir="/" name="Exception.php" role="php" />
93 93
      <file baseinstalldir="/" name="Filter.php" role="php" />
94 94
      <file baseinstalldir="/" name="Util.php" role="php" />
  95
+     <file baseinstalldir="/" name="Version.php" role="php" />
95 96
     </dir>
96 97
     <file baseinstalldir="/" name="CodeCoverage.php" role="php" />
97 98
    </dir>
@@ -122,11 +123,6 @@
122 123
     <channel>pear.phpunit.de</channel>
123 124
     <min>1.1.1</min>
124 125
    </package>
125  
-   <package>
126  
-    <name>Version</name>
127  
-    <channel>pear.phpunit.de</channel>
128  
-    <min>1.0.0</min>
129  
-   </package>
130 126
   </required>
131 127
   <optional>
132 128
    <extension>

0 notes on commit f5f2314

Please sign in to comment.
Something went wrong with that request. Please try again.