Merge pull request #57 from eux/master

issue #28 license substitution in files

app/config/config_dev.yml

@@ -2,7 +2,7 @@ imports:
  - { resource: config.yml }
 
 services:
- stats_listener:
+ stats_persister:
  class: PUGX\StatsBundle\Service\NullPersister
 
 framework:

app/config/config_test.yml

@@ -1,21 +1,20 @@
 imports:
  - { resource: config_dev.yml }
 
-
-# for functional test
-parameters:
- image_creator.class: PUGX\BadgeBundle\Tests\Controller\FakeImageCreator
-services:
- statistic_listener:
- class: PUGX\BadgeBundle\Service\Statistic\NullPersister
-
 framework:
  test: ~
  session:
  storage_id: session.storage.mock_file
  profiler:
- enabled: false
+ enabled: true
 
 web_profiler:
  toolbar: false
  intercept_redirects: false
+
+# for functional test
+parameters:
+ image_creator.class: PUGX\BadgeBundle\Tests\Controller\FakeImageCreator
+services:
+ stats_persister:
+ class: PUGX\StatsBundle\Service\NullPersister

src/PUGX/BadgeBundle/Controller/BadgeController.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Controller/PageController.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/DependencyInjection/Configuration.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/DependencyInjection/PUGXBadgeExtension.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/PUGXBadgeBundle.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Package/ApiPackageInterface.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Package/Package.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Package/PackageInterface.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Service/ImageCreator.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Service/ImageCreatorInterface.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Service/PackageManager.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the badge-poser package.
+ *
+ * (c) PUGX <https://pugx.github.io/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace PUGX\BadgeBundle\Service;
 
 use Packagist\Api\Client;

src/PUGX/BadgeBundle/Tests/Controller/BadgeControllerTest.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,10 +12,13 @@
 namespace PUGX\BadgeBundle\Tests\Controller;
 
 use Packagist\Api\Client;
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use PUGX\StatsBundle\Test\StatsFunctionalTest;
+use PUGX\StatsBundle\Service\NullPersister;
 
-class BadgeControllerTest extends WebTestCase
+class BadgeControllerTest extends StatsFunctionalTest
 {
+ protected $packagistClient;
+
  // this setUp fake the request/response, if you comment this function the test'd run only with internet connection
  public function setUp()
  {
@@ -25,7 +29,6 @@ public function setUp()
 
  private function createPackagistClient($data, $status = 200)
  {
-
  $packagistResponse = new \Guzzle\Http\Message\Response($status);
  $packagistResponse->setBody($data);
  $plugin = new \Guzzle\Plugin\Mock\MockPlugin();
@@ -42,6 +45,8 @@ public function testDownloadsAction()
  static::$kernel->getContainer()->set('packagist_client', $this->packagistClient);
  $crawler = $client->request('GET', '/pugx/badge-poser/d/total.png');
  $this->assertTrue($client->getResponse()->isSuccessful());
+
+ $this->checkStatsCalls($client, 'pugx/badge-poser', 'downloadsAction');
  }
 
  public function testLatestStableAction()
@@ -51,6 +56,8 @@ public function testLatestStableAction()
  $crawler = $client->request('GET', '/pugx/badge-poser/version.png');
 
  $this->assertTrue($client->getResponse()->isSuccessful());
+
+ $this->checkStatsCalls($client, 'pugx/badge-poser', 'versionAction');
  }
 
  public function testLatestUnstableAction()
@@ -62,6 +69,8 @@ public function testLatestUnstableAction()
  $this->assertTrue($client->getResponse()->isSuccessful());
  $response = $client->getResponse();
  $this->assertRegExp('/s-maxage=3600/', $response->headers->get('Cache-Control'));
+
+ $this->checkStatsCalls($client, 'pugx/badge-poser', 'versionAction');
  }
 
  public function testIfPackageDoesntExist()

src/PUGX/BadgeBundle/Tests/Controller/FakeImageCreator.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Tests/Controller/PageControllerTest.php

@@ -1,23 +1,25 @@
 <?php
 
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 namespace PUGX\BadgeBundle\Tests\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use PUGX\StatsBundle\Test\StatsFunctionalTest;
 
-class PageControllerTest extends WebTestCase
+class PageControllerTest extends StatsFunctionalTest
 {
  public function testHomeAction()
  {
  $client = static::createClient();
+ $client->enableProfiler();
+
  $crawler = $client->request('GET', '/');
  $this->assertTrue($client->getResponse()->isSuccessful());
  $this->assertEquals(1, $crawler->filter('#container h1:contains("Badge Poser")')->count());
@@ -27,5 +29,8 @@ public function testHomeAction()
  $this->assertEquals(1, $crawler->filter('#container h4:contains("Monthly downloads")')->count());
  $this->assertEquals(1, $crawler->filter('#container h4:contains("Latest Stable Version")')->count());
  $this->assertEquals(1, $crawler->filter('#container h4:contains("Latest Unstable Version")')->count());
+
+ $this->checkStatsAreNotIncremented($client);
  }
+
 }

src/PUGX/BadgeBundle/Tests/Service/ImageCreatorTest.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/BadgeBundle/Tests/Service/PackageManagerTest.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/StatsBundle/DependencyInjection/Configuration.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the badge-poser package.
+ *
+ * (c) PUGX <https://pugx.github.io/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace PUGX\StatsBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;

src/PUGX/StatsBundle/DependencyInjection/PUGXStatsExtension.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the badge-poser package.
+ *
+ * (c) PUGX <https://pugx.github.io/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace PUGX\StatsBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/PUGX/StatsBundle/Listener/StatsListener.php

@@ -1,8 +1,9 @@
 <?php
+
 /*
- * This file is part of the badge-poser package
+ * This file is part of the badge-poser package.
  *
- * (c) Giulio De Donato <[email protected]>
+ * (c) PUGX <https://pugx.github.io/>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/PUGX/StatsBundle/PUGXStatsBundle.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the badge-poser package.
+ *
+ * (c) PUGX <https://pugx.github.io/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace PUGX\StatsBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;