Merge pull request #1 from GawainLynch/master

Bolt 2 clean ups

Extension.php

@@ -1,32 +1,13 @@
 <?php
 // Google Analytics extension for Bolt
 
-namespace GoogleAnalytics;
+namespace Bolt\Extension\Bolt\GoogleAnalytics;
 
 use Bolt\Extensions\Snippets\Location as SnippetLocation;
 
 class Extension extends \Bolt\BaseExtension
 {
 
-    function info() {
-
-        $data = array(
-            'name' =>"Google Analytics",
-            'description' => "A small extension to add the scripting for a Google Analytics tracker to your site.",
-            'author' => "Bob den Otter",
-            'link' => "http://bolt.cm",
-            'version' => "0.1",
-            'required_bolt_version' => "1.0",
-            'highest_bolt_version' => "1.0",
-            'type' => "Snippet, Widget",
-            'first_releasedate' => "2012-10-10",
-            'latest_releasedate' => "2013-01-27",
-        );
-
-        return $data;
-
-    }
-
     public function getName()
     {
         return "Google Analytics";
@@ -44,7 +25,7 @@ function initialize() {
     }
 
 
-    function insertAnalytics()
+    public function insertAnalytics()
     {
 
         if (empty($this->config['webproperty'])) {
@@ -97,7 +78,7 @@ function insertAnalytics()
 
 
 
-    function analyticsWidget()
+    public function analyticsWidget()
     {
         // http://ga-dev-tools.appspot.com/explorer/
         // http://code.google.com/p/gapi-google-analytics-php-interface/
@@ -244,7 +225,7 @@ function analyticsWidget()
     }
 
 
-    function secondMinute($seconds) {
+    private function secondMinute($seconds) {
         return sprintf('%d:%02d', floor($seconds/60), $seconds % 60);
     }
 

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "bolt/GoogleAnalytics",
+    "name": "bolt/googleanalytics",
     "description": "",
     "type": "bolt-extension",
     "keywords": [],
@@ -18,12 +18,7 @@
             "init.php"
         ],
         "psr-4": {
-            "GoogleAnalytics\\": ""
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.7.*"
+            "Bolt\\Extension\\Bolt\\GoogleAnalytics\\": ""
         }
     }
 }

init.php

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