Tidying

ICanBoogie · Oct 23, 2014 · 999a5fc · 999a5fc
1 parent 0b2000d
commit 999a5fc
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 16 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+.gitattributes export-ignore  
+.gitignore export-ignore
+.travis.yml export-ignore
+Makefile export-ignore
+phpunit.xml.dist export-ignore
+/tests export-ignore  
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 composer.lock
 composer.phar
 docs
-vendor
+vendor
+
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,9 @@ php:
 
 matrix:
   allow_failures:
-    - php: 5.6
     - php: hhvm
 
 before_script:
   - composer self-update
   - composer install --no-interaction --prefer-source --dev
+
diff --git a/LICENSE b/LICENSE
@@ -27,4 +27,5 @@ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/Makefile b/Makefile
@@ -1,15 +1,11 @@
-vendor: composer.phar
-	@php composer.phar install --prefer-source --dev
+vendor:
+	@composer install --prefer-source --dev
 
-composer.phar:
-	@echo "Installing composer..."
-	@curl -s https://getcomposer.org/installer | php
-
-update: vendor
-	@php composer.phar update --prefer-source --dev
+update:
+	@composer update --prefer-source --dev
 
 autoload: vendor
-	@php composer.phar dump-autoload
+	@composer dump-autoload
 
 test: vendor
 	@phpunit
@@ -28,4 +24,5 @@ clean:
 	@rm -fR docs
 	@rm -fR vendor
 	@rm -f composer.lock
-	@rm -f composer.phar
+	@rm -f composer.phar
+
diff --git a/README.md b/README.md
@@ -296,4 +296,5 @@ ICanBoogie/DateTime is licensed under the New BSD License - See the [LICENSE](ht
 
 [DateTime]: http://icanboogie.org/docs/class-ICanBoogie.DateTime.html
 [TimeZone]: http://icanboogie.org/docs/class-ICanBoogie.TimeZone.html)
-[TimeZoneLocation]: http://icanboogie.org/docs/class-ICanBoogie.TimeZoneLocation.html
+[TimeZoneLocation]: http://icanboogie.org/docs/class-ICanBoogie.TimeZoneLocation.html
+
diff --git a/composer.json b/composer.json
@@ -22,12 +22,13 @@
 		"php": ">=5.3.0"
 	},
 	"require-dev": {
-		"icanboogie/common": "*"
+		"icanboogie/common": "~1.2"
 	},
 	"suggest": {
 		"icanboogie/common": "Allows finer exceptions to be thrown"
 	},
 	"autoload": {
 		"classmap": [ "lib/" ]
 	}
-}
+}
+
diff --git a/lib/datetime.php → lib/DateTime.php b/lib/datetime.php → lib/DateTime.php
diff --git a/lib/timezone.php → lib/TimeZone.php b/lib/timezone.php → lib/TimeZone.php
diff --git a/lib/timezonelocation.php → lib/TimeZoneLocation.php b/lib/timezonelocation.php → lib/TimeZoneLocation.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,5 @@ @@
     composer.lock
     composer.phar
     docs
-    vendor
+    vendor