Merge pull request #2 from phillipsdata/update-namespace

Changed namespace from `minphp\Javascript` to `Minphp\Javascript`
phillipsdata · Dec 11, 2015 · 0f7baaf · 0f7baaf
2 parents 49adefa + 43cfaf3
commit 0f7baaf
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# minphp/Javascript
+# Minphp/Javascript
 
 [![Build Status](https://travis-ci.org/phillipsdata/minphp-javascript.svg?branch=master)](https://travis-ci.org/phillipsdata/minphp-javascript) [![Coverage Status](https://coveralls.io/repos/phillipsdata/minphp-javascript/badge.svg)](https://coveralls.io/r/phillipsdata/minphp-javascript)
 
@@ -9,7 +9,7 @@ Javascript Helper.
 Install via composer:
 
 ```sh
-composer require minphp/javascript:dev-master
+composer require minphp/javascript
 ```
 
 ## Basic Usage

diff --git a/composer.json b/composer.json
@@ -12,14 +12,17 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "minphp/html": "dev-master"
+        "minphp/html": "~1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "squizlabs/php_codesniffer": "~2.2",
         "satooshi/php-coveralls": "dev-master"
     },
     "autoload": {
-        "psr-4": {"minphp\\Javascript\\": "src"}
+        "psr-4": {"Minphp\\Javascript\\": "src"}
+    },
+    "autoload-dev": {
+        "psr-4": {"Minphp\\Javascript\\Tests\\": "tests"}
     }
 }
diff --git a/src/Javascript.php b/src/Javascript.php
@@ -1,7 +1,7 @@
 <?php
-namespace minphp\Javascript;
+namespace Minphp\Javascript;
 
-use minphp\Html\Html;
+use Minphp\Html\Html;
 
 /**
  * Javascript Helper, requires Html Helper
@@ -18,12 +18,12 @@ class Javascript extends Html
      * @var array An array of inline javascript blocks
      */
     private $js_inline = array();
-    
+
     /**
      * @var string The default path to use for javascript files
      */
     private $default_path;
-    
+
     /**
      * Constructs a Javascript Helper
      *
@@ -33,7 +33,7 @@ public function __construct($default_path = null)
     {
         $this->setDefaultPath($default_path);
     }
-    
+
     /**
      * Sets the default path to use for all javascript requests
      *
@@ -46,7 +46,7 @@ public function setDefaultPath($default_path)
         $this->default_path = $default_path;
         return $temp;
     }
-    
+
     /**
      * Return the HTML used to create the script tags and load the set javascript
      *
@@ -71,7 +71,7 @@ public function getFiles($location)
         }
         return $html;
     }
-    
+
     /**
      * Return the HTML used to create the inline javascript
      *
@@ -80,9 +80,9 @@ public function getFiles($location)
     public function getInline()
     {
         $html = "";
-        
+
         $num_docs = count($this->js_inline);
-        
+
         for ($i=0; $i<$num_docs; $i++) {
             $html .= $this->addCondition(
                 sprintf('<script type="text/javascript">%s</script>', $this->js_inline[$i]['data']),
@@ -92,7 +92,7 @@ public function getInline()
         }
         return $html;
     }
-    
+
     /**
      * Sets the given javascript file into the structure view
      *
@@ -106,16 +106,16 @@ public function setFile($file, $location = "head", $path = null, $condition = nu
         if ($path == null) {
             $path = $this->default_path;
         }
-        
+
         $this->js_files[$location][] = array(
             'file' => $path . $file,
             'condition' => $condition,
             'hidden' => $hidden
         );
-        
+
         return $this;
     }
-    
+
     /**
      * Sets the given javascript data to be appended to the list of javascript data.
      *
@@ -129,10 +129,10 @@ public function setInline($data, $condition = null, $hidden = true)
             'condition' => $condition,
             'hidden' => $hidden
         );
-        
+
         return $this;
     }
-    
+
     /**
      * Unset all files that are currently set
      *
@@ -141,10 +141,10 @@ public function setInline($data, $condition = null, $hidden = true)
     public function unsetFiles()
     {
         $this->js_files = array();
-        
+
         return $this;
     }
-    
+
     /**
      * Unset all inline data that is currently set
      *
@@ -153,7 +153,7 @@ public function unsetFiles()
     public function unsetInline()
     {
         $this->js_inline = array();
-        
+
         return $this;
     }
 }
diff --git a/tests/JavascriptTest.php b/tests/JavascriptTest.php
@@ -1,29 +1,30 @@
 <?php
-namespace minphp\Javascript;
+namespace Minphp\Javascript\Tests;
 
-use \PHPUnit_Framework_TestCase;
+use PHPUnit_Framework_TestCase;
+use Minphp\Javascript\Javascript;
 
 /**
- * @coversDefaultClass \minphp\Javascript\Javascript
+ * @coversDefaultClass \Minphp\Javascript\Javascript
  */
 class JavascriptTest extends PHPUnit_Framework_TestCase
 {
     private $javascript;
-    
+
     public function setUp()
     {
         $this->javascript = new Javascript();
     }
-    
+
     /**
      * @covers ::__construct
-     * @uses \minphp\Javascript\Javascript::setDefaultPath
+     * @uses \Minphp\Javascript\Javascript::setDefaultPath
      */
     public function testConstruct()
     {
-        $this->assertInstanceOf('\minphp\Javascript\Javascript', new Javascript('path/to/js'));
+        $this->assertInstanceOf('\Minphp\Javascript\Javascript', new Javascript('path/to/js'));
     }
-    
+
     /**
      * @covers ::setDefaultPath
      */
@@ -33,56 +34,56 @@ public function testDefaultPath()
         $this->assertNull($this->javascript->setDefaultPath($new_path));
         $this->assertEquals($new_path, $this->javascript->setDefaultPath($new_path));
     }
-    
+
     /**
      * @covers ::setFile
      * @covers ::getFiles
      */
     public function testSetFile()
     {
         $this->assertInstanceOf(
-            '\minphp\Javascript\Javascript',
+            '\Minphp\Javascript\Javascript',
             $this->javascript->setFile('something.js', 'head')
         );
         $this->assertNotEmpty($this->javascript->getFiles('head'));
     }
-    
+
     /**
      * @covers ::setInline
      * @covers ::getInline
      */
     public function testSetInline()
     {
         $this->assertInstanceOf(
-            '\minphp\Javascript\Javascript',
+            '\Minphp\Javascript\Javascript',
             $this->javascript->setInline('var a = [];')
         );
         $this->assertNotEmpty($this->javascript->getInline());
     }
-    
+
     /**
      * @covers ::unsetFiles
-     * @uses \minphp\Javascript\Javascript::setFile
-     * @uses \minphp\Javascript\Javascript::getFiles
+     * @uses \Minphp\Javascript\Javascript::setFile
+     * @uses \Minphp\Javascript\Javascript::getFiles
      */
     public function testUnsetFiles()
     {
         $this->javascript->setFile('something.js', 'head');
         $this->assertNotEmpty($this->javascript->getFiles('head'));
-        $this->assertInstanceOf('\minphp\Javascript\Javascript', $this->javascript->unsetFiles());
+        $this->assertInstanceOf('\Minphp\Javascript\Javascript', $this->javascript->unsetFiles());
         $this->assertEmpty($this->javascript->getFiles('head'));
     }
-    
+
     /**
      * @covers ::unsetInline
-     * @uses \minphp\Javascript\Javascript::setInline
-     * @uses \minphp\Javascript\Javascript::getInline
+     * @uses \Minphp\Javascript\Javascript::setInline
+     * @uses \Minphp\Javascript\Javascript::getInline
      */
     public function testUnsetInline()
     {
         $this->javascript->setInline('var a = [];');
         $this->assertNotEmpty($this->javascript->getInline());
-        $this->assertInstanceOf('\minphp\Javascript\Javascript', $this->javascript->unsetInline());
+        $this->assertInstanceOf('\Minphp\Javascript\Javascript', $this->javascript->unsetInline());
         $this->assertEmpty($this->javascript->getInline());
     }
 }