* #6 removed module provider interfaces

* updated dependencies and php version to 5.5 * removed unnecessary dev dependencies * updated copyright * optimized travis config and added php 7 check
sandrokeil · Aug 25, 2015 · 6565f38 · 6565f38
1 parent 373ea81
commit 6565f38
Show file tree

Hide file tree

Showing 101 changed files with 237 additions and 221 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
@@ -0,0 +1,4 @@
+# for php-coveralls
+service_name: travis-ci
+src_dir: lib
+coverage_clover: build/logs/clover*.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,23 +1,40 @@
+sudo: false
+
 language: php
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+    - vendor
+
 php:
-  - 5.3
-  - 5.4
   - 5.5
+    env:
+      - EXECUTE_CS_CHECK=true
   - 5.6
+    env:
+      - EXECUTE_COVERAGE=true
+  - 7.0
   - hhvm
 
 matrix:
   allow_failures:
     - php: hhvm
+    - php: 7.0
 
-before_script:
+before_install:
+  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - composer self-update
-  - composer install --dev --prefer-source
+  - if [[ $EXECUTE_COVERAGE == 'true' ]]; then composer require --no-update satooshi/php-coveralls:dev-master ; fi
+
+install:
+  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
+  - composer info -i
 
 script:
-  - ./vendor/bin/phpunit
-  - ./vendor/bin/phpcs --standard=PSR2 ./src/ ./test
+  - if [[ $EXECUTE_COVERAGE == 'true' ]]; then ./vendor/bin/phpunit ; fi
+  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then ./vendor/bin/phpunit --no-coverage ; fi
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs --standard=PSR2 ./src/ ./test ; fi
 
 after_script:
   - php vendor/bin/coveralls -v

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # BlockchainWalletApi CHANGELOG
 
+## Version 2.0.0 TBA
+
+* Uses module config cache now, removed module feature providers
+
 ## Version 1.0.0 - (2014-07-01)
 
 * Satoshi view helper which converts satoshi to other unit e.g. bitcoin

diff --git a/composer.json b/composer.json
@@ -1,49 +1,80 @@
 {
-    "name": "sandrokeil/blockchain-wallet-api",
-    "description": "Zend Framework 2 (ZF2) client library for blockchain wallet api. Configure request, call the service and access the response data via objects.",
-    "homepage": "https://github.com/sandrokeil/BlockchainWalletApi",
-    "license": "BSD-3-Clause",
-    "type": "library",
-    "keywords": [
-        "blockchain",
-        "bitcoin",
-        "zf2",
-        "blockchain wallet api",
-        "wallet",
-        "api",
-        "webservice",
-        "client",
-        "payment"
-    ],
-    "authors": [
-        {"name": "Sandro Keil", "homepage": "https://github.com/sandrokeil"}
-    ],
-    "autoload": {
-        "psr-4": {
-            "Sake\\BlockchainWalletApi\\": "src/",
-            "SakeTest\\BlockchainWalletApi\\": "test/"
-        }
-    },
-    "require": {
-        "php": "~5.3",
-        "zendframework/zend-servicemanager": "~2.2",
-        "zendframework/zend-stdlib": "~2.2",
-        "zendframework/zend-http": "~2.2",
-        "zendframework/zend-filter": "~2.2",
-        "sandrokeil/easy-config": "~1.0"
-    },
-    "require-dev": {
-        "zendframework/zend-test": "~2.2",
-        "zendframework/zend-config": "~2.2",
-        "zendframework/zend-form": "~2.2",
-        "zendframework/zend-serializer": "~2.2",
-        "zendframework/zend-log": "~2.2",
-        "zendframework/zend-modulemanager": "~2.2",
-        "zendframework/zend-view": "~2.2",
-        "sandrokeil/citools": "~1.0"
-    },
-    "suggest": {
-        "zendframework/zend-view": "Zend\\View to use satoshi view helper",
-        "zendframework/zend-modulemanager": "Zend\\ModuleManager to use default module configuration e.g. services"
+  "name": "sandrokeil/blockchain-wallet-api",
+  "description": "Zend Framework 2 (ZF2) client library for blockchain wallet api. Configure request, call the service and access the response data via objects.",
+  "homepage": "https://github.com/sandrokeil/BlockchainWalletApi",
+  "license": "BSD-3-Clause",
+  "type": "library",
+  "keywords": [
+    "blockchain",
+    "bitcoin",
+    "zf2",
+    "blockchain wallet api",
+    "wallet",
+    "api",
+    "webservice",
+    "client",
+    "payment"
+  ],
+  "authors": [
+    {
+      "name": "Sandro Keil",
+      "homepage": "https://sandro-keil.de"
     }
+  ],
+  "support": {
+    "issues": "https://github.com/sandrokeil/BlockchainWalletApi/issues",
+    "source": "https://github.com/sandrokeil/BlockchainWalletApi",
+    "docs": "https://github.com/sandrokeil/BlockchainWalletApi"
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://packages.zendframework.com/"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "Sake\\BlockchainWalletApi\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "SakeTest\\BlockchainWalletApi\\": "test/"
+    }
+  },
+  "require": {
+    "php": "~5.5",
+    "sandrokeil/easy-config": "~1.0",
+    "zendframework/zend-http": "~2.4",
+    "zendframework/zend-inputfilter": "~2.5",
+    "zendframework/zend-servicemanager": "~2.6",
+    "zendframework/zend-stdlib": "~2.5"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.8",
+    "sandrokeil/citools": "~2.0",
+    "sebastian/peek-and-poke": "1.0.x-dev",
+    "zendframework/zend-view": "~2.4"
+  },
+  "suggest": {
+    "zendframework/zend-view": "Zend\\View to use satoshi view helper",
+    "zendframework/zend-modulemanager": "Zend\\ModuleManager to use default module configuration e.g. services"
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "extra": {
+    "branch-alias": {
+      "dev-master": "2.0-dev",
+      "dev-develop": "2.1-dev"
+    }
+  },
+  "archive": {
+    "exclude": [
+      "test",
+      "phpunit.xml*",
+      ".travis.yml",
+      ".scrutinizer.yml",
+      ".coveralls.yml"
+    ]
+  }
 }
diff --git a/config/module.config.php b/config/module.config.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Sake
+ *
+ * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
+ * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
+ */
+
+return array(
+    'service_manager' => require __DIR__ . '/service_manager.config.php',
+    'view_helper' => require __DIR__ . '/view_helper.config.php',
+);
diff --git a/config/service_manager.config.php b/config/service_manager.config.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/config/view_helper.config.php b/config/view_helper.config.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,7 +2,6 @@
 <!-- disable strict to debug tests -->
 <phpunit bootstrap="./test/Bootstrap.php"
          colors="true"
-         strict="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Hydrator/AddressListStrategy.php b/src/Hydrator/AddressListStrategy.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Hydrator/AddressStrategy.php b/src/Hydrator/AddressStrategy.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Module.php b/src/Module.php
@@ -3,39 +3,24 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 
 namespace Sake\BlockchainWalletApi;
 
-use Zend\ModuleManager\Feature\ServiceProviderInterface;
-use Zend\ModuleManager\Feature\ViewHelperProviderInterface;
-
 /**
  * This class initializes the BlockchainWalletApi module.
  */
-class Module implements ServiceProviderInterface, ViewHelperProviderInterface
+class Module
 {
     /**
-     * Return service config
-     *
-     * @see ServiceProviderInterface::getServiceConfig()
-     * @return array
-     */
-    public function getServiceConfig()
-    {
-        return require dirname(__DIR__) . '/config/service_manager.config.php';
-    }
-
-    /**
-     * Expected to return \Zend\ServiceManager\Config object or array to
-     * seed such an object.
+     * Return module config e.g. service manager, view helper
      *
      * @return array
      */
-    public function getViewHelperConfig()
+    public function getConfig()
     {
-        return require dirname(__DIR__) . '/config/view_helper.config.php';
+        return require dirname(__DIR__) . '/config/module.config.php';
     }
 }
diff --git a/src/Request/AddressArchive.php b/src/Request/AddressArchive.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/AddressBalance.php b/src/Request/AddressBalance.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/AddressUnarchive.php b/src/Request/AddressUnarchive.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/AutoConsolidateAddresses.php b/src/Request/AutoConsolidateAddresses.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/ListAddresses.php b/src/Request/ListAddresses.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/NewAddress.php b/src/Request/NewAddress.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/Recipient.php b/src/Request/Recipient.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/RequestInterface.php b/src/Request/RequestInterface.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/Send.php b/src/Request/Send.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */
 

diff --git a/src/Request/SendMany.php b/src/Request/SendMany.php
@@ -3,7 +3,7 @@
  * Sake
  *
  * @link      http://github.com/sandrokeil/BlockchainWalletApi for the canonical source repository
- * @copyright Copyright (c) 2014 Sandro Keil
+ * @copyright Copyright (c) 2014 - 2015 Sandro Keil
  * @license   http://github.com/sandrokeil/BlockchainWalletApi/blob/master/LICENSE.txt New BSD License
  */