Merge pull request #6 from SpacePossum/1.0

maintenance

Author: SpacePossum

.gitattributes

@@ -0,0 +1,5 @@
+*       text=auto eol=lf
+*.php   text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php
+*.json  text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+*.test  text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
+*.yml   text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4

.php_cs.dist

@@ -16,17 +16,21 @@ return Symfony\CS\Config\Config::create()
     ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
     // and extra fixers:
     ->fixers(array(
+        'ereg_to_preg',
         'header_comment',
-        'long_array_syntax',
         'newline_after_open_tag',
+        'no_useless_return',
         'ordered_use',
+        'short_array_syntax',
+        'phpdoc_order',
         'php_unit_construct',
         'php_unit_strict',
-        'phpdoc_order',
         'strict',
         'strict_param',
-        '-psr0',
         '-empty_return',
+        '-phpdoc_short_description',
+        '-phpdoc_to_comment',
+        '-psr0',
     ))
     ->finder(
         Symfony\CS\Finder\DefaultFinder::create()

.travis.yml

@@ -1,14 +1,44 @@
 language: php
 
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7
-  - hhvm
+git:
+    depth: 1
+
+sudo: false
+
+matrix:
+    fast_finish: true
+    include:
+        - php: 5.4
+          env: MEMCACHED_PECL=memcached-1.0.2 COMPOSER_FLAGS="--prefer-stable --prefer-lowest"
+        - php: 5.5
+          env: MEMCACHED_PECL=memcached-2.0.1 COMPOSER_FLAGS="--prefer-stable"
+        - php: 5.6
+          env: MEMCACHED_PECL=memcached-2.1.0 COMPOSER_FLAGS="--prefer-stable"
+        - php: 7.0
+          env: MEMCACHED_PECL=memcached-2.2.0 COMPOSER_FLAGS="--prefer-stable"
+        - php: 7.1
+          env: MEMCACHED_PECL=memcached-2.2.0 COMPOSER_FLAGS="--dev"
+        - php: hhvm-3.9
+          sudo: required
+          dist: trusty
+          group: edge
+          env: COMPOSER_FLAGS="--prefer-stable"
+        - php: hhvm-nightly
+          sudo: required
+          dist: trusty
+          group: edge
+          env: COMPOSER_FLAGS="--dev"
+    allow_failures:
+        - php: 7.1
+        - php: hhvm-nightly
+
+before_install:
+    - if [[ ! $TRAVIS_PHP_VERSION = hhvm* ]]; then yes "" | pecl install -f "$MEMCACHED_PECL"; fi
 
 install:
-  - travis_retry composer install --no-interaction --prefer-source
+    - composer update $COMPOSER_FLAGS --no-interaction -v
+    - if [[ $TRAVIS_PHP_VERSION = 7.0 ]]; then curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v1.12.1/php-cs-fixer.phar -o php-cs-fixer.phar; fi
 
 script:
-  - phpunit --verbose
+    - phpunit --verbose
+    - if [[ $TRAVIS_PHP_VERSION = 7.0 ]]; then php php-cs-fixer.phar --dry-run -v --config-file=.php_cs.dist fix; fi

README.md

@@ -6,10 +6,11 @@ Memcache mock (http://memcached.org/) which mimics the [Memcached package](http:
 Its use is for test purposes for software that support interaction with Memcache using the Memcached package.
 It provides a way to perform tests without having an instance of Memcache running or even having the Memcached package available.
 The mock is written in PHP as class and is therefor not persistent beyond the execution of the script that creates it.
+Current mocking is based on PECL=memcached-2.1.0, support for later versions is currently being developed.
 
 ### Requirements
 
-PHP 5.4 for the Callable type hint.
+PHP 5.4 (PHP7 supported). Optional HHVM support >= 3.9.
 
 ### Install
 

composer.json

@@ -1,18 +1,18 @@
 {
-  "name": "gecko-packages/gecko-memcache-mock",
-  "type": "library",
-  "homepage": "https://github.com/GeckoPackages",
-  "description": "Memcache mock.",
-  "license": "MIT",
-  "keywords" : ["Memcache", "Memcached", "Mock", "Test"],
-  "require": {
-    "php": "^5.4 || ^7.0",
-    "psr/log": "~1.0",
-    "symfony/stopwatch" : "~2.5|~3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "GeckoPackages\\MemcacheMock\\": "src\\MemcacheMock"
+    "name": "gecko-packages/gecko-memcache-mock",
+    "type": "library",
+    "homepage": "https://github.com/GeckoPackages",
+    "description": "Memcache mock.",
+    "license": "MIT",
+    "keywords" : ["Memcache", "Memcached", "Mock", "Test"],
+    "require": {
+        "php": "^5.4 || ^7.0",
+        "psr/log": "~1.0",
+        "symfony/stopwatch" : "~2.5|~3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "GeckoPackages\\MemcacheMock\\": "src\\MemcacheMock"
+        }
     }
-  }
 }

phpunit.xml.dist

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./tests/autoload.php"
-        >
+        backupStaticAttributes="false"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+        syntaxCheck="false"
+        bootstrap="./tests/autoload.php"
+>
     <testsuites>
         <testsuite name="GeckoPackages Memcache Mock Test">
             <directory>./tests/MemcacheMock/Tests/</directory>

src/MemcacheMock/MemcachedLogger.php

@@ -74,6 +74,6 @@ public function stopMethod()
      */
     private function log($message, array $params = null)
     {
-        $this->logger->debug($message, null === $params ? array() : $params);
+        $this->logger->debug($message, null === $params ? [] : $params);
     }
 }