瀏覽代碼

Refactor to camel-case names
Refactor to Twig_Test_Method

Andrew Tch 13 年之前
父節點
當前提交
8b28225fa0

+ 6 - 6
src/Packagist/WebBundle/Resources/views/Web/viewPackage.html.twig

@@ -81,7 +81,7 @@
                                             {% if version.require|length %}
                                                 <ul>
                                                     {%- for req in version.require -%}
-                                                        <li>{{ packagist.package_link(req.packageName) }}: {{ req.packageVersion }}</li>
+                                                        <li>{{ packagist.packageLink(req.packageName) }}: {{ req.packageVersion }}</li>
                                                     {%- endfor -%}
                                                 </ul>
                                             {% else %}
@@ -93,7 +93,7 @@
                                             {% if version.recommend|length %}
                                                 <ul>
                                                     {%- for req in version.recommend -%}
-                                                        <li>{{ packagist.package_link(req.packageName) }}: {{ req.packageVersion }}</li>
+                                                        <li>{{ packagist.packageLink(req.packageName) }}: {{ req.packageVersion }}</li>
                                                     {%- endfor -%}
                                                 </ul>
                                             {% else %}
@@ -105,7 +105,7 @@
                                             {% if version.suggest|length %}
                                                 <ul>
                                                     {%- for req in version.suggest -%}
-                                                        <li>{{ packagist.package_link(req.packageName) }}: {{ req.packageVersion }}</li>
+                                                        <li>{{ packagist.packageLink(req.packageName) }}: {{ req.packageVersion }}</li>
                                                     {%- endfor -%}
                                                 </ul>
                                             {% else %}
@@ -117,7 +117,7 @@
                                             {% if version.provide|length %}
                                                 <ul>
                                                     {%- for req in version.provide -%}
-                                                        <li>{{ packagist.package_link(req.packageName) }}: {{ req.packageVersion }}</li>
+                                                        <li>{{ packagist.packageLink(req.packageName) }}: {{ req.packageVersion }}</li>
                                                     {%- endfor -%}
                                                 </ul>
                                             {% else %}
@@ -129,7 +129,7 @@
                                             {% if version.conflict|length %}
                                                 <ul>
                                                     {%- for req in version.conflict -%}
-                                                        <li>{{ packagist.package_link(req.packageName) }}: {{ req.packageVersion }}</li>
+                                                        <li>{{ packagist.packageLink(req.packageName) }}: {{ req.packageVersion }}</li>
                                                     {%- endfor -%}
                                                 </ul>
                                             {% else %}
@@ -141,7 +141,7 @@
                                             {% if version.replace|length %}
                                                 <ul>
                                                     {%- for req in version.replace -%}
-                                                        <li>{{ packagist.package_link(req.packageName) }} {{ req.packageVersion }}</li>
+                                                        <li>{{ packagist.packageLink(req.packageName) }} {{ req.packageVersion }}</li>
                                                     {%- endfor -%}
                                                 </ul>
                                             {% else %}

+ 7 - 7
src/Packagist/WebBundle/Resources/views/macros.html.twig

@@ -15,15 +15,15 @@
     </ul>
 {% endmacro %}
 
-{% macro package_link(package_name) %}
-    
-    {% if not packagist_is_package_name(package_name) %}
-        {{ package_name }}
+{% macro packageLink(packageName) %}
+
+    {% if packageName is not packagistPackageName %}
+        {{ packageName }}
     {% else %}
-        {% if packagist_package_exists(package_name) %}
-            <a href="{{ path('view_package', { 'name': package_name }) }}">{{ package_name }}</a>
+        {% if packageName is existingPackagistPackage %}
+            <a href="{{ path('view_package', { 'name': packageName }) }}">{{ packageName }}</a>
         {% else %}
-            {{ package_name }}
+            {{ packageName }}
         {% endif %}
     {% endif %}
 

+ 11 - 11
src/Packagist/WebBundle/Twig/PackagistExtension.php

@@ -10,33 +10,33 @@ class PackagistExtension extends \Twig_Extension
      * @var ContainerInterface
      */
     private $container;
-    
+
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
     }
-    
-    public function getFunctions()
+
+    public function getTests()
     {
-        return array('packagist_package_exists' => new \Twig_Function_Method($this, 'getPackageExists'),
-            'packagist_is_package_name' => new \Twig_Function_Method($this, 'validatePackageName'));
+        return array('packagistPackageName' => new \Twig_Test_Method($this, 'validPackageNameTest'),
+            'existingPackagistPackage' => new \Twig_Test_Method($this, 'packageExistsTest'));
     }
-    
+
     public function getName()
     {
         return 'packagist';
     }
-    
-    public function getPackageExists($package)
+
+    public function packageExistsTest($package)
     {
         $doctrine = $this->container->get('doctrine');
         /* @var $doctrine Symfony\Bundle\DoctrineBundle\Registry */
-        
+
         return $doctrine->getRepository('PackagistWebBundle:Package')
                 ->packageExists($package);
     }
-    
-    public function validatePackageName($package)
+
+    public function validPackageNameTest($package)
     {
         return preg_match('/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+/', $package);
     }