Merge pull request #1 from GawainLynch/master

Bolt 2 clean ups

Extension.php

@@ -1,39 +1,19 @@
 <?php
 // Testing Snippets extension for Bolt
 
-namespace TestSnippets;
+namespace Bolt\Extension\Bolt\TestSnippets;
 
 use Bolt\Extensions\Snippets\Location as SnippetLocation;
 
 class Extension extends \Bolt\BaseExtension
 {
-
-    function info() {
-
-        $data = array(
-            'name' =>"Snippets Tester",
-            'description' => "A developer extension to add snippets to all available locations in a sensible HTML document.",
-            'author' => "Bob den Otter",
-            'link' => "http://bolt.cm",
-            'version' => "1.1",
-            'required_bolt_version' => "1.0",
-            'highest_bolt_version' => "1.0",
-            'type' => "Twig function",
-            'first_releasedate' => "2012-10-10",
-            'latest_releasedate' => "2013-01-27",
-        );
-
-        return $data;
-
-    }
-
     public function getName()
     {
         return "Test Snippets";
     }
 
-    function initialize() {
-
+    public function initialize()
+    {
         $this->insertSnippet(SnippetLocation::START_OF_HEAD, 'callback', "startofhead");
         $this->insertSnippet(SnippetLocation::START_OF_HEAD, "<!-- inserted string snippet startofhead -->");
 
@@ -68,9 +48,8 @@ function initialize() {
         $this->insertSnippet(SnippetLocation::AFTER_HTML, "<!-- inserted string snippet afterhtml -->");
     }
 
-
-    function callback($var) {
-
+    public function callback($var)
+    {
         $html = "<!-- snippet inserted via callback with parameter '$var'.. -->";
 
         return new \Twig_Markup($html, 'UTF-8');

composer.json

@@ -1,6 +1,6 @@
 {
-    "name": "bolt/TestSnippets",
-    "description": "",
+    "name": "bolt/testsnippets",
+    "description": "A developer extension to add snippets to all available locations in a sensible HTML document.",
     "type": "bolt-extension",
     "keywords": [],
     "require": {
@@ -18,12 +18,7 @@
             "init.php"
         ],
         "psr-4": {
-            "TestSnippets\\": ""
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.7.*"
+            "Bolt\\Extension\\Bolt\\TestSnippets\\": ""
         }
     }
 }

init.php

@@ -1,5 +1,5 @@
 <?php
 
-use TestSnippets\Extension;
+use Bolt\Extension\Bolt\TestSnippets\Extension;
 
 $app['extensions']->register(new Extension($app));