Making the world a better place, one singleton at a time.

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -121,13 +121,6 @@ class PHP_CodeCoverage
      */
     protected $isTokenStreamTestSuite = FALSE;
 
-    /**
-     * Default PHP_CodeCoverage object.
-     *
-     * @var PHP_CodeCoverage
-     */
-    protected static $instance;
-
     /**
      * Constructor.
      *
@@ -142,7 +135,7 @@ public function __construct(PHP_CodeCoverage_Driver $driver = NULL, PHP_CodeCove
         }
 
         if ($filter === NULL) {
-            $filter = PHP_CodeCoverage_Filter::getInstance();
+            $filter = new PHP_CodeCoverage_Filter;
         }
 
         $this->driver = $driver;
@@ -167,21 +160,6 @@ public function __construct(PHP_CodeCoverage_Driver $driver = NULL, PHP_CodeCove
         // @codeCoverageIgnoreEnd
     }
 
-    /**
-     * Returns the default instance.
-     *
-     * @return PHP_CodeCoverage
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === NULL) {
-            // @codeCoverageIgnoreStart
-            self::$instance = new PHP_CodeCoverage;
-        }
-        // @codeCoverageIgnoreEnd
-        return self::$instance;
-    }
-
     /**
      * Clears collected code coverage data.
      */

PHP/CodeCoverage/Filter.php

@@ -71,29 +71,6 @@ class PHP_CodeCoverage_Filter
      */
     protected $whitelistedFiles = array();
 
-    /**
-     * Default PHP_CodeCoverage object.
-     *
-     * @var PHP_CodeCoverage
-     */
-    protected static $instance;
-
-    /**
-     * Returns the default instance.
-     *
-     * @return PHP_CodeCoverage_Filter
-     */
-    public static function getInstance()
-    {
-        if (self::$instance === NULL) {
-            // @codeCoverageIgnoreStart
-            self::$instance = new PHP_CodeCoverage_Filter;
-        }
-        // @codeCoverageIgnoreEnd
-
-        return self::$instance;
-    }
-
     /**
      * Adds a directory to the blacklist (recursively).
      *

Tests/PHP/CodeCoverage/FilterTest.php

@@ -108,15 +108,6 @@ protected function setUp()
         );
     }
 
-    /**
-     * @covers PHP_CodeCoverage_Filter::getInstance
-     */
-    public function testFactory()
-    {
-        $filter = PHP_CodeCoverage_Filter::getInstance();
-        $this->assertSame($filter, PHP_CodeCoverage_Filter::getInstance());
-    }
-
     /**
      * @covers PHP_CodeCoverage_Filter::addFileToBlacklist
      * @covers PHP_CodeCoverage_Filter::getBlacklist

Tests/PHP/CodeCoverageTest.php

@@ -105,15 +105,6 @@ public function testConstructor2()
         $this->assertSame($filter, $coverage->filter());
     }
 
-    /**
-     * @covers PHP_CodeCoverage::getInstance
-     */
-    public function testFactory()
-    {
-        $coverage = PHP_CodeCoverage::getInstance();
-        $this->assertSame($coverage, PHP_CodeCoverage::getInstance());
-    }
-
     /**
      * @covers            PHP_CodeCoverage::start
      * @expectedException InvalidArgumentException