Merge pull request #2 from mimmi20/add-toarray

add toArray function

closes #1.

.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-ci
+json_path: coveralls-upload.json

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2

.gitattributes

@@ -1,18 +1,38 @@
-#Ensure every text file uses lf
-*.markdown text eol=lf diff
-*.md text eol=lf diff
-*.js text eol=lf diff
-*.json text eol=lf diff
-*.lock text eol=lf diff
-*.html text eol=lf diff
-*.php text eol=lf diff
-*.yml text eol=lf diff
-*.xml text eol=lf diff
-*.dist text eol=lf diff
-*.txt text eol=lf diff
-*.ini text eol=lf diff
-.gitattributes text eol=lf diff
-.gitignore text eol=lf diff
-.php_cs text eol=lf diff
+# text files
+*                text=auto
+*.markdown       text eol=lf diff whitespace=blank-at-eol,blank-at-eof
+*.md             text eol=lf diff whitespace=blank-at-eol,blank-at-eof
+*.js             text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+*.css            text eol=lf diff=css whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+*.json           text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+*.lock           text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+*.html           text eol=lf diff=html
+*.php            text eol=lf diff=php whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+*.yml            text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+*.yaml           text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+*.xml            text eol=lf diff
+*.dist           text eol=lf diff
+*.txt            text eol=lf diff
+*.ini            text eol=lf diff
+*.sh             text eol=lf diff
+*.tmp            text eol=lf diff
+LICENSE          text eol=lf diff
 
-*.zip binary
+# binary files
+*.zip            -text binary
+
+# files/folders to ignore
+/.*              export-ignore
+.coveralls.yml   export-ignore text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+.editorconfig    export-ignore text eol=lf diff
+.gitattributes   export-ignore text eol=lf diff
+.gitignore       export-ignore text eol=lf diff
+.php_cs          export-ignore text eol=lf diff=php whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+circle.yml       export-ignore text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+.scrutinizer.yml export-ignore text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+.travis.yml      export-ignore text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+appveyor.yml     export-ignore text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+circle.yml       export-ignore text eol=lf diff whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=2
+phpunit.xml      export-ignore text eol=lf diff
+/tests           export-ignore
+/cache           export-ignore

.gitignore

@@ -14,3 +14,4 @@ data/cache/
 error.log
 ergebnis.txt
 resources/browscap-*/
+cache/cache/

.travis.yml

@@ -2,31 +2,36 @@ language: php
 sudo: false
 
 php:
-  - 5.6
   - 7.0
+  - 7.1
   - nightly
-  - hhvm
 
 os:
   - linux
 
+env:
+  - PREFER_LOWEST="--prefer-lowest"
+  - PREFER_LOWEST=""
+
+matrix:
+  allow_failures:
+    - php: nightly
+    - env: PREFER_LOWEST="--prefer-lowest"
+
 before_script:
-  - if [ "`phpenv version-name`" != "hhvm" ]; then echo 'opcache.enable=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-  - if [ "`phpenv version-name`" != "hhvm" ]; then echo 'opcache.enable_cli=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-  - if [ "`phpenv version-name`" == "hhvm" ]; then echo 'opcache.enable=1' >> /etc/hhvm/php.ini; fi
-  - if [ "`phpenv version-name`" == "hhvm" ]; then echo 'opcache.enable_cli=1' >> /etc/hhvm/php.ini; fi
-  - composer self-update
-  - composer install -o --prefer-source
+  - echo 'opcache.enable=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - echo 'opcache.enable_cli=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - travis_retry composer self-update
+  - travis_retry composer update --optimize-autoloader --prefer-dist --prefer-stable --no-progress --no-interaction $PREFER_LOWEST
 
 script:
-  # xdebug is not installed on hhvm, so we are skipping the creation of code coverage data there
-  - if [ "`phpenv version-name`" == "5.6" ]; then vendor/bin/phpunit --colors --verbose --coverage-text --coverage-clover=coverage.clover; fi
-  - if [ "`phpenv version-name`" != "5.6" ]; then vendor/bin/phpunit --colors --verbose; fi
-  - vendor/bin/phpcs --standard=psr2 -np src tests
-  - vendor/bin/php-cs-fixer fix --dry-run -vv
+  - vendor/bin/phpunit --colors=auto --coverage-clover=coverage.clover
+  - php -n -d memory_limit=768M vendor/bin/phpcs
+  - php -n -d memory_limit=768M vendor/bin/php-cs-fixer fix --dry-run -vv
 
-after_script:
-# xdebug is not installed on hhvm, so we have no code coverage data to send
-  - if [ "`phpenv version-name`" == "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "`phpenv version-name`" == "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+after_success:
+  - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar
+  - php -n coveralls.phar --verbose --coverage_clover=coverage.clover
 
+notifications:
+  email: false

circle.yml

@@ -1,3 +1,14 @@
 machine:
   php:
-    version: 5.6.14
+    version: 7.0.4
+  timezone:
+    Europe/Berlin
+
+dependencies:
+  override:
+    - composer update --optimize-autoloader --prefer-dist --prefer-stable --no-interaction --no-progress
+
+test:
+  override:
+    - mkdir -p $CIRCLE_TEST_REPORTS/phpunit
+    - vendor/bin/phpunit --coverage-text --colors=auto --log-junit $CIRCLE_TEST_REPORTS/phpunit/junit.xml

composer.json

@@ -27,12 +27,16 @@
     "source": "https://github.com/mimmi20/ua-browser-type"
   },
   "require": {
-    "php": ">= 5.6.0"
+    "php": "^7.0 || ^7.1",
+    "psr/cache": "^1.0",
+    "mimmi20/browser-detector-loader-interface": "^1.0",
+    "mimmi20/browser-detector-factory-interface": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.4",
+    "phpunit/phpunit": "^5.7",
     "squizlabs/php_codesniffer": "^2.5",
-    "friendsofphp/php-cs-fixer": "^1.11"
+    "friendsofphp/php-cs-fixer": "^1.11",
+    "cache/cache": "dev-master"
   },
   "autoload": {
     "psr-4": {

data/types.json

@@ -0,0 +1,98 @@
+{
+  "application": {
+    "name": "Application",
+    "bot": false,
+    "reader": false,
+    "transcoder": false
+  },
+  "bot": {
+    "name": "Bot/Crawler",
+    "bot": true,
+    "reader": false,
+    "transcoder": false
+  },
+  "bot-syndication-reader": {
+    "name": "Bot/Crawler",
+    "bot": true,
+    "reader": true,
+    "transcoder": false
+  },
+  "bot-trancoder": {
+    "name": "Bot/Crawler",
+    "bot": true,
+    "reader": false,
+    "transcoder": true
+  },
+  "browser": {
+    "name": "Browser",
+    "bot": false,
+    "reader": false,
+    "transcoder": false
+  },
+  "email-client": {
+    "name": "Email Client",
+    "bot": false,
+    "reader": false,
+    "transcoder": false
+  },
+  "feed-reader": {
+    "name": "Feed Reader",
+    "bot": true,
+    "reader": false,
+    "transcoder": false
+  },
+  "multimedia-player": {
+    "name": "Multimedia Player",
+    "bot": true,
+    "reader": false,
+    "transcoder": false
+  },
+  "offline-browser": {
+    "name": "Offline Browser",
+    "bot": true,
+    "reader": false,
+    "transcoder": false
+  },
+  "pim": {
+    "name": "Personal Information Manager",
+    "bot": false,
+    "reader": false,
+    "transcoder": false
+  },
+  "tool": {
+    "name": "Tool",
+    "bot": true,
+    "reader": false,
+    "transcoder": false
+  },
+  "transcoder": {
+    "name": "Browser",
+    "bot": false,
+    "reader": false,
+    "transcoder": true
+  },
+  "unknown": {
+    "name": null,
+    "bot": false,
+    "reader": false,
+    "transcoder": null
+  },
+  "useragent-anonymizer": {
+    "name": "Useragent Anonymizer",
+    "bot": true,
+    "reader": false,
+    "transcoder": false
+  },
+  "validator": {
+    "name": "Validator",
+    "bot": true,
+    "reader": false,
+    "transcoder": false
+  },
+  "wap-browser": {
+    "name": "Wap Browser",
+    "bot": false,
+    "reader": false,
+    "transcoder": false
+  }
+}

phpcs.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+    <description>ua-browser-type</description>
+
+    <file>src</file>
+    <file>tests</file>
+
+    <exclude-pattern>*/temp/*</exclude-pattern>
+
+    <arg name="report" value="full" />
+    <arg value="np" />
+
+    <rule ref="PSR2" />
+</ruleset>

phpunit.xml

@@ -1,14 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="tests/Bootstrap.php">
-  <testsuites>
-    <testsuite name="UA-Browser-Type Test Suite">
-      <directory>tests/</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">src/</directory>
-    </whitelist>
-  </filter>
+
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/5.7/phpunit.xsd"
+        beStrictAboutCoversAnnotation="true"
+        beStrictAboutOutputDuringTests="true"
+        beStrictAboutTestsThatDoNotTestAnything="true"
+        beStrictAboutTodoAnnotatedTests="true"
+        forceCoversAnnotation="true"
+        verbose="true"
+        bootstrap="vendor/autoload.php"
+        >
+    <php>
+        <ini name="error_reporting" value="-1"/>
+        <ini name="memory_limit" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="UA-Browser-Type Test Suite">
+            <directory>tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src/</directory>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
+    </logging>
 </phpunit>