Merge pull request #1 from jeremykendall/Saeven-develop

Saeven develop

Author: Saeven

.gitignore

@@ -1,8 +1,8 @@
 tags
-data/*.txt
 composer.lock
 vendor
 *.swp
 docs
 *~
 build
+.idea

.php_cs

@@ -9,8 +9,10 @@ $finder = \Symfony\CS\Finder\DefaultFinder::create()
 return \Symfony\CS\Config\Config::create()
     ->setUsingCache(true)
     ->fixers([
+        '-pre_increment',
         '-concat_without_spaces',
         'concat_with_spaces',
         'ordered_use',
+        'long_array_syntax',
     ])
     ->finder($finder);

.travis.yml

@@ -5,6 +5,7 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
 script: phpunit

bin/parse

@@ -23,13 +23,13 @@ try {
     $manager = new \Pdp\PublicSuffixListManager();
     $parser = new Pdp\Parser($manager->getList());
     $url = $parser->parseUrl($domain);
-    $suffixValid = ($parser->isSuffixValid((string) $url->host)) ? 'IS' : 'IS NOT';
+    $suffixValid = ($parser->isSuffixValid((string) $url->getHost())) ? 'IS' : 'IS NOT';
 
     print_r($url->toArray());
     echo sprintf('Host: %s', $url) . PHP_EOL;
     echo sprintf(
         "'%s' %s a valid public suffix.",
-        $url->host->publicSuffix,
+        $url->getHost()->getPublicSuffix(),
         $suffixValid
     ) . PHP_EOL;
 } catch (\Exception $e) {

build.xml

@@ -14,13 +14,13 @@
         <exec
             passthru="${passthru}"
             dir="${project.basedir}"
-            command="phpunit" />
+            command="./vendor/bin/phpunit" />
     </target>
 
     <target name="php-cs-fixer" description="PHP Codings Standards fixer">
         <exec
             passthru="${passthru}"
-            command="php-cs-fixer --verbose fix" />
+            command="./vendor/bin/php-cs-fixer fix --config-file=.php_cs --verbose" />
     </target>
 
     <target name="phpdoc" description="Generate API documentation">
@@ -39,6 +39,5 @@
         <phingCall target="clean" />
         <phingCall target="php-cs-fixer" />
         <phingCall target="phpunit" />
-        <phingCall target="phpdoc" />
     </target>
 </project>

composer.json

@@ -34,9 +34,11 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "mikey179/vfsStream": "~1.4",
-        "phpunit/phpunit": "~4.4",
-        "jeremykendall/debug-die": "0.0.1.*"
+        "mikey179/vfsStream": "~1.6",
+        "phpunit/phpunit": "~4.8",
+        "jeremykendall/debug-die": "0.0.1.*",
+        "phing/phing": "^2.13",
+        "fabpot/php-cs-fixer": "^1.11"
     },
     "autoload": {
         "psr-0": {