Provider class init now uses the FQCN instead of a string concatenati…

…on, update documentation updated as required. Whitelist added to the PHPUnit config since 4.8 upgrade.

README.md

@@ -57,15 +57,14 @@ echo sprintf('The METAR report for Stansted (EGSS) is: %s', $egss);
  * Alternatively, Flight simulation enthusiasts may wish to retrieve the current VATSIM reports,
  * this can be achieved by changing the default provider like so: 
  */
-$leib->setProvider('VATSIM');
+$leib->setProvider(Ballen\Metar\Providers\Vatsim::class);
 
 /**
-* Since version 2.0.1, users can now query the IVAO web service for METARs too by using the 'Ivao' provider method like so:
+* Since version 2.1.0, users can now query the IVAO web service for METARs too by using the 'IVAO' provider method like so:
 */
-$leib->setProvider('IVAO');
+$leib->setProvider(Ballen\Metar\Providers\Ivao::class);
 ```
 
-
 Tests and coverage
 ------------------
 
@@ -76,9 +75,8 @@ I use [TravisCI](https://travis-ci.org/) for continuous integration, which trigg
 If you wish to run the tests yourself you should run the following:
 
 ```shell
-# Install the Metar Library with the 'development' packages this then includes PHPUnit!
-composer install --dev
-
+# Install the Metar Library (which will include PHPUnit as part of the require-dev dependencies)
+composer install
 
 # Now we run the unit tests (from the root of the project) like so:
 ./vendor/bin/phpunit

composer.json

@@ -2,7 +2,7 @@
     "name": "ballen/metar",
     "description": "A PHP library to query aerodrome METAR information.",
     "type": "library",
-    "keywords": ["METAR", "weather", "api", "pilots", "flightsim", "ICAO"],
+    "keywords": ["METAR", "weather", "api", "pilots", "flightsim", "ICAO", "ivao", "noaa", "vatsim"],
     "license": "GPLv3",
     "authors": [
         {

lib/Metar.php

@@ -20,7 +20,7 @@ class Metar
     /**
      * Stores the default namespace for loading new METAR providers from.
      */
-    const SERVICES_NAMESPACE = 'Ballen\Metar\Providers';
+    const DEFAULT_PROVIDER = 'Ballen\Metar\Providers\Noaa';
 
     /**
      * Stores the requested airfield/port ICAO code.
@@ -54,7 +54,7 @@ public function __construct($icao)
         $this->validateIcao($this->icao);
 
         // Set a default provider, can be overrideen with 'setProvider()' function.
-        $this->setProvider('Noaa');
+        $this->setProvider();
     }
 
     /**
@@ -85,11 +85,11 @@ private function validateIcao($icao)
      * Changes the default 'NOAA' METAR service provider to another one eg. 'VATSIM'.
      * @param string $provider METAR Provider Class/File name.
      */
-    public function setProvider($provider = 'Noaa')
+    public function setProvider($provider = self::DEFAULT_PROVIDER)
     {
-        if (!class_exists(self::SERVICES_NAMESPACE . '\\' . $provider)) {
-            throw new \InvalidArgumentException('The service provider your specified does not exist in the namespace \'' . self::SERVICES_NAMESPACE . '\'');
+        if (!class_exists($provider)) {
+            throw new \InvalidArgumentException('The service provider your specified does not exist in the namespace \'' . $provider . '\'');
         }
-        $this->metarProvider = self::SERVICES_NAMESPACE . '\\' . $provider;
+        $this->metarProvider = $provider;
     }
 }

phpunit.xml

@@ -17,4 +17,9 @@
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./lib</directory>
+        </whitelist>
+    </filter>
 </phpunit>

tests/MetarHttpClientTest.php

@@ -34,14 +34,6 @@ class MetarHttpClientTest extends \PHPUnit_Framework_TestCase
      */
     private $handler;
 
-    /**
-     * Setup the testcase
-     */
-    public function setUp()
-    {
-
-    }
-
     /**
      * Test recieving a METAR report.
      */

tests/MetarTest.php

@@ -39,7 +39,7 @@ public function testSetInvalidIcao()
     public function testSetValidProvider()
     {
         $metar = new Metar('EGSS');
-        $metar->setProvider('Noaa');
+        $metar->setProvider(\Ballen\Metar\Providers\Noaa::class);
     }
 
     /**
@@ -48,7 +48,7 @@ public function testSetValidProvider()
     public function testSetInvalidProvider()
     {
         $metar = new Metar('EGSS');
-        $this->setExpectedException('InvalidArgumentException', 'The service provider your specified does not exist in the namespace \'' . Metar::SERVICES_NAMESPACE . '\'');
+        $this->setExpectedException('InvalidArgumentException', 'The service provider your specified does not exist in the namespace \'An_Invalid_Provider\'');
         $metar->setProvider('An_Invalid_Provider');
     }
 
@@ -68,18 +68,18 @@ public function testValidNoaaMetarResponse()
     public function testValidVatsimMetarResponse()
     {
         $metar = new Metar('EGSS');
-        $metar->setProvider('Vatsim');
+        $metar->setProvider(Ballen\Metar\Providers\Vatsim::class);
         $check_valid_metar = strpos($metar, 'EGSS');
         $this->assertEquals($check_valid_metar, 0);
     }
-    
+
     /**
      * Test requesting a METAR report using IVAO as the provider.
      */
     public function testValidIvaoMetarResponse()
     {
         $metar = new Metar('EGSS');
-        $metar->setProvider('IVAO');
+        $metar->setProvider(Ballen\Metar\Providers\Ivao::class);
         $check_valid_metar = strpos($metar, 'EGSS');
         $this->assertEquals($check_valid_metar, 0);
     }