Merge fork into main branch

.coveralls.yml

@@ -0,0 +1,3 @@
+service_name: travis-ci
+coverage_clover: clover.xml
+json_path: coveralls.json

.gitignore

@@ -1,6 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 /vendor/
-/test/env.yml
+/tests/env.yml
 /phpunit.xml
 /composer.lock
 /.php_cs.cache
+/.idea/

.travis.yml

@@ -4,12 +4,30 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
+  - nightly
 
-sudo: false
+matrix:
+  allow_failures:
+  - php: nightly
+
+env:
+  - COMPOSER_OPTS=""
+  - COMPOSER_OPTS="--prefer-lowest"
 
 install:
-  - travis_retry composer install --no-interaction --prefer-source
+  - composer self-update --snapshot
+  - composer update $COMPOSER_OPTS
 
 script:
-  - cp test/env.yml.dist test/env.yml
-  - vendor/bin/phpunit --verbose --coverage-text
+  - vendor/bin/phpunit --coverage-clover=clover.xml
+  - tests/lint.sh
+
+after_success:
+  - vendor/bin/coveralls
+
+git:
+  depth: 5
+
+dist: trusty
+sudo: false

CREDITS.md

@@ -0,0 +1,5 @@
+This api is highly inspired by the excellent Github project 
+
+[KnpLabs/php-github-api](https://github.com/KnpLabs/php-github-api)
+
+[duncan3dc/sonos](https://github.com/duncan3dc/sonos)

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Thomas Park
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,9 +1,8 @@
 # Yamaha MusicCast API PHP Library
 
-A simple wrapper for the Yamaha MusicCast API.
-Not all call's have been implemented yet so pull requests are welcome!
+A php library for interacting with Yamaha MusicCast speakers.
 
-[![Build Status](https://travis-ci.org/samvdb/php-musiccast-api.svg?branch=master)](https://travis-ci.org/samvdb/php-musiccast-api)
+[![Build Status](https://travis-ci.org/grandDam/php-musiccast-api.svg?branch=master)](https://travis-ci.org/grandDam/php-musiccast-api)
 
 Based on the API specification found at [https://jayvee.com.au/downloads/commands/yamaha/YXC_API_Spec_Basic.pdf](https://jayvee.com.au/downloads/commands/yamaha/YXC_API_Spec_Basic.pdf)
 
@@ -25,27 +24,24 @@ $ curl -s http://getcomposer.org/installer | php
 
 Via composer
 ```bash
-$ composer require samvdb/php-musiccast-api php-http/guzzle6-adapter
+$ composer require granddam/php-musiccast-api php-http/guzzle6-adapter
 ```
 
 You can install any adapter you want but guzzle is probably fine for what you want to do.
 
-## Creating a client
+## Examples
+Start all groups playing music
 
 ```php
-$yamaha = new MusicCast\Client([
-    'host' => 'localhost',
-    'port' => 80, // default value
-]);
-```
-
-## Using the API
-
-
-```php
-$result = $yamaha->api('zone')->status('main');
-print_r($result);
-
+require 'vendor/autoload.php';
+
+$musicCast = new MusicCast\Network();
+$controllers = $musicCast->getControllers();
+foreach ($controllers as $controller) {
+    echo $controller->getGroup() + "\n";
+    echo "\tState: " . $controller->getStateName() . "\n";
+    $controller->play();
+}
 ```
 
 ## Enabling events
@@ -89,11 +85,6 @@ while(true) {
 $ composer test
 ```
 
-## Credits
-
-This api is highly inspired by the excellent Github api client made by KnpLabs!
-
-[KnpLabs/php-github-api](https://github.com/KnpLabs/php-github-api)
 
 
 

composer.json

@@ -1,46 +1,65 @@
 {
-    "name": "samvdb/php-musiccast-api",
-    "description": "PHP Wrapper for Yamaha MusicCast API",
-    "type": "library",
-    "keywords": ["yamaha", "musiccast", "api"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Sam Van der Borght",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": "^5.5 || ^7.0",
-        "psr/http-message": "^1.0",
-        "psr/cache": "^1.0",
-        "php-http/httplug": "^1.1",
-        "php-http/discovery": "^1.0",
-        "php-http/client-implementation": "^1.0",
-        "php-http/client-common": "^1.3",
-        "php-http/cache-plugin": "^1.2",
-        "symfony/yaml": "^3.2",
-        "myclabs/php-enum": "^1.5"
+  "name": "granddam/php-musiccast-api",
+  "description": "A PHP library for interacting with Yamaha MusicCast speakers",
+  "type": "library",
+  "keywords": [
+    "yamaha",
+    "musiccast",
+    "api",
+    "client"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Sam Van der Borght",
+      "email": "[email protected]"
     },
-    "require-dev": {
-        "squizlabs/php_codesniffer": "^2.7",
-        "phpunit/phpunit": "^4.0 || ^5.5",
-        "phpunit/php-code-coverage": "^4",
-        "php-http/guzzle6-adapter": "^1.0",
-        "guzzlehttp/psr7": "^1.2",
-        "phpro/grumphp": "^0.11.1",
-        "nikic/php-parser": "^3.0",
-        "friendsofphp/php-cs-fixer": "^2.0"
-    },
-    "autoload": {
-        "psr-4": { "MusicCast\\": "lib/MusicCast/" }
-    },
-    "scripts": {
-        "test": "vendor/bin/phpunit"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
+    {
+      "name": "Damien SUROT",
+      "email": "[email protected]"
+    }
+  ],
+  "require": {
+    "php": "^5.6 || ^7.0",
+    "psr/http-message": "^1.0",
+    "psr/cache": "^1.0",
+    "php-http/httplug": "^1.1",
+    "php-http/discovery": "^1.0",
+    "php-http/client-implementation": "^1.0",
+    "php-http/client-common": "^1.3",
+    "php-http/cache-plugin": "^1.2",
+    "symfony/yaml": "^3.2",
+    "myclabs/php-enum": "^1.5",
+    "cache/doctrine-adapter": "^1.0",
+    "doctrine/cache": "^1.4"
+  },
+  "require-dev": {
+    "squizlabs/php_codesniffer": "^2.7",
+    "mockery/mockery": "^0.9.4",
+    "phpunit/phpunit": "^5.7.14",
+    "phpunit/php-code-coverage": "^4",
+    "php-http/guzzle6-adapter": "^1.0",
+    "guzzlehttp/psr7": "^1.2",
+    "phpro/grumphp": "^0.11.1",
+    "nikic/php-parser": "^3.0",
+    "friendsofphp/php-cs-fixer": "^2.0",
+    "satooshi/php-coveralls": "^1.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "MusicCast\\": "src/",
+      "MusicCastTests\\": "tests/"
+    }
+  },
+  "scripts": {
+    "test": "vendor/bin/phpunit"
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "1.0-dev"
     }
+  },
+  "conflict": {
+    "php-http/message-factory": "< 1.0.2"
+  }
 }

grumphp.yml

@@ -10,15 +10,14 @@ parameters:
             standard: PSR2
             ignore_patterns:
               - "spec/*Spec.php"
-              - "test/*.php"
+              - "tests/*.php"
             metadata:
               priority: 300
         phpcsfixer: ~
         phpcsfixer2: ~
         phpparser:
             visitors:
                 no_exit_statements: ~
-                never_use_else: ~
                 forbidden_function_calls:
                     blacklist: [var_dump]
         phpunit: