formatting / mix fixes

src/Packagist/WebBundle/Entity/PackageRepository.php

@@ -27,9 +27,11 @@ class PackageRepository extends EntityRepository
     public function getPackageNames()
     {
         $names = false;
+        $apc = extension_loaded('apc');
+        
         //todo: move caching to some mature bundle, not apc
         //use container to set caching key and ttl
-        if (extension_loaded('apc')) {
+        if ($apc) {
             $names = apc_fetch('packagist_package_names');
         }
 
@@ -41,7 +43,7 @@ class PackageRepository extends EntityRepository
                             ->createQuery("SELECT p.name FROM Packagist\WebBundle\Entity\Package p")
                             ->getResult());
 
-            if (extension_loaded('apc')) {
+            if ($apc) {
                 apc_store('packagist_package_names', $names, 3600);
             }
         }

src/Packagist/WebBundle/Resources/config/services.yml

@@ -1,6 +1,6 @@
 services:
-  packagist.twig.extension:
-    class: Packagist\WebBundle\Twig\PackagistExtension
-    arguments: [ @doctrine ]
-    tags:
-      - { name: twig.extension }
+    packagist.twig.extension:
+        class: Packagist\WebBundle\Twig\PackagistExtension
+        arguments: [ @doctrine ]
+        tags:
+            - { name: twig.extension }

src/Packagist/WebBundle/Resources/views/macros.html.twig

@@ -17,14 +17,10 @@
 
 {% macro packageLink(packageName) %}
 
-    {% if packageName is not packagistPackageName %}
-        {{ packageName }}
+    {% if packageName is packagistPackageName and packageName is existingPackagistPackage %}
+        <a href="{{ path('view_package', { 'name': packageName }) }}">{{ packageName }}</a>
     {% else %}
-        {% if packageName is existingPackagistPackage %}
-            <a href="{{ path('view_package', { 'name': packageName }) }}">{{ packageName }}</a>
-        {% else %}
-            {{ packageName }}
-        {% endif %}
+        {{ packageName }}
     {% endif %}
 
 {% endmacro %}

src/Packagist/WebBundle/Twig/PackagistExtension.php

@@ -7,7 +7,7 @@ use Symfony\Bridge\Doctrine\RegistryInterface;
 class PackagistExtension extends \Twig_Extension
 {
     /**
-     * @var Symfony\Bridge\Doctrine\RegistryInterface
+     * @var \Symfony\Bridge\Doctrine\RegistryInterface
      */
     private $doctrine;
 
@@ -18,8 +18,10 @@ class PackagistExtension extends \Twig_Extension
 
     public function getTests()
     {
-        return array('packagistPackageName' => new \Twig_Test_Method($this, 'validPackageNameTest'),
-            'existingPackagistPackage' => new \Twig_Test_Method($this, 'packageExistsTest'));
+        return array(
+            'packagistPackageName' => new \Twig_Test_Method($this, 'validPackageNameTest'),
+            'existingPackagistPackage' => new \Twig_Test_Method($this, 'packageExistsTest')
+        );
     }
 
     public function getName()
@@ -30,11 +32,11 @@ class PackagistExtension extends \Twig_Extension
     public function packageExistsTest($package)
     {
         return $this->doctrine->getRepository('PackagistWebBundle:Package')
-                ->packageExists($package);
+            ->packageExists($package);
     }
 
     public function validPackageNameTest($package)
     {
         return preg_match('/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+/', $package);
     }
-}
+}