Re-add support for 7.1

Author: jstruzik

.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 
 language: php
 php:
+  - 7.1
   - 7.2
   - nightly
   - hhvm
@@ -14,7 +15,7 @@ matrix:
 
 before_install:
    - export ALLOW_FAILURE=1; if [ "$TRAVIS_PHP_VERSION" != "hhvm" ] && [ "$TRAVIS_PHP_VERSION" != "nightly" ]; then export ALLOW_FAILURE=0; fi
-   - pecl install mcrypt-1.0.2
+   - if [ "$TRAVIS_PHP_VERSION" == "7.2" ]; then yes '' | pecl install mcrypt-1.0.2; fi
 
 install:
   - composer self-update

README.md

@@ -19,7 +19,7 @@ secure version of a credential for storage (rather than storing passwords in "pl
 ## Requirements
 
 - 64-bit PHP runtime (NTLM negotiation bit flags extend beyond the 32-bit integer size)
-- PHP `>=7.2.0`
+- PHP `>=7.1.0`
 
 
 ## Installation

composer.json

@@ -16,7 +16,7 @@
         "source": "https://github.com/robinpowered/php-ntlm"
     },
     "require": {
-        "php-64bit": ">=7.2.0"
+        "php-64bit": ">=7.1.0"
     },
     "require-dev": {
         "ext-mcrypt": "*",

src/Robin/Ntlm/Crypt/Hasher/AbstractHasher.php

@@ -11,6 +11,7 @@
 namespace Robin\Ntlm\Crypt\Hasher;
 
 use HashContext;
+use InvalidArgumentException;
 
 /**
  * A cryptographic hasher implemented using PHP's built-in hashing mechanisms as
@@ -20,21 +21,45 @@
  */
 abstract class AbstractHasher implements HasherInterface
 {
+
+    /**
+     * Constants
+     */
+
+    /**
+     * The "resource" type of a PHP hash context.
+     *
+     * @type string
+     */
+
+    const HASH_CONTEXT_RESOURCE_TYPE = 'Hash Context';
+
+
+    /**
+     * Properties
+     */
+
     /**
      * The incremental hashing context.
      *
-     * @type HashContext
+     * @link http://php.net/manual/en/hash.resources.php
+     * @type resource|HashContext
      */
     private $context;
 
+
+    /**
+     * Methods
+     */
+
     /**
      * Constructor
      *
-     * @param HashContext $context The incremental hashing context.
+     * @param resource|HashContext $context The incremental hashing context.
      */
-    protected function __construct(HashContext $context)
+    protected function __construct($context)
     {
-        $this->context = $context;
+        $this->context = $this->validateHashContext($context);
     }
 
     /**
@@ -63,4 +88,25 @@ public function digest(): string
 
         return $digest;
     }
+
+    /**
+     * Validates a given incremental hashing context.
+     *
+     * @link http://php.net/manual/en/hash.resources.php
+     * @param mixed $context The context to validate.
+     * @return resource|HashContext The incremental hashing context.
+     * @throws InvalidArgumentException If the hash context isn't valid.
+     */
+    protected function validateHashContext($context)
+    {
+        if (!($context instanceof HashContext) && (false === $context
+            || !is_resource($context)
+            || (is_resource($context) && static::HASH_CONTEXT_RESOURCE_TYPE !== get_resource_type($context)))) {
+            throw new InvalidArgumentException(
+                'Unable to initialize hashing context. Your system might not support the supplied algorithm.'
+            );
+        }
+
+        return $context;
+    }
 }