Merge pull request #16 from maxmind/greg/5.4-min

PHP 5.4 min. Run php-cs-fixer on code.

.gitignore

@@ -1,6 +1,7 @@
 _site
 .gh-pages
 .idea
+.php_cs.cache
 apigen.phar
 box.phar
 build

.php_cs

@@ -0,0 +1,33 @@
+<?php
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'combine_consecutive_unsets' => true,
+        'concat_space' => [ 'spacing' => 'one'],
+        'heredoc_to_nowdoc' => true,
+        'list_syntax' => ['syntax' => 'long'],
+        'no_extra_consecutive_blank_lines' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'],
+        'no_short_echo_tag' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_imports' => true,
+        'pre_increment' => false,
+        'php_unit_strict' => true,
+        'php_unit_test_class_requires_covers' => true,
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_no_alias_tag' => false,
+        'phpdoc_order' => true,
+        'semicolon_after_instruction' => true,
+        'strict_comparison' => true,
+        'strict_param' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+    )
+;

.travis.yml

@@ -15,7 +15,8 @@ before_install:
   - phpenv rehash
 script:
   - mkdir -p build/logs
-  - 'if [ "5.5" == $TRAVIS_PHP_VERSION ]; then ./vendor/bin/phpcs --standard=PSR2 src/; fi'
+  - if [[ $TRAVIS_PHP_VERSION = '7.1' ]]; then vendor/bin/php-cs-fixer fix --verbose --diff --dry-run --config=.php_cs; fi
+  - if [[ $TRAVIS_PHP_VERSION = '7.1' ]]; then vendor/bin/phpcs --standard=PSR2 src/; fi
   - ./vendor/bin/phpunit
 notifications:
   email:

CHANGELOG.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.4.0 (2017-XX-XX)
+------------------
+
+* PHP 5.4 is now required.
+
 0.3.1 (2016-08-10)
 ------------------
 

README.md

@@ -5,9 +5,8 @@ shared code between MaxMind's various web service APIs.
 
 ## Requirements  ##
 
-This code is tested on PHP 5.4 and greater. PHP 5.3 may work, but older
-versions of PHP are not supported. This library works and is tested with
-HHVM.
+The library requires PHP 5.4 or greater. This library works and is tested
+with HHVM.
 
 There are several other dependencies as defined in the `composer.json` file.
 
@@ -22,6 +21,6 @@ This API uses [Semantic Versioning](http://semver.org/).
 
 ## Copyright and License ##
 
-This software is Copyright (c) 2015 by MaxMind, Inc.
+This software is Copyright (c) 2015-2017 by MaxMind, Inc.
 
 This is free software, licensed under the Apache License, Version 2.0.

composer.json

@@ -12,14 +12,15 @@
     }
   ],
   "require": {
-    "php": ">=5.3",
+    "php": ">=5.4",
     "composer/ca-bundle": "^1.0.3",
     "ext-curl": "*",
     "ext-json": "*"
   },
   "require-dev": {
+    "friendsofphp/php-cs-fixer": "2.*",
     "phpunit/phpunit": "4.*",
-    "squizlabs/php_codesniffer": "2.*"
+    "squizlabs/php_codesniffer": "3.*"
   },
   "autoload": {
     "psr-4": {

src/Exception/AuthenticationException.php

@@ -3,7 +3,7 @@
 namespace MaxMind\Exception;
 
 /**
- * This class represents an error authenticating
+ * This class represents an error authenticating.
  */
 class AuthenticationException extends InvalidRequestException
 {

src/Exception/HttpException.php

@@ -8,15 +8,15 @@
 class HttpException extends WebServiceException
 {
     /**
-     * The URI queried
+     * The URI queried.
      */
     private $uri;
 
     /**
-     * @param string $message A message describing the error.
-     * @param int $httpStatus The HTTP status code of the response
-     * @param string $uri The URI used in the request.
-     * @param \Exception $previous The previous exception, if any.
+     * @param string     $message    a message describing the error
+     * @param int        $httpStatus the HTTP status code of the response
+     * @param string     $uri        the URI used in the request
+     * @param \Exception $previous   the previous exception, if any
      */
     public function __construct(
         $message,

src/Exception/InvalidRequestException.php

@@ -8,16 +8,16 @@
 class InvalidRequestException extends HttpException
 {
     /**
-     * The code returned by the MaxMind web service
+     * The code returned by the MaxMind web service.
      */
     private $error;
 
     /**
-     * @param string $message The exception message
-     * @param int $error The error code returned by the MaxMind web service
-     * @param int $httpStatus The HTTP status code of the response
-     * @param string $uri The URI queries
-     * @param \Exception $previous The previous exception, if any.
+     * @param string     $message    the exception message
+     * @param int        $error      the error code returned by the MaxMind web service
+     * @param int        $httpStatus the HTTP status code of the response
+     * @param string     $uri        the URI queries
+     * @param \Exception $previous   the previous exception, if any
      */
     public function __construct(
         $message,