Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use SebastianBergmann\Version

  • Loading branch information...
commit ca756f08ecde94bcc6610af31690d15fb00df9f9 1 parent 29f398e
@sebastianbergmann authored
View
4 PHP/CodeCoverage/Autoload.php
@@ -46,6 +46,7 @@
require_once 'File/Iterator/Autoload.php';
require_once 'PHP/Token/Stream/Autoload.php';
require_once 'Text/Template/Autoload.php';
+require_once 'SebastianBergmann/Version/autoload.php';
spl_autoload_register(
function ($class)
@@ -76,8 +77,7 @@ function ($class)
'php_codecoverage_report_php' => '/CodeCoverage/Report/PHP.php',
'php_codecoverage_report_text' => '/CodeCoverage/Report/Text.php',
'php_codecoverage_util' => '/CodeCoverage/Util.php',
- 'php_codecoverage_util_invalidargumenthelper' => '/CodeCoverage/Util/InvalidArgumentHelper.php',
- 'php_codecoverage_version' => '/CodeCoverage/Version.php'
+ 'php_codecoverage_util_invalidargumenthelper' => '/CodeCoverage/Util/InvalidArgumentHelper.php'
);
$path = dirname(dirname(__FILE__));
View
1  PHP/CodeCoverage/Autoload.php.in
@@ -46,6 +46,7 @@
require_once 'File/Iterator/Autoload.php';
require_once 'PHP/Token/Stream/Autoload.php';
require_once 'Text/Template/Autoload.php';
+require_once 'SebastianBergmann/Version/autoload.php';
spl_autoload_register(
function ($class)
View
10 PHP/CodeCoverage/Report/HTML/Renderer.php
@@ -87,6 +87,11 @@
protected $highLowerBound;
/**
+ * @var string
+ */
+ protected $version;
+
+ /**
* Constructor.
*
* @param string $templatePath
@@ -98,12 +103,15 @@
*/
public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound)
{
+ $version = new SebastianBergmann\Version;
+
$this->templatePath = $templatePath;
$this->charset = $charset;
$this->generator = $generator;
$this->date = $date;
$this->lowUpperBound = $lowUpperBound;
$this->highLowerBound = $highLowerBound;
+ $this->version = $version->getVersion('1.3', __DIR__);
}
/**
@@ -194,7 +202,7 @@ protected function setCommonTemplateVariables(Text_Template $template, PHP_CodeC
'breadcrumbs' => $this->getBreadcrumbs($node),
'charset' => $this->charset,
'date' => $this->date,
- 'version' => PHP_CodeCoverage_Version::id(),
+ 'version' => $this->version,
'php_version' => PHP_VERSION,
'generator' => $this->generator,
'low_upper_bound' => $this->lowUpperBound,
View
92 PHP/CodeCoverage/Version.php
@@ -1,92 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2012, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * * Neither the name of Sebastian Bergmann nor the names of his
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category PHP
- * @package CodeCoverage
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
- * @link http://github.com/sebastianbergmann/php-code-coverage
- * @since File available since Release 1.2.1
- */
-
-/**
- *
- *
- * @category PHP
- * @package CodeCoverage
- * @author Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2012 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
- * @link http://github.com/sebastianbergmann/php-code-coverage
- * @since Class available since Release 1.2.1
- */
-class PHP_CodeCoverage_Version
-{
- const VERSION = '1.3';
- protected static $version;
-
- /**
- * Returns the version of PHP_CodeCoverage.
- *
- * @return string
- */
- public static function id()
- {
- if (self::$version === NULL) {
- self::$version = self::VERSION;
-
- if (is_dir(dirname(dirname(__DIR__)) . '/.git')) {
- $dir = getcwd();
- chdir(__DIR__);
- $version = exec('git describe --tags');
- chdir($dir);
-
- if ($version) {
- if (count(explode('.', self::VERSION)) == 3) {
- self::$version = $version;
- } else {
- $version = explode('-', $version);
-
- self::$version = self::VERSION . '-' . $version[2];
- }
- }
- }
- }
-
- return self::$version;
- }
-}
View
3  composer.json
@@ -24,7 +24,8 @@
"php": ">=5.4.7",
"phpunit/php-file-iterator": ">=1.3.0",
"phpunit/php-token-stream": ">=1.1.3",
- "phpunit/php-text-template": ">=1.1.1"
+ "phpunit/php-text-template": ">=1.1.1",
+ "sebastian/version": ">=1.0.0"
},
"suggest": {
"ext-dom": "*",
View
6 package.xml
@@ -92,7 +92,6 @@
<file baseinstalldir="/" name="Exception.php" role="php" />
<file baseinstalldir="/" name="Filter.php" role="php" />
<file baseinstalldir="/" name="Util.php" role="php" />
- <file baseinstalldir="/" name="Version.php" role="php" />
</dir>
<file baseinstalldir="/" name="CodeCoverage.php" role="php" />
</dir>
@@ -123,6 +122,11 @@
<channel>pear.phpunit.de</channel>
<min>1.1.1</min>
</package>
+ <package>
+ <name>Version</name>
+ <channel>pear.phpunit.de</channel>
+ <min>1.0.0</min>
+ </package>
</required>
<optional>
<extension>
Please sign in to comment.
Something went wrong with that request. Please try again.