Changeset 1717487

ing-psp/trunk/ing-php/LICENSE

-                      r1600658
+                      r1717487
+The MIT License (MIT)
+MIT License
 Copyright (c) 2015 Ginger Payments
+Copyright (c) 2017 ING Bank N.V.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 …
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

ing-psp/trunk/ing-php/composer.json

-                      r1654867
+                      r1717487
         "mathiasverraes/classfunctions": "~1.1",
         "ronanguilloux/isocodes": "~1.1",
         "ramsey/uuid": "~2.8",
+        "ramsey/uuid": "~3.6",
         "nesbot/carbon": "~1.16",
         "alcohol/iso3166": "~3.0",
         "symfony/translation": "~2.8",
+        "symfony/yaml": "~2.8"
+        "symfony/yaml": "~2.8",
+        "vlucas/phpdotenv": "^2.4"
     },
     "require-dev": {

ing-psp/trunk/ing-php/composer.lock

-                      r1654867
+                      r1717487
         "This file is @generated automatically"
     ],
+    "hash": "bb52aa110922e71473a063377cd1a156",
+    "content-hash": "ef15ab1b05dd60446be04fca0b393822",
+    "content-hash": "5bbd3ee173ee1b3a5ded021f6b70e37f",
     "packages": [
+        {
 …
             ],
             "abandoned": "league/iso3166",
             "time": "2015-09-04 14:14:03"
+            "time": "2015-09-04T14:14:03+00:00"
         },
+        {
 …
                 "validation"
             ],
             "time": "2016-10-31 12:09:54"
+            "time": "2016-10-31T12:09:54+00:00"
         },
+        {
 …
                 "web service"
             ],
             "time": "2016-07-15 19:28:39"
+            "time": "2016-07-15T19:28:39+00:00"
         },
+        {
 …
             ],
             "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
             "time": "2015-05-20 03:37:09"
+            "time": "2015-05-20T03:37:09+00:00"
         },
+        {
 …
                 "stream"
             ],
             "time": "2014-10-12 19:18:40"
+            "time": "2014-10-12T19:18:40+00:00"
         },
+        {
 …
                 "utilities"
             ],
             "time": "2014-07-28 14:39:20"
+            "time": "2014-07-28T14:39:20+00:00"
         },
+        {
 …
                 "time"
             ],
             "time": "2015-11-04 20:07:17"
+            "time": "2015-11-04T20:07:17+00:00"
         },
+        {
 …
                 "random"
             ],
             "time": "2017-03-13 16:27:32"
+            "time": "2017-03-13T16:27:32+00:00"
         },
+        {
             "name": "ramsey/uuid",
             "version": "2.9.0",
+            "version": "3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
                 "reference": "b2ef4dd9584268d73f92f752a62bc24cd534dc9a"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/ramsey/uuid/zipball/b2ef4dd9584268d73f92f752a62bc24cd534dc9a",
                 "reference": "b2ef4dd9584268d73f92f752a62bc24cd534dc9a",
+                "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
+                "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
                 "shasum": ""
             },
             "require": {
                 "paragonie/random_compat": "^1.0|^2.0",
                 "php": ">=5.3.3"
+                "php": "^5.4 || ^7.0"
             },
             "replace": {
 …
             },
             "require-dev": {
+                "doctrine/dbal": ">=2.3",
+                "apigen/apigen": "^4.1",
+                "codeception/aspect-mock": "^1.0 | ^2.0",
+                "doctrine/annotations": "~1.2.0",
+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
+                "ircmaxell/random-lib": "^1.1",
                 "jakub-onderka/php-parallel-lint": "^0.9.0",
+                "moontoast/math": "~1.1",
+                "phpunit/phpunit": "~4.1|~5.0",
+                "satooshi/php-coveralls": "~0.6",
+                "squizlabs/php_codesniffer": "^2.3",
+                "symfony/console": "~2.3|~3.0"
+                "mockery/mockery": "^0.9.4",
+                "moontoast/math": "^1.1",
+                "php-mock/php-mock-phpunit": "^0.3|^1.1",
+                "phpunit/phpunit": "^4.7|>=5.0 <5.4",
+                "satooshi/php-coveralls": "^0.6.1",
+                "squizlabs/php_codesniffer": "^2.3"
             },
             "suggest": {
+                "doctrine/dbal": "Allow the use of a UUID as doctrine field type.",
+                "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).",
+                "symfony/console": "Support for use of the bin/uuid command line tool."
+            },
+            "bin": [
+                "bin/uuid"
+            ],
+            "type": "library",
+                "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
+                "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
+                "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+                "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
+                "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
+                "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Rhumsaa\\Uuid\\": "src/"
+                    "Ramsey\\Uuid\\": "src/"
+                }
             },
 …
                 },
+                {
+                    "name": "Thibaud Fabre",
+                    "email": "thibaud@aztech.io"
+                },
+                {
                     "name": "Ben Ramsey",
+                    "homepage": "http://benramsey.com"
+                }
+            ],
+            "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+                    "email": "ben@benramsey.com",
+                    "homepage": "https://benramsey.com"
+                }
+            ],
+            "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
             "homepage": "https://github.com/ramsey/uuid",
             "keywords": [
 …
                 "uuid"
             ],
             "time": "2016-03-22 18:20:19"
+            "time": "2017-03-26T20:37:53+00:00"
         },
+        {
 …
             ],
             "description": "A lightweight implementation of CommonJS Promises/A for PHP",
             "time": "2016-05-03 17:50:52"
+            "time": "2016-05-03T17:50:52+00:00"
         },
+        {
 …
                 "zipcode"
             ],
             "time": "2015-06-22 19:37:41"
+            "time": "2015-06-22T19:37:41+00:00"
         },
+        {
 …
                 "shim"
             ],
             "time": "2016-05-18 14:26:46"
+            "time": "2016-05-18T14:26:46+00:00"
         },
+        {
 …
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
             "time": "2016-10-18 04:28:30"
+            "time": "2016-10-18T04:28:30+00:00"
         },
+        {
 …
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
+            "time": "2016-10-21 20:59:10"
+            "time": "2016-10-21T20:59:10+00:00"
+        },
+        {
+            "name": "vlucas/phpdotenv",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vlucas/phpdotenv.git",
+                "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+                "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dotenv\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause-Attribution"
+            ],
+            "authors": [
+                {
+                    "name": "Vance Lucas",
+                    "email": "vance@vancelucas.com",
+                    "homepage": "http://www.vancelucas.com"
+                }
+            ],
+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "keywords": [
+                "dotenv",
+                "env",
+                "environment"
+            ],
+            "time": "2016-09-01T10:05:43+00:00"
+        }
     ],
 …
                 "instantiate"
             ],
             "time": "2015-06-14 21:17:01"
+            "time": "2015-06-14T21:17:01+00:00"
         },
+        {
 …
                 "test"
             ],
             "time": "2015-05-11 14:41:42"
+            "time": "2015-05-11T14:41:42+00:00"
         },
+        {
 …
                 "testing"
             ],
             "time": "2016-05-22 21:52:33"
+            "time": "2016-05-22T21:52:33+00:00"
         },
+        {
 …
                 "static analysis"
             ],
             "time": "2015-12-27 11:43:31"
+            "time": "2015-12-27T11:43:31+00:00"
         },
+        {
 …
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "time": "2016-09-30 07:12:33"
+            "time": "2016-09-30T07:12:33+00:00"
         },
+        {
 …
+                }
             ],
             "time": "2016-06-10 07:14:17"
+            "time": "2016-06-10T07:14:17+00:00"
         },
+        {
 …
                 "stub"
             ],
             "time": "2016-06-07 08:13:47"
+            "time": "2016-06-07T08:13:47+00:00"
         },
+        {
 …
                 "xunit"
             ],
             "time": "2015-10-06 15:47:00"
+            "time": "2015-10-06T15:47:00+00:00"
         },
+        {
 …
                 "iterator"
             ],
             "time": "2015-06-21 13:08:43"
+            "time": "2015-06-21T13:08:43+00:00"
         },
+        {
 …
                 "template"
             ],
             "time": "2015-06-21 13:50:34"
+            "time": "2015-06-21T13:50:34+00:00"
         },
+        {
 …
                 "timer"
             ],
             "time": "2016-05-12 18:03:57"
+            "time": "2016-05-12T18:03:57+00:00"
         },
+        {
 …
                 "tokenizer"
             ],
             "time": "2015-09-15 10:49:45"
+            "time": "2015-09-15T10:49:45+00:00"
         },
+        {
 …
                 "xunit"
             ],
             "time": "2016-07-21 06:48:14"
+            "time": "2016-07-21T06:48:14+00:00"
         },
+        {
 …
                 "xunit"
             ],
             "time": "2015-10-02 06:51:40"
+            "time": "2015-10-02T06:51:40+00:00"
         },
+        {
 …
                 "equality"
             ],
             "time": "2015-07-26 15:48:44"
+            "time": "2015-07-26T15:48:44+00:00"
         },
+        {
 …
                 "diff"
             ],
             "time": "2015-12-08 07:14:41"
+            "time": "2015-12-08T07:14:41+00:00"
         },
+        {
 …
                 "hhvm"
             ],
             "time": "2016-08-18 05:49:44"
+            "time": "2016-08-18T05:49:44+00:00"
         },
+        {
 …
                 "exporter"
             ],
             "time": "2016-06-17 09:04:28"
+            "time": "2016-06-17T09:04:28+00:00"
         },
+        {
 …
                 "global state"
             ],
             "time": "2015-10-12 03:26:01"
+            "time": "2015-10-12T03:26:01+00:00"
         },
+        {
 …
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "time": "2015-11-11 19:50:13"
+            "time": "2015-11-11T19:50:13+00:00"
         },
+        {
 …
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
             "time": "2015-06-21 13:59:46"
+            "time": "2015-06-21T13:59:46+00:00"
         },
+        {
 …
                 "standards"
             ],
             "time": "2016-09-01 23:53:02"
+            "time": "2016-09-01T23:53:02+00:00"
         },
+        {
 …
                 "validate"
             ],
             "time": "2016-08-09 15:02:57"
+            "time": "2016-08-09T15:02:57+00:00"
+        }
     ],

ing-psp/trunk/ing-php/src/Client.php

-                      r1654867
+                      r1717487
 use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\Exception\RequestException;
+use GingerPayments\Payment\Order\Transaction;
 final class Client
 …
+        }
+    }
+    /**
+     * update the order status to captured
+     *
+     * @param  Order $order
+     * @throws OrderNotFoundException
+     * @throws ClientException
+     * @return Transaction
+     */
+    public function setOrderCapturedStatus(Order $order)
+    {
+        try {
+            return Transaction::fromArray($this->httpClient->post(
+                    "orders/".$order->id()."/transactions/".$order->transactions()->current()->id()->toString()."/captures/",
+                    [
+                        "timeout" => 30
+                    ]
+                )->json()
+            );
+        } catch (RequestException $exception) {
+            if ($exception->getCode() == 404) {
+                throw new OrderNotFoundException('No order with that ID was found.', 404, $exception);
+            }
+            throw new ClientException(
+                'An error occurred while updating the order: '.$exception->getMessage(),
+                $exception->getCode(),
+                $exception
+            );
+        }
+    }
+}

ing-psp/trunk/ing-php/src/Ginger.php

-                      r1654939
+                      r1717487
      * The library version.
      */
     const CLIENT_VERSION = '1.2.8';
+    const CLIENT_VERSION = '1.3.1';
     /**
 …
      */
     const API_VERSION = 'v1';
-    /**
-     * API endpoint Ginger Payments
-     */
-    const ENDPOINT_GINGER = 'https://api.gingerpayments.com/{version}/';
-    /**
-     * API Kassa Compleet endpoint
-     */
-    const ENDPOINT_KASSA = 'https://api.kassacompleet.nl/{version}/';
-    /**
-     * API endpoint ING
-     */
-    const ENDPOINT_ING = 'https://api.ing-checkout.com/{version}/';
-    /**
-     * API endpoint EPAY
-     */
-    const ENDPOINT_EPAY = 'https://api.epay.ing.be/{version}/';
     /**
 …
         switch ($product) {
             case 'kassacompleet':
+                $endpoint = self::ENDPOINT_KASSA;
+                break;
+                return (new Client\EndpointResolver())->getEndpointKassa();
             case 'ingcheckout':
+                $endpoint = self::ENDPOINT_ING;
+                break;
+                return (new Client\EndpointResolver())->getEndpointIng();
             case 'epay':
+                $endpoint = self::ENDPOINT_EPAY;
+                break;
+                return (new Client\EndpointResolver())->getEndpointEpay();
             default:
+                $endpoint = self::ENDPOINT_GINGER;
+                break;
+                return (new Client\EndpointResolver())->getEndpointGinger();
+        }
-        return $endpoint;
+    }

ing-psp/trunk/ing-php/src/Order.php

r1652620	r1717487
13	13	use GingerPayments\Payment\Order\Customer;
14	14	use GingerPayments\Payment\Order\Extra;
15		use R~~humsaa~~\Uuid\Uuid;
	15	use Ramsey\Uuid\Uuid;
16	16	use GingerPayments\Payment\Order\OrderLines;
17	17

ing-psp/trunk/ing-php/src/Order/OrderLine.php

r1652620	r1717487
3	3	namespace GingerPayments\Payment\Order;
4	4
5		use R~~humsaa~~\Uuid\Uuid;
	5	use Ramsey\Uuid\Uuid;
6	6	use Assert\Assertion as Guard;
7	7

ing-psp/trunk/ing-php/src/Order/Transaction.php

r1600658	r1717487
14	14	use GingerPayments\Payment\Order\Transaction\Status as TransactionStatus;
15	15	use GingerPayments\Payment\Url;
16		use R~~humsaa~~\Uuid\Uuid;
	16	use Ramsey\Uuid\Uuid;
17	17
18	18	final class Transaction

ing-psp/trunk/ing-php/src/Order/Transaction/Status.php

-                      r1652620
+                      r1717487
     const EXPIRED = 'expired';
     const ACCEPTED = 'accepted';
+    const CAPTURED = 'captured';
     /**
 …
             self::CANCELLED,
             self::EXPIRED,
+            self::ACCEPTED
+            self::ACCEPTED,
+            self::CAPTURED
         ];
+    }
 …
         return $this->value === self::ACCEPTED;
+    }
+    /**
+     * @return bool
+     */
+    public function isCaptured()
+    {
+        return $this->value === self::CAPTURED;
+    }
+}

ing-psp/trunk/ing-php/tests/ClientTest.php

-                      r1652620
+                      r1717487
         $this->client->getOrder('123456');
+    }
+    /**
+     * @test
+     */
+    public function itShouldSetOrderStatusToCaptured()
+    {
+        $this->httpClient->shouldReceive('post')
+            ->once()
+            ->andReturn($this->httpResponse);
+        $this->httpResponse->shouldReceive('json')
+            ->once()
+            ->andReturn(
+                [
+                    'payment_method' => 'credit-card',
+                    'payment_method_details' => [],
+                    'id' => '5ac3eb32-384d-4d61-a797-9f44b1cd70e5',
+                    'created' => '2015-03-07T20:58:35+0100',
+                    'modified' => '2015-03-07T21:58:35+0100',
+                    'completed' => '2015-03-07T22:58:35+0100',
+                    'status' => 'new',
+                    'reason' => 'A great reason',
+                    'currency' => 'EUR',
+                    'amount' => 100,
+                    'expiration_period' => 'P0Y0M0DT1H0M0S',
+                    'description' => 'A transaction',
+                    'balance' => 'internal',
+                    'payment_url' => 'http://www.example.com'
+                ]
+        );
+        $this->assertInstanceOf(
+            'GingerPayments\Payment\Order\Transaction',
+            $this->client->setOrderCapturedStatus($this->createOrderWithTransactionsFormArray())
+        );
+    }
+    /**
+     * @test
+     */
+    public function itShouldThrowAnOrderNotFoundExceptionWhenSettingCapturedOrderStatus()
+    {
+        $request = m::mock('GuzzleHttp\Message\Request');
+        $response = m::mock('GuzzleHttp\Message\Response');
+        $response->shouldReceive('getStatusCode')->andReturn(404);
+        $this->httpClient->shouldReceive('post')
+            ->once()
+            ->andThrow(new HttpClientException('Something happened', $request, $response));
+        $this->setExpectedException('GingerPayments\Payment\Client\OrderNotFoundException');
+        $this->client->setOrderCapturedStatus($this->createOrderWithTransactionsFormArray());
+    }
+    /**
+     * @test
+     */
+    public function itShouldThrowAClientExceptionWhenSettingCapturedOrderStatus()
+    {
+        $request = m::mock('GuzzleHttp\Message\Request');
+        $this->httpClient->shouldReceive('post')
+            ->once()
+            ->andThrow(new HttpClientException('Something happened', $request));
+        $this->setExpectedException('GingerPayments\Payment\Client\ClientException');
+        $this->client->setOrderCapturedStatus($this->createOrderWithTransactionsFormArray());
+    }
+    /**
+     * Helper method for creating an order with transactions
+     *
+     * @return Order
+     */
+    protected function createOrderWithTransactionsFormArray() {
+        $orderData = [
+            'transactions' => [
+                 [
+                    'payment_method' => 'credit-card',
+                    'payment_method_details' => [],
+                    'id' => '5ac3eb32-384d-4d61-a797-9f44b1cd70e5',
+                    'created' => '2015-03-07T20:58:35+0100',
+                    'modified' => '2015-03-07T21:58:35+0100',
+                    'completed' => '2015-03-07T22:58:35+0100',
+                    'status' => 'new',
+                    'reason' => 'A great reason',
+                    'currency' => 'EUR',
+                    'amount' => 100,
+                    'expiration_period' => 'P0Y0M0DT1H0M0S',
+                    'description' => 'A transaction',
+                    'balance' => 'internal',
+                    'payment_url' => 'http://www.example.com'
+                ]
+            ],
+            'amount' => 100,
+            'currency' => 'EUR',
+            'id' => 'c384b47e-7a5e-4c91-ab65-c4eed7f26e85',
+            'expiration_period' => 'PT10M',
+            'merchant_order_id' => '123',
+            'description' => "Test",
+            'return_url' => "http://example.com",
+        ];
+        return Order::fromArray($orderData);
+    }
+}

ing-psp/trunk/ing-php/tests/GingerTest.php

-                      r1600658
+                      r1717487
 use GingerPayments\Payment\Ginger;
+use GingerPayments\Payment\Client\EndpointResolver;
 final class GingerTest extends \PHPUnit_Framework_TestCase
 …
         $httpClient = $reflectionProperty->getValue($client);
         $this->assertEquals(
             str_replace('{version}', Ginger::API_VERSION, Ginger::ENDPOINT_GINGER),
+            str_replace('{version}', Ginger::API_VERSION, EndpointResolver::ENDPOINT_GINGER),
             $httpClient->getBaseUrl()
         );

ing-psp/trunk/ing-php/tests/Order/Transaction/StatusTest.php

-                      r1600658
+                      r1717487
         $this->assertFalse($status->isCancelled());
         $this->assertFalse($status->isExpired());
+        $this->assertFalse($status->isCaptured());
+    }
 …
         $this->assertFalse($status->isCancelled());
         $this->assertFalse($status->isExpired());
+        $this->assertFalse($status->isCaptured());
+    }
 …
         $this->assertFalse($status->isCancelled());
         $this->assertFalse($status->isExpired());
+        $this->assertFalse($status->isCaptured());
+    }
 …
         $this->assertFalse($status->isCancelled());
         $this->assertFalse($status->isExpired());
+        $this->assertFalse($status->isCaptured());
+    }
 …
         $this->assertFalse($status->isCancelled());
         $this->assertFalse($status->isExpired());
+        $this->assertFalse($status->isCaptured());
+    }
 …
         $this->assertTrue($status->isCancelled());
         $this->assertFalse($status->isExpired());
+        $this->assertFalse($status->isCaptured());
+    }
 …
         $this->assertFalse($status->isCancelled());
         $this->assertTrue($status->isExpired());
+        $this->assertFalse($status->isCaptured());
+    }
+    /**
+     * @test
+     */
+    public function itShouldBeCaptured()
+    {
+        $status = Status::fromString(Status::CAPTURED);
+        $this->assertFalse($status->isNew());
+        $this->assertFalse($status->isPending());
+        $this->assertFalse($status->isProcessing());
+        $this->assertFalse($status->isError());
+        $this->assertFalse($status->isCompleted());
+        $this->assertFalse($status->isCancelled());
+        $this->assertFalse($status->isExpired());
+        $this->assertTrue($status->isCaptured());
+    }
+}

ing-psp/trunk/ing-php/vendor/autoload.php

r1654939	r1717487
5	5	require_once __DIR__ . '/composer/autoload_real.php';
6	6
7		return ComposerAutoloaderInit~~186755da5bcf4416de0a652990838664~~::getLoader();
	7	return ComposerAutoloaderInit9600c984af2e5421cbc08b8cdee73f69::getLoader();

ing-psp/trunk/ing-php/vendor/composer/ClassLoader.php

-                      r1600658
+                      r1717487
     private $classMapAuthoritative = false;
     private $missingClasses = array();
+    private $apcuPrefix;
     public function getPrefixes()
 …
     /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+    /**
      * Registers this instance as an autoloader.
+     *
 …
     public function findFile($class)
+    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
+        }
         // class map lookup
         if (isset($this->classMap[$class])) {
 …
             return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
         $file = $this->findFileWithExtension($class, '.php');
 …
+        }
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
         if (false === $file) {
             // Remember that this class does not exist.
 …
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
+            foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath.'\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        $length = $this->prefixLengthsPsr4[$first][$search];
                         if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
                             return $file;

ing-psp/trunk/ing-php/vendor/composer/LICENSE

r1600658	r1717487
1	1
2		Copyright (c) ~~2016~~ Nils Adermann, Jordi Boggiano
	2	Copyright (c) Nils Adermann, Jordi Boggiano
3	3
4	4	Permission is hereby granted, free of charge, to any person obtaining a copy

ing-psp/trunk/ing-php/vendor/composer/autoload_psr4.php

-                      r1600658
+                      r1717487
     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
     'Symfony\\Component\\Translation\\' => array($vendorDir . '/symfony/translation'),
-    'Rhumsaa\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
     'React\\Promise\\' => array($vendorDir . '/react/promise/src'),
+    'Ramsey\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
     'GuzzleHttp\\Stream\\' => array($vendorDir . '/guzzlehttp/streams/src'),
     'GuzzleHttp\\Ring\\' => array($vendorDir . '/guzzlehttp/ringphp/src'),
 …
     'GingerPayments\\Payment\\Tests\\' => array($baseDir . '/tests'),
     'GingerPayments\\Payment\\' => array($baseDir . '/src'),
+    'Dotenv\\' => array($vendorDir . '/vlucas/phpdotenv/src'),
     'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
     'Carbon\\' => array($vendorDir . '/nesbot/carbon/src/Carbon'),

ing-psp/trunk/ing-php/vendor/composer/autoload_real.php

-                      r1654939
+                      r1717487
 // autoload_real.php @generated by Composer
 class ComposerAutoloaderInit186755da5bcf4416de0a652990838664
+class ComposerAutoloaderInit9600c984af2e5421cbc08b8cdee73f69
+{
     private static $loader;
 …
+        }
         spl_autoload_register(array('ComposerAutoloaderInit186755da5bcf4416de0a652990838664', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit9600c984af2e5421cbc08b8cdee73f69', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit186755da5bcf4416de0a652990838664', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit9600c984af2e5421cbc08b8cdee73f69', 'loadClassLoader'));
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
             call_user_func(\Composer\Autoload\ComposerStaticInit186755da5bcf4416de0a652990838664::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit9600c984af2e5421cbc08b8cdee73f69::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
 …
         if ($useStaticLoader) {
             $includeFiles = Composer\Autoload\ComposerStaticInit186755da5bcf4416de0a652990838664::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit9600c984af2e5421cbc08b8cdee73f69::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
+        }
         foreach ($includeFiles as $fileIdentifier => $file) {
             composerRequire186755da5bcf4416de0a652990838664($fileIdentifier, $file);
+            composerRequire9600c984af2e5421cbc08b8cdee73f69($fileIdentifier, $file);
+        }
 …
+}
 function composerRequire186755da5bcf4416de0a652990838664($fileIdentifier, $file)
+function composerRequire9600c984af2e5421cbc08b8cdee73f69($fileIdentifier, $file)
+{
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

ing-psp/trunk/ing-php/vendor/composer/autoload_static.php

-                      r1654939
+                      r1717487
 namespace Composer\Autoload;
 class ComposerStaticInit186755da5bcf4416de0a652990838664
+class ComposerStaticInit9600c984af2e5421cbc08b8cdee73f69
+{
     public static $files = array (
 …
         'R' =>
         array (
-            'Rhumsaa\\Uuid\\' => 13,
             'React\\Promise\\' => 14,
+            'Ramsey\\Uuid\\' => 12,
         ),
         'G' =>
 …
         'D' =>
         array (
+            'Dotenv\\' => 7,
             'Doctrine\\Instantiator\\' => 22,
         ),
 …
 => __DIR__ . '/..' . '/symfony/translation',
         ),
+        'Rhumsaa\\Uuid\\' =>
+        'React\\Promise\\' =>
+        array (
+=> __DIR__ . '/..' . '/react/promise/src',
+        ),
+        'Ramsey\\Uuid\\' =>
         array (
 => __DIR__ . '/..' . '/ramsey/uuid/src',
         ),
-        'React\\Promise\\' =>
-        array (
-=> __DIR__ . '/..' . '/react/promise/src',
-        ),
         'GuzzleHttp\\Stream\\' =>
         array (
 …
         array (
 => __DIR__ . '/../..' . '/src',
+        ),
+        'Dotenv\\' =>
+        array (
+=> __DIR__ . '/..' . '/vlucas/phpdotenv/src',
         ),
         'Doctrine\\Instantiator\\' =>
 …
+    {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit186755da5bcf4416de0a652990838664::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit186755da5bcf4416de0a652990838664::$prefixDirsPsr4;
             $loader->prefixesPsr0 = ComposerStaticInit186755da5bcf4416de0a652990838664::$prefixesPsr0;
             $loader->classMap = ComposerStaticInit186755da5bcf4416de0a652990838664::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit9600c984af2e5421cbc08b8cdee73f69::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit9600c984af2e5421cbc08b8cdee73f69::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit9600c984af2e5421cbc08b8cdee73f69::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit9600c984af2e5421cbc08b8cdee73f69::$classMap;
         }, null, ClassLoader::class);

ing-psp/trunk/ing-php/vendor/composer/installed.json

-                      r1654867
+                      r1717487
             "phpunit/phpunit": "~4.6"
         },
         "time": "2015-09-04 14:14:03",
+        "time": "2015-09-04T14:14:03+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "@stable"
         },
         "time": "2016-10-31 12:09:54",
+        "time": "2016-10-31T12:09:54+00:00",
         "type": "library",
         "installation-source": "dist",
 …
             "php": ">=5.4.0"
         },
         "time": "2016-05-03 17:50:52",
+        "time": "2016-05-03T17:50:52+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "~4.0"
         },
         "time": "2014-10-12 19:18:40",
+        "time": "2014-10-12T19:18:40+00:00",
         "type": "library",
         "extra": {
 …
             "ext-curl": "Guzzle will use specific adapters if cURL is present"
         },
         "time": "2015-05-20 03:37:09",
+        "time": "2015-05-20T03:37:09+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "^4.0"
         },
         "time": "2016-07-15 19:28:39",
+        "time": "2016-07-15T19:28:39+00:00",
         "type": "library",
         "installation-source": "dist",
 …
             "phpunit/phpunit": "4.*"
         },
         "time": "2014-07-28 14:39:20",
+        "time": "2014-07-28T14:39:20+00:00",
         "type": "library",
         "extra": {
 …
             "ext-mbstring": "For best performance"
         },
         "time": "2016-05-18 14:26:46",
+        "time": "2016-05-18T14:26:46+00:00",
         "type": "library",
         "extra": {
 …
             "symfony/yaml": ""
         },
         "time": "2016-10-18 04:28:30",
+        "time": "2016-10-18T04:28:30+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "~4.0|~5.0"
         },
         "time": "2015-11-04 20:07:17",
+        "time": "2015-11-04T20:07:17+00:00",
         "type": "library",
         "installation-source": "dist",
 …
             "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
         },
         "time": "2017-03-13 16:27:32",
+        "time": "2017-03-13T16:27:32+00:00",
         "type": "library",
         "installation-source": "dist",
 …
+    {
         "name": "ramsey/uuid",
         "version": "2.9.0",
         "version_normalized": "2.9.0.0",
+        "version": "3.6.1",
+        "version_normalized": "3.6.1.0",
         "source": {
             "type": "git",
             "url": "https://github.com/ramsey/uuid.git",
             "reference": "b2ef4dd9584268d73f92f752a62bc24cd534dc9a"
         },
         "dist": {
             "type": "zip",
             "url": "https://api.github.com/repos/ramsey/uuid/zipball/b2ef4dd9584268d73f92f752a62bc24cd534dc9a",
             "reference": "b2ef4dd9584268d73f92f752a62bc24cd534dc9a",
+            "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/ramsey/uuid/zipball/4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
+            "reference": "4ae32dd9ab8860a4bbd750ad269cba7f06f7934e",
             "shasum": ""
         },
         "require": {
             "paragonie/random_compat": "^1.0|^2.0",
             "php": ">=5.3.3"
+            "php": "^5.4 || ^7.0"
         },
         "replace": {
 …
         },
         "require-dev": {
+            "doctrine/dbal": ">=2.3",
+            "apigen/apigen": "^4.1",
+            "codeception/aspect-mock": "^1.0 | ^2.0",
+            "doctrine/annotations": "~1.2.0",
+            "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
+            "ircmaxell/random-lib": "^1.1",
             "jakub-onderka/php-parallel-lint": "^0.9.0",
+            "moontoast/math": "~1.1",
+            "phpunit/phpunit": "~4.1|~5.0",
+            "satooshi/php-coveralls": "~0.6",
+            "squizlabs/php_codesniffer": "^2.3",
+            "symfony/console": "~2.3|~3.0"
+            "mockery/mockery": "^0.9.4",
+            "moontoast/math": "^1.1",
+            "php-mock/php-mock-phpunit": "^0.3|^1.1",
+            "phpunit/phpunit": "^4.7|>=5.0 <5.4",
+            "satooshi/php-coveralls": "^0.6.1",
+            "squizlabs/php_codesniffer": "^2.3"
         },
         "suggest": {
+            "doctrine/dbal": "Allow the use of a UUID as doctrine field type.",
+            "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).",
+            "symfony/console": "Support for use of the bin/uuid command line tool."
+        },
+        "time": "2016-03-22 18:20:19",
+        "bin": [
+            "bin/uuid"
+        ],
+        "type": "library",
+            "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
+            "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
+            "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+            "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
+            "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
+            "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
+        },
+        "time": "2017-03-26T20:37:53+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.x-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
                 "Rhumsaa\\Uuid\\": "src/"
+                "Ramsey\\Uuid\\": "src/"
+            }
         },
 …
             },
+            {
+                "name": "Thibaud Fabre",
+                "email": "thibaud@aztech.io"
+            },
+            {
                 "name": "Ben Ramsey",
+                "homepage": "http://benramsey.com"
+            }
+        ],
+        "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+                "email": "ben@benramsey.com",
+                "homepage": "https://benramsey.com"
+            }
+        ],
+        "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
         "homepage": "https://github.com/ramsey/uuid",
         "keywords": [
 …
             "sllh/iso-codes-validator": "For Symfony or Silex integration with ease"
         },
         "time": "2015-06-22 19:37:41",
+        "time": "2015-06-22T19:37:41+00:00",
         "type": "library",
         "extra": {
 …
     },
+    {
+        "name": "vlucas/phpdotenv",
+        "version": "v2.4.0",
+        "version_normalized": "2.4.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/vlucas/phpdotenv.git",
+            "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+            "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "^4.8 || ^5.0"
+        },
+        "time": "2016-09-01T10:05:43+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.4-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Dotenv\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause-Attribution"
+        ],
+        "authors": [
+            {
+                "name": "Vance Lucas",
+                "email": "vance@vancelucas.com",
+                "homepage": "http://www.vancelucas.com"
+            }
+        ],
+        "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+        "keywords": [
+            "dotenv",
+            "env",
+            "environment"
+        ]
+    },
+    {
         "name": "hamcrest/hamcrest-php",
         "version": "v1.2.2",
 …
             "satooshi/php-coveralls": "dev-master"
         },
         "time": "2015-05-11 14:41:42",
+        "time": "2015-05-11T14:41:42+00:00",
         "type": "library",
         "installation-source": "dist",
 …
             "phpunit/phpunit": "~4.0"
         },
         "time": "2016-05-22 21:52:33",
+        "time": "2016-05-22T21:52:33+00:00",
         "type": "library",
         "extra": {
 …
             "sebastian/version": "^1.0.1"
         },
         "time": "2016-08-09 15:02:57",
+        "time": "2016-08-09T15:02:57+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "^4.6"
         },
         "time": "2015-12-27 11:43:31",
+        "time": "2015-12-27T11:43:31+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "^5.2||^4.8.24"
         },
         "time": "2016-06-10 07:14:17",
+        "time": "2016-06-10T07:14:17+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "^4.4"
         },
         "time": "2016-09-30 07:12:33",
+        "time": "2016-09-30T07:12:33+00:00",
         "type": "library",
         "installation-source": "dist",
 …
             "phpunit/phpunit": "~4.2"
         },
         "time": "2015-09-15 10:49:45",
+        "time": "2015-09-15T10:49:45+00:00",
         "type": "library",
         "extra": {
 …
             "php": ">=5.3.9"
         },
         "time": "2016-10-21 20:59:10",
+        "time": "2016-10-21T20:59:10+00:00",
         "type": "library",
         "extra": {
 …
             "shasum": ""
         },
         "time": "2015-06-21 13:59:46",
+        "time": "2015-06-21T13:59:46+00:00",
         "type": "library",
         "installation-source": "dist",
 …
             "ext-uopz": "*"
         },
         "time": "2015-10-12 03:26:01",
+        "time": "2015-10-12T03:26:01+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "~4.4"
         },
         "time": "2015-11-11 19:50:13",
+        "time": "2015-11-11T19:50:13+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "~4.4"
         },
         "time": "2016-06-17 09:04:28",
+        "time": "2016-06-17T09:04:28+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "^4.8 || ^5.0"
         },
         "time": "2016-08-18 05:49:44",
+        "time": "2016-08-18T05:49:44+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "~4.8"
         },
         "time": "2015-12-08 07:14:41",
+        "time": "2015-12-08T07:14:41+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "~4.4"
         },
         "time": "2015-07-26 15:48:44",
+        "time": "2015-07-26T15:48:44+00:00",
         "type": "library",
         "extra": {
 …
             "php": ">=5.3.3"
         },
         "time": "2015-06-21 13:50:34",
+        "time": "2015-06-21T13:50:34+00:00",
         "type": "library",
         "installation-source": "dist",
 …
             "squizlabs/php_codesniffer": "~2.0"
         },
         "time": "2015-06-14 21:17:01",
+        "time": "2015-06-14T21:17:01+00:00",
         "type": "library",
         "extra": {
 …
             "ext-soap": "*"
         },
         "time": "2015-10-02 06:51:40",
+        "time": "2015-10-02T06:51:40+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/phpunit": "~4|~5"
         },
         "time": "2016-05-12 18:03:57",
+        "time": "2016-05-12T18:03:57+00:00",
         "type": "library",
         "installation-source": "dist",
 …
             "php": ">=5.3.3"
         },
         "time": "2015-06-21 13:08:43",
+        "time": "2015-06-21T13:08:43+00:00",
         "type": "library",
         "extra": {
 …
             "ext-xmlwriter": "*"
         },
         "time": "2015-10-06 15:47:00",
+        "time": "2015-10-06T15:47:00+00:00",
         "type": "library",
         "extra": {
 …
             "phpspec/phpspec": "^2.0"
         },
         "time": "2016-06-07 08:13:47",
+        "time": "2016-06-07T08:13:47+00:00",
         "type": "library",
         "extra": {
 …
             "phpunit/php-invoker": "~1.1"
         },
         "time": "2016-07-21 06:48:14",
+        "time": "2016-07-21T06:48:14+00:00",
         "bin": [
             "phpunit"
 …
             "phpunit/phpunit": "~4.0"
         },
         "time": "2016-09-01 23:53:02",
+        "time": "2016-09-01T23:53:02+00:00",
         "bin": [
             "scripts/phpcs",

ing-psp/trunk/ing-php/vendor/ramsey/uuid/CHANGELOG.md

-                      r1600658
+                      r1717487
+# Rhumsaa\Uuid Changelog
+# ramsey/uuid Changelog
+## 3.6.1
+_Released: 2017-03-26_
+  * Optimize UUID string decoding [#164](https://github.com/ramsey/uuid/pull/164)
+## 3.6.0
+_Released: 2017-03-18_
+  * Add `InvalidUuidStringException`, thrown when attempting to decode an invalid string UUID; this does not introduce any BC issues, since the new exception inherits from the previously used `InvalidArgumentException` [#162](https://github.com/ramsey/uuid/pull/162)
+  * Improve memory usage when generating large quantities of UUIDs (use `str_pad()` and `dechex()` instead of `sprintf()`) [#160](https://github.com/ramsey/uuid/pull/160)
+  * Minor test and documentation updates
+## 3.5.2
+_Released: 2016-11-22_
+  * Improved test coverage.
+## 3.5.1
+_Released: 2016-10-02_
+  * Fixed issue where same UUIDs were not treated as equal with mixed case ([#131](https://github.com/ramsey/uuid/issues/131), [#137](https://github.com/ramsey/uuid/pull/137)).
+  * Test cleanup.
+## 3.5.0
+_Released: 2016-08-02_
+  * Add `OrderedTimeCodec` to store UUID in an optimized way for InnoDB ([#117](https://github.com/ramsey/uuid/issues/117), [#118](https://github.com/ramsey/uuid/pull/118)).
+  * Fixed `RandomNodeProvider` to prevent invalid node generation ([#129](https://github.com/ramsey/uuid/pull/129)).
+  * Cache failed attempt to retrieve system node to avoid multiple system calls ([#107](https://github.com/ramsey/uuid/issues/107), [#121](https://github.com/ramsey/uuid/pull/121)).
+  * Various test improvements.
+## 3.4.1
+_Released: 2016-04-23_
+  * Fixed test that violated a PHP CodeSniffer rule, breaking the build.
+## 3.4.0
+_Released: 2016-04-23_
+  * Add `TimestampFirstCombCodec` and `TimestampLastCombCodec` codecs.
+  * Improve logic of `CombGenerator` for COMB sequential UUIDs.
+  * Significantly improved test coverage.
+## 3.3.0
+_Released: 2016-03-22_
+  * Drop the use of OpenSSL as a fallback and use [paragonie/random_compat][] to support RandomBytesGenerator in versions of PHP earlier than 7.0. This addresses and fixes the [collision issue][].
+  * Improved test coverage.
+  * Update code to conduct to version 1.4 of the Contributor Covenant.
+## 3.2.0
+_Released: 2016-02-17_
+  * Add random generator option for use for the PECL libsodium extension.
+  * Updates to test infrastructure.
+## 3.1.0
+_Released: 2015-12-17_
+  * Uuid objects now may be properly serialized/unserialized.
+  * Update build environments for testing on Travis CI.
+## 3.0.1
+_Released: 2015-10-21_
+  * Add project [Contributor Code of Conduct](https://github.com/ramsey/uuid/blob/master/CONDUCT.md)
+  * Modify Travis CI builds to run tests on multiple CPU architectures
+  * Clean up code, tests, and documentation
+## 3.0.0
+_Released: 2015-09-28_
+The 3.0.0 release represents a significant step for the ramsey/uuid library. While the simple and familiar API used in previous versions remains intact, this release provides greater flexibility to integrators, including the ability to inject your own number generators, UUID codecs, node and time providers, and more.
+  * BREAK: The root namespace for this package has changed from "Rhumsaa" to "Ramsey." In most cases, simply making this change in your applications is the only upgrade path you will need. Everything else should work as expected.
+  * BREAK: The UUID [Doctrine field type](http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html) has been moved to [ramsey/uuid-doctrine](https://github.com/ramsey/uuid-doctrine).
+  * BREAK: The `uuid` console application has been moved to [ramsey/uuid-console](https://github.com/ramsey/uuid-console).
+  * BREAK: The `Uuid::VERSION` package version constant has been removed.
+  * See also the release notes for [3.0.0-alpha1][300-alpha1], [3.0.0-alpha2][300-alpha2], [3.0.0-alpha3][300-alpha3], and [3.0.0-beta1][300-beta1].
+[300-alpha1]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha1
+[300-alpha2]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha2
+[300-alpha3]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-alpha3
+[300-beta1]: https://github.com/ramsey/uuid/blob/master/CHANGELOG.md#300-beta1
+## 3.0.0-beta1
+_Released: 2015-08-31_
+  * Improve GUID support to ensure that:
+    * On little endian (LE) architectures, the byte order of the first three fields is LE.
+    * On big endian (BE) architectures, it is the same as a GUID.
+    * String representation is always the same.
+  * Fix exception message for `DegradedNumberConverter::fromHex()`.
+  * Add Scrutinizer configuration to run code-quality builds through Scrutinizer.
+  * Auto-fix Scrutinizer issues.
+  * Fix support URLs in composer.json to point to the correct GitHub repository.
+## 3.0.0-alpha3
+_Released: 2015-07-28_
+  * Time generator improvements:
+    * Enabled use of custom TimeGenerator implementations.
+      * BREAK: Removed now unnecessary `timeConverter` and `timeProvider` properties, setters, and getters in both `FeatureSet` and `UuidFactory` as those are now exclusively used by the default `TimeGenerator`.
+      * Added a `setTimeGenerator` method on `UuidFactory` to override the default time generator.
+    * Add option to enable `PeclUuidTimeGenerator` via `FeatureSet`.
+## 3.0.0-alpha2
+_Released: 2015-07-28_
+  * BREAK: Removed `PeclUuidFactory` in favor of using pecl-uuid with generators.
+  * NEW: Refactored time-based (version 1) UUIDs into a `TimeGeneratorInterface` to allow for other sources to generate version 1 UUIDs in this library.
+  * NEW: Added `PeclUuidTimeGenerator` and `PeclUuidRandomGenerator` for creating version 1 or version 4 UUIDs using the pecl-uuid extension.
+  * NEW: Add `RandomBytesGenerator` for use with PHP 7. ramsey/uuid will default to use this generator when running on PHP 7.
+  * `RandomLibAdapter` now defaults to a medium-strength generator with [ircmaxell/random-lib](https://github.com/ircmaxell/RandomLib). This is configurable, so other generator strengths may be used.
+  * Migrated to the Travis CI container-based infrastructure for builds.
+  * Documentation updates and corrections.
+## 3.0.0-alpha1
+_Released: 2015-07-16_
+  * BREAK: The root namespace for this package has changed from "Rhumsaa" to "Ramsey." In most cases, simply making this change in your applications is the only upgrade path you will need. Everything else should work as expected.
+  * BREAK: The UUID [Doctrine field type](http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html) has been moved to [ramsey/uuid-doctrine](https://github.com/ramsey/uuid-doctrine).
+  * BREAK: The `uuid` console application has been moved to [ramsey/uuid-console](https://github.com/ramsey/uuid-console).
+  * BREAK: The `Uuid::VERSION` package version constant has been removed.
+  * NEW: The `Uuid` class is no longer marked as `final`. Everything is now based around interfaces and factories, allowing you to use this package as a base to implement other kinds of UUIDs with different dependencies.
+  * NEW: Through setting dependencies on `UuidFactory` and/or extending `FeatureSet`, you may override any package defaults, injecting your own dependencies.
+  * NEW: For random number generation, in addition to `OpenSslGenerator` (used if `openssl_random_pseudo_bytes()` is present) and the fallback `MtRandGenerator`, you may use the bundled `CombGenerator` for sequential UUIDs or the `RandomLibAdapter` if using [ircmaxell/random-lib](https://github.com/ircmaxell/RandomLib).
+  * NEW: In addition to the default UUID generation, this library also supports GUID generation by configuring a `FeatureSet` to use GUIDs.
+  * NEW: While the interface to create UUIDs hasn't changed, if using this package on a 32-bit system, you will now receive an object of type `DegradedUuid` (which extends `Uuid`, which implements `UuidInterface`).
+  * NEW: All UUIDs are now [JsonSerializable](http://php.net/JsonSerializable).
 ## 2.9.0

ing-psp/trunk/ing-php/vendor/ramsey/uuid/CONTRIBUTING.md

-                      r1600658
+                      r1717487
 You can find help and discussion in the following places:
-* Gitter chat: <https://gitter.im/ramsey/uuid>
 * GitHub Issues: <https://github.com/ramsey/uuid/issues>
 * Wiki: <https://github.com/ramsey/uuid/wiki>
 …
 ```
+./vendor/bin/parallel-lint src tests
+./vendor/bin/phpunit --coverage-text
+./vendor/bin/phpcs src --standard=psr2 -sp
+composer test
 ```
+### Locally Test With Emulated MIPS Architecture
+The following commands use [Vagrant](https://www.vagrantup.com/) to start an Ubuntu VM, install necessary dependencies, and then run the `util/run-tests.sh` script that will download a Docker image emulating the MIPS architecture. This is especially helpful for testing UUID generation in a big-endian environment.
+```
+vagrant init ubuntu/trusty64
+vagrant up
+vagrant ssh
+sudo apt-get install docker.io qemu-user-static php5-cli php5-curl
+cd /vagrant
+curl -sS https://getcomposer.org/installer | php
+php composer.phar install --no-interaction --prefer-dist
+mkdir -p build/logs
+ARCH=mips PHP_VERSION=5.6.14 TRAVIS_BUILD_DIR=/vagrant ./util/run-tests.sh
+```

ing-psp/trunk/ing-php/vendor/ramsey/uuid/LICENSE

r1600658	r1717487
1		Copyright (c) 201~~3-2014 Ben Ramsey <http://~~benramsey.com>
	1	Copyright (c) 2012-2017 Ben Ramsey <ben@benramsey.com>
2	2
3	3	Permission is hereby granted, free of charge, to any person obtaining a copy

ing-psp/trunk/ing-php/vendor/ramsey/uuid/README.md

-                      r1600658
+                      r1717487
 # Rhumsaa\Uuid for PHP
+# ramsey/uuid
+[![Build Status](https://travis-ci.org/ramsey/uuid.png?branch=master)](https://travis-ci.org/ramsey/uuid)
+[![Coverage Status](https://coveralls.io/repos/ramsey/uuid/badge.png)](https://coveralls.io/r/ramsey/uuid)
+[![Latest Stable Version](https://poser.pugx.org/rhumsaa/uuid/v/stable.png)](https://packagist.org/packages/rhumsaa/uuid)
+[![Latest Unstable Version](https://poser.pugx.org/rhumsaa/uuid/v/unstable.png)](https://packagist.org/packages/rhumsaa/uuid)
+[![Total Downloads](https://poser.pugx.org/rhumsaa/uuid/downloads.png)](https://packagist.org/packages/rhumsaa/uuid)
+[![HHVM Status](http://hhvm.h4cc.de/badge/rhumsaa/uuid.png)](http://hhvm.h4cc.de/package/rhumsaa/uuid)
+_NOTICE: Formerly known as `rhumsaa/uuid`, The package and namespace names have changed to `ramsey/uuid` and `Ramsey\Uuid`, respectively._
+This project adheres to a [Contributor Code of Conduct](https://github.com/ramsey/uuid/blob/master/CODE_OF_CONDUCT.md). By participating in this project and its community, you are expected to uphold this code.
+[![Source Code][badge-source]][source]
+[![Latest Version][badge-release]][release]
+[![Software License][badge-license]][license]
+[![Build Status][badge-build]][build]
+[![Coverage Status][badge-coverage]][coverage]
+[![Total Downloads][badge-downloads]][downloads]
+ramsey/uuid is a PHP 5.4+ library for generating and working with [RFC 4122][rfc4122] version 1, 3, 4, and 5 universally unique identifiers (UUID).
+This project adheres to a [Contributor Code of Conduct][conduct]. By participating in this project and its community, you are expected to uphold this code.
 ## About
-Rhumsaa\Uuid is a PHP 5.3+ library for generating and working with
-[RFC 4122][rfc4122] version 1, 3, 4, and 5 universally unique identifiers (UUID).
 From [Wikipedia](http://en.wikipedia.org/wiki/Universally_unique_identifier):
+> The intent of UUIDs is to enable distributed systems to uniquely identify
+> information without significant central coordination. In this context the word
+> unique should be taken to mean "practically unique" rather than "guaranteed
+> unique". Since the identifiers have a finite size, it is possible for two
+> differing items to share the same identifier. The identifier size and
+> generation process need to be selected so as to make this sufficiently
+> improbable in practice. Anyone can create a UUID and use it to identify
+> something with reasonable confidence that the same identifier will never be
+> unintentionally created by anyone to identify something else. Information
+> labeled with UUIDs can therefore be later combined into a single database
+> without needing to resolve identifier (ID) conflicts.
+> The intent of UUIDs is to enable distributed systems to uniquely identify information without significant central coordination. In this context the word unique should be taken to mean "practically unique" rather than "guaranteed unique". Since the identifiers have a finite size, it is possible for two differing items to share the same identifier. The identifier size and generation process need to be selected so as to make this sufficiently improbable in practice. Anyone can create a UUID and use it to identify something with reasonable confidence that the same identifier will never be unintentionally created by anyone to identify something else. Information labeled with UUIDs can therefore be later combined into a single database without needing to resolve identifier (ID) conflicts.
+Much inspiration for this library came from the [Java][javauuid] and
+[Python][pyuuid] UUID libraries.
+Much inspiration for this library came from the [Java][javauuid] and [Python][pyuuid] UUID libraries.
-## API Documentation
+The [latest class API documentation][apidocs] is available online. This project
+uses [ApiGen](http://apigen.org/) to generate this documentation. To
+generate the documentation on your own, run `apigen` from the root of the project.
+This will generate documentation in the `build/apidocs/` folder.
+## Installation
+The preferred method of installation is via [Packagist][] and [Composer][]. Run the following command to install the package and add it as a requirement to your project's `composer.json`:
+```bash
+composer require ramsey/uuid
+```
+## Upgrading from 2.x to 3.x
+While we have made significant internal changes to the library, we have made every effort to ensure a seamless upgrade path from the 2.x series of this library to 3.x.
+One major breaking change is the transition from the `Rhumsaa` root namespace to `Ramsey`. In most cases, all you will need is to change the namespace to `Ramsey` in your code, and everything will "just work."
+Here are full details on the breaking changes to the public API of this library:
+. All namespace references of `Rhumsaa` have changed to `Ramsey`. Simply change the namespace to `Ramsey` in your code and everything should work.
+. The console application has moved to [ramsey/uuid-console](https://packagist.org/packages/ramsey/uuid-console). If using the console functionality, use Composer to require `ramsey/uuid-console`.
+. The Doctrine field type mapping has moved to [ramsey/uuid-doctrine](https://packagist.org/packages/ramsey/uuid-doctrine). If using the Doctrine functionality, use Composer to require `ramsey/uuid-doctrine`.
+## What to do if you see a "rhumsaa/uuid is abandoned" message
+When installing your project's dependencies using Composer, you might see the following message:
+```
+Package rhumsaa/uuid is abandoned, you should avoid using it. Use ramsey/uuid instead.
+```
+Don't panic. Simply execute the following commands with Composer:
+``` bash
+composer remove rhumsaa/uuid
+composer require ramsey/uuid=^2.9
+```
+After doing so, you will have the latest ramsey/uuid package in the 2.x series, and there will be no need to modify any code; the namespace in the 2.x series is still `Rhumsaa`.
 ## Requirements
+Some methods in this library have requirements due to integer size restrictions
+on 32-bit and 64-bit builds of PHP. A 64-bit build of PHP and the [Moontoast\Math][]
+library are recommended. However, this library is designed to work on 32-bit
+builds of PHP without Moontoast\Math, with some degraded functionality. Please
+check the API documentation for more information.
+Some methods in this library have requirements due to integer size restrictions on 32-bit and 64-bit builds of PHP. A 64-bit build of PHP and the [Moontoast\Math][] library are recommended. However, this library is designed to work on 32-bit builds of PHP without Moontoast\Math, with some degraded functionality. Please check the API documentation for more information.
+If a particular requirement is not present, then a `Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException`
+is thrown, allowing one to catch a bad call in an environment where the call is
+not supported and gracefully degrade.
+If a particular requirement is not present, then an `UnsatisfiedDependencyException` is thrown, allowing one to catch a bad call in an environment where the call is not supported and gracefully degrade.
+## API documentation
+The [latest class API documentation][apidocs] is available online.
+This project uses [ApiGen](http://apigen.org/) to generate this documentation. To generate the documentation on your own, install dev dependencies and run the following command from the root of the project:
+```
+composer build-docs
+```
+This will generate documentation in the `build/apidocs/` folder.
 ## Examples
+See the [cookbook on the wiki][wiki-cookbook] for more examples and approaches to specific use-cases.
 ```php
 …
 require 'vendor/autoload.php';
 use Rhumsaa\Uuid\Uuid;
 use Rhumsaa\Uuid\Exception\UnsatisfiedDependencyException;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\Exception\UnsatisfiedDependencyException;
 try {
 …
     // Generate a version 1 (time-based) UUID object
     $uuid1 = Uuid::uuid1();
     echo $uuid1->toString() . "\n"; // e4eaaaf2-d142-11e1-b3e4-080027620cdd
+    echo $uuid1->toString() . "\n"; // i.e. e4eaaaf2-d142-11e1-b3e4-080027620cdd
     // Generate a version 3 (name-based and hashed with MD5) UUID object
     $uuid3 = Uuid::uuid3(Uuid::NAMESPACE_DNS, 'php.net');
     echo $uuid3->toString() . "\n"; // 11a38b9a-b3da-360f-9353-a5a725514269
+    echo $uuid3->toString() . "\n"; // i.e. 11a38b9a-b3da-360f-9353-a5a725514269
     // Generate a version 4 (random) UUID object
     $uuid4 = Uuid::uuid4();
     echo $uuid4->toString() . "\n"; // 25769c6c-d34d-4bfe-ba98-e0ee856f3e7a
+    echo $uuid4->toString() . "\n"; // i.e. 25769c6c-d34d-4bfe-ba98-e0ee856f3e7a
     // Generate a version 5 (name-based and hashed with SHA1) UUID object
     $uuid5 = Uuid::uuid5(Uuid::NAMESPACE_DNS, 'php.net');
     echo $uuid5->toString() . "\n"; // c4a760a8-dbcf-5254-a0d9-6a4474bd1b62
+    echo $uuid5->toString() . "\n"; // i.e. c4a760a8-dbcf-5254-a0d9-6a4474bd1b62
 } catch (UnsatisfiedDependencyException $e) {
 …
 ```
-## Installation
+The preferred method of installation is via [Packagist][] and [Composer][]. Run
+the following command to install the package and add it as a requirement to
+`composer.json`:
+## Contributing
+```bash
+composer.phar require "ramsey/uuid=~2.8"
+```
+Contributions are welcome! Please read [CONTRIBUTING][] for details.
+## Copyright and license
+The ramsey/uuid library is copyright © [Ben Ramsey](https://benramsey.com/) and licensed for use under the MIT License (MIT). Please see [LICENSE][] for more information.
 [rfc4122]: http://tools.ietf.org/html/rfc4122
+[conduct]: https://github.com/ramsey/uuid/blob/master/CODE_OF_CONDUCT.md
 [javauuid]: http://docs.oracle.com/javase/6/docs/api/java/util/UUID.html
 [pyuuid]: http://docs.python.org/3/library/uuid.html
 [packagist]: https://packagist.org/packages/ramsey/uuid
 [composer]: http://getcomposer.org/
+[moontoast\math]: https://github.com/moontoast/math
+[apidocs]: http://docs.benramsey.com/ramsey-uuid/2.8/
+[moontoast\math]: https://packagist.org/packages/moontoast/math
+[apidocs]: http://docs.benramsey.com/ramsey-uuid/latest/
+[wiki-cookbook]: https://github.com/ramsey/uuid/wiki/Ramsey%5CUuid-Cookbook
+[contributing]: https://github.com/ramsey/uuid/blob/master/CONTRIBUTING.md
+[badge-source]: https://img.shields.io/badge/source-ramsey/uuid-blue.svg?style=flat-square
+[badge-release]: https://img.shields.io/packagist/v/ramsey/uuid.svg?style=flat-square
+[badge-license]: https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square
+[badge-build]: https://img.shields.io/travis/ramsey/uuid/master.svg?style=flat-square
+[badge-coverage]: https://img.shields.io/coveralls/ramsey/uuid/master.svg?style=flat-square
+[badge-downloads]: https://img.shields.io/packagist/dt/ramsey/uuid.svg?style=flat-square
+[source]: https://github.com/ramsey/uuid
+[release]: https://packagist.org/packages/ramsey/uuid
+[license]: https://github.com/ramsey/uuid/blob/master/LICENSE
+[build]: https://travis-ci.org/ramsey/uuid
+[coverage]: https://coveralls.io/r/ramsey/uuid?branch=master
+[downloads]: https://packagist.org/packages/ramsey/uuid

ing-psp/trunk/ing-php/vendor/ramsey/uuid/composer.json

-                      r1600658
+                      r1717487
+{
     "name": "ramsey/uuid",
     "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+    "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
     "type": "library",
     "keywords": ["uuid", "identifier", "guid"],
 …
+        {
             "name": "Ben Ramsey",
+            "homepage": "http://benramsey.com"
+            "email": "ben@benramsey.com",
+            "homepage": "https://benramsey.com"
         },
+        {
             "name": "Marijn Huizendveld",
             "email": "marijn.huizendveld@gmail.com"
+        },
+        {
+            "name": "Thibaud Fabre",
+            "email": "thibaud@aztech.io"
+        }
     ],
 …
     },
     "require": {
         "php": ">=5.3.3",
+        "php": "^5.4 || ^7.0",
         "paragonie/random_compat": "^1.0|^2.0"
     },
     "require-dev": {
+        "moontoast/math": "~1.1",
+        "symfony/console": "~2.3|~3.0",
+        "doctrine/dbal": ">=2.3",
+        "phpunit/phpunit": "~4.1|~5.0",
+        "satooshi/php-coveralls": "~0.6",
+        "moontoast/math": "^1.1",
+        "ircmaxell/random-lib": "^1.1",
+        "phpunit/phpunit": "^4.7|>=5.0 <5.4",
         "squizlabs/php_codesniffer": "^2.3",
+        "jakub-onderka/php-parallel-lint": "^0.9.0"
+        "jakub-onderka/php-parallel-lint": "^0.9.0",
+        "satooshi/php-coveralls": "^0.6.1",
+        "apigen/apigen": "^4.1",
+        "mockery/mockery": "^0.9.4",
+        "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ^2.1",
+        "doctrine/annotations": "~1.2.0",
+        "codeception/aspect-mock": "^1.0 | ^2.0",
+        "php-mock/php-mock-phpunit": "^0.3|^1.1"
     },
-    "bin": ["bin/uuid"],
     "suggest": {
+        "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).",
+        "symfony/console": "Support for use of the bin/uuid command line tool.",
+        "doctrine/dbal": "Allow the use of a UUID as doctrine field type."
+        "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+        "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
+        "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
+        "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
+        "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type.",
+        "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid"
     },
     "autoload": {
+        "psr-4": {"Rhumsaa\\Uuid\\": "src/"}
+        "psr-4": {"Ramsey\\Uuid\\": "src/"}
+    },
+    "autoload-dev": {
+        "psr-4": {"Ramsey\\Uuid\\Test\\": "tests/"}
     },
     "replace": {
         "rhumsaa/uuid": "self.version"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.x-dev"
+        }
+    },
+    "scripts": {
+        "lint": "parallel-lint src tests",
+        "phpunit": "phpunit --verbose --colors=always",
+        "phpcs": "phpcs src tests --standard=psr2 -sp --colors",
+        "test": [
+            "@lint",
+            "@phpunit",
+            "@phpcs"
+        ],
+        "build-docs": "apigen generate --source='src' --destination='build/apidocs' --template-theme='bootstrap' --deprecated --todo"
+    }
+}

ing-psp/trunk/ing-php/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php

-                      r1600658
+                      r1717487
 <?php
 /**
  * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the ramsey/uuid library
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
  * @copyright Copyright (c) 2013-2014 Ben Ramsey <http://benramsey.com>
+ * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com>
  * @license http://opensource.org/licenses/MIT MIT
+ * @link https://benramsey.com/projects/ramsey-uuid/ Documentation
+ * @link https://packagist.org/packages/ramsey/uuid Packagist
+ * @link https://github.com/ramsey/uuid GitHub
  */
 namespace Rhumsaa\Uuid\Exception;
+namespace Ramsey\Uuid\Exception;
 /**

ing-psp/trunk/ing-php/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php

-                      r1600658
+                      r1717487
 <?php
 /**
  * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the ramsey/uuid library
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
  * @copyright Copyright (c) 2013-2014 Ben Ramsey <http://benramsey.com>
+ * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com>
  * @license http://opensource.org/licenses/MIT MIT
+ * @link https://benramsey.com/projects/ramsey-uuid/ Documentation
+ * @link https://packagist.org/packages/ramsey/uuid Packagist
+ * @link https://github.com/ramsey/uuid GitHub
  */
 namespace Rhumsaa\Uuid\Exception;
+namespace Ramsey\Uuid\Exception;
 /**

ing-psp/trunk/ing-php/vendor/ramsey/uuid/src/Uuid.php

-                      r1600658
+                      r1717487
 <?php
 /**
  * This file is part of the Rhumsaa\Uuid library
+ * This file is part of the ramsey/uuid library
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
  * @copyright Copyright (c) 2013-2014 Ben Ramsey <http://benramsey.com>
+ * @copyright Copyright (c) Ben Ramsey <ben@benramsey.com>
  * @license http://opensource.org/licenses/MIT MIT
+ * @link https://benramsey.com/projects/ramsey-uuid/ Documentation
+ * @link https://packagist.org/packages/ramsey/uuid Packagist
+ * @link https://github.com/ramsey/uuid GitHub
  */
+namespace Rhumsaa\Uuid;
+use InvalidArgumentException;
+namespace Ramsey\Uuid;
+use Ramsey\Uuid\Converter\NumberConverterInterface;
+use Ramsey\Uuid\Codec\CodecInterface;
+use Ramsey\Uuid\Exception\UnsupportedOperationException;
 /**
  * Represents a universally unique identifier (UUID), according to RFC 4122
+ * Represents a universally unique identifier (UUID), according to RFC 4122.
+ *
  * This class provides immutable UUID objects (the Uuid class) and the static
 …
  * @link http://docs.oracle.com/javase/6/docs/api/java/util/UUID.html
  */
+final class Uuid
+class Uuid implements UuidInterface
+{
     /**
 …
     /**
+     * Version of the Rhumsaa\Uuid package
+     */
+    const VERSION = '2.8.3';
+    /**
+     * For testing, 64-bit system override; if true, treat the system as 32-bit
+     *
+     * @var bool
+     */
+    public static $force32Bit = false;
+    /**
+     * For testing, Moontoast\Math\BigNumber override; if true, treat as if
+     * BigNumber is not available
+     *
+     * @var bool
+     */
+    public static $forceNoBigNumber = false;
+    /**
+     * For testing, random_bytes() override; if true, treat as
+     * if random_bytes() is not available
+     *
+     * @var bool
+     */
+    public static $forceNoRandomBytes = false;
+    /**
+     * For testing, sets time of day to a static, known value
+     * The factory to use when creating UUIDs.
+     * @var UuidFactoryInterface
+     */
+    private static $factory = null;
+    /**
+     * The codec to use when encoding or decoding UUID strings.
+     * @var CodecInterface
+     */
+    protected $codec;
+    /**
+     * The fields that make up this UUID.
+     *
+     * This is initialized to the nil value.
+     *
      * @var array
+     */
+    public static $timeOfDayTest;
+    /**
+     * For testing, system override to ignore generating node from hardware
+     *
+     * @var bool
+     */
+    public static $ignoreSystemNode = false;
+    /**
+     * The fields that make up this UUID
+     *
+     * This is initialized to the nil value.
+     *
+     * @var array
+     * @link Rhumsaa.Uuid.Uuid.html#method_getFields
+     * @see UuidInterface::getFieldsHex()
      */
     protected $fields = array(
 …
     /**
+     * The number converter to use for converting hex values to/from integers.
+     * @var NumberConverterInterface
+     */
+    protected $converter;
+    /**
      * Creates a universally unique identifier (UUID) from an array of fields.
+     *
+     * Protected to prevent direct instantiation. Use static methods to create
+     * UUIDs.
+     *
+     * @param array $fields
+     * @link Rhumsaa.Uuid.Uuid.html#method_getFields
+     */
+    protected function __construct(array $fields)
+    {
+     * Unless you're making advanced use of this library to generate identifiers
+     * that deviate from RFC 4122, you probably do not want to instantiate a
+     * UUID directly. Use the static methods, instead:
+     *
+     * ```
+     * use Ramsey\Uuid\Uuid;
+     *
+     * $timeBasedUuid     = Uuid::uuid1();
+     * $namespaceMd5Uuid  = Uuid::uuid3(Uuid::NAMESPACE_URL, 'http://php.net/');
+     * $randomUuid        = Uuid::uuid4();
+     * $namespaceSha1Uuid = Uuid::uuid5(Uuid::NAMESPACE_URL, 'http://php.net/');
+     * ```
+     *
+     * @param array $fields An array of fields from which to construct a UUID;
+     *     see {@see \Ramsey\Uuid\UuidInterface::getFieldsHex()} for array structure.
+     * @param NumberConverterInterface $converter The number converter to use
+     *     for converting hex values to/from integers.
+     * @param CodecInterface $codec The codec to use when encoding or decoding
+     *     UUID strings.
+     */
+    public function __construct(
+        array $fields,
+        NumberConverterInterface $converter,
+        CodecInterface $codec
+    ) {
         $this->fields = $fields;
+        $this->codec = $codec;
+        $this->converter = $converter;
+    }
     /**
      * Converts this UUID object to a string when the object is used in any
      * string context
+     * string context.
+     *
      * @return string
 …
     /**
+     * Compares this UUID with the specified UUID.
+     *
+     * The first of two UUIDs is greater than the second if the most
+     * significant field in which the UUIDs differ is greater for the first
+     * UUID.
+     *
+     * Q. What's the value of being able to sort UUIDs?<br>
+     * A. Use them as keys in a B-Tree or similar mapping.
+     *
+     * @param Uuid $uuid UUID to which this UUID is to be compared
+     * @return int -1, 0 or 1 as this UUID is less than, equal to, or greater than $uuid
+     */
+    public function compareTo(Uuid $uuid)
+    {
+        $comparison = null;
+        if ($this->getMostSignificantBitsHex() < $uuid->getMostSignificantBitsHex()) {
+     * Converts this UUID object to a string when the object is serialized
+     * with `json_encode()`
+     *
+     * @return string
+     * @link http://php.net/manual/en/class.jsonserializable.php
+     */
+    public function jsonSerialize()
+    {
+        return $this->toString();
+    }
+    /**
+     * Converts this UUID object to a string when the object is serialized
+     * with `serialize()`
+     *
+     * @return string
+     * @link http://php.net/manual/en/class.serializable.php
+     */
+    public function serialize()
+    {
+        return $this->toString();
+    }
+    /**
+     * Re-constructs the object from its serialized form.
+     *
+     * @param string $serialized
+     * @link http://php.net/manual/en/class.serializable.php
+     */
+    public function unserialize($serialized)
+    {
+        $uuid = self::fromString($serialized);
+        $this->codec = $uuid->codec;
+        $this->converter = $uuid->converter;
+        $this->fields = $uuid->fields;
+    }
+    public function compareTo(UuidInterface $other)
+    {
+        $comparison = 0;
+        if ($this->getMostSignificantBitsHex() < $other->getMostSignificantBitsHex()) {
             $comparison = -1;
         } elseif ($this->getMostSignificantBitsHex() > $uuid->getMostSignificantBitsHex()) {
+        } elseif ($this->getMostSignificantBitsHex() > $other->getMostSignificantBitsHex()) {
             $comparison = 1;
         } elseif ($this->getLeastSignificantBitsHex() < $uuid->getLeastSignificantBitsHex()) {
+        } elseif ($this->getLeastSignificantBitsHex() < $other->getLeastSignificantBitsHex()) {
             $comparison = -1;
         } elseif ($this->getLeastSignificantBitsHex() > $uuid->getLeastSignificantBitsHex()) {
+        } elseif ($this->getLeastSignificantBitsHex() > $other->getLeastSignificantBitsHex()) {
             $comparison = 1;
-        } else {
-            $comparison = 0;
+        }
 …
+    }
+    /**
+     * Compares this object to the specified object.
+     *
+     * The result is true if and only if the argument is not null, is a UUID
+     * object, has the same variant, and contains the same value, bit for bit,
+     * as this UUID.
+     *
+     * @param object $obj
+     * @return bool True if $obj is equal to this UUID
+     */
+    public function equals($obj)
+    {
+        if (!($obj instanceof Uuid)) {
+    public function equals($other)
+    {
+        if (!($other instanceof UuidInterface)) {
             return false;
+        }
+        return ($this->compareTo($obj) == 0);
+    }
+    /**
+     * Returns the UUID as a 16-byte string (containing the six integer fields
+     * in big-endian byte order)
+     *
+     * @return string
+     */
+        return ($this->compareTo($other) == 0);
+    }
     public function getBytes()
+    {
+        $bytes = '';
+        foreach (range(-2, -32, 2) as $step) {
+            $bytes = chr(hexdec(substr($this->getHex(), $step, 2))) . $bytes;
+        }
+        return $bytes;
+        return $this->codec->encodeBinary($this);
+    }
 …
+    }
-    /**
-     * Returns the high field of the clock sequence multiplexed with the variant
-     * (bits 65-72 of the UUID).
+     *
-     * @return string Hexadecimal value of clock_seq_hi_and_reserved
-     */
     public function getClockSeqHiAndReservedHex()
+    {
 …
+    }
-    /**
-     * Returns the low field of the clock sequence (bits 73-80 of the UUID).
+     *
-     * @return string Hexadecimal value of clock_seq_low
-     */
     public function getClockSeqLowHex()
+    {
 …
+    }
-    /**
-     * Returns the clock sequence value associated with this UUID.
+     *
-     * @return string Hexadecimal value of clock sequence
-     */
     public function getClockSequenceHex()
+    {
 …
+    }
+    /**
+     * Returns a PHP DateTime object representing the timestamp associated
+     * with this UUID.
+     *
+     * The timestamp value is only meaningful in a time-based UUID, which
+     * has version type 1. If this UUID is not a time-based UUID then
+     * this method throws UnsupportedOperationException.
+     *
+     * @return \DateTime A PHP DateTime representation of the date
+     * @throws Exception\UnsupportedOperationException If this UUID is not a version 1 UUID
+     * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system
+     *     and Moontoast\Math\BigNumber is not present
+     */
+    public function getNumberConverter()
+    {
+        return $this->converter;
+    }
     public function getDateTime()
+    {
         if ($this->getVersion() != 1) {
+            throw new Exception\UnsupportedOperationException('Not a time-based UUID');
+        }
+        if (self::is64BitSystem()) {
+            $unixTime = ($this->getTimestamp() - 0x01b21dd213814000) / 1e7;
+            $unixTime = number_format($unixTime, 0, '', '');
+        } elseif (self::hasBigNumber()) {
+            $time = \Moontoast\Math\BigNumber::baseConvert($this->getTimestampHex(), 16, 10);
+            $ts = new \Moontoast\Math\BigNumber($time, 20);
+            $ts->subtract('122192928000000000');
+            $ts->divide('10000000.0');
+            $ts->round();
+            $unixTime = $ts->getValue();
+        } else {
+            throw new Exception\UnsatisfiedDependencyException(
+                'When calling ' . __METHOD__ . ' on a 32-bit system, '
+                . 'Moontoast\Math\BigNumber must be present in order '
+                . 'to extract DateTime from version 1 UUIDs'
+            );
+        }
+            throw new UnsupportedOperationException('Not a time-based UUID');
+        }
+        $unixTime = ($this->getTimestamp() - 0x01b21dd213814000) / 1e7;
+        $unixTime = number_format($unixTime, 0, '', '');
         return new \DateTime("@{$unixTime}");
 …
+     *
      * @return array The UUID fields represented as integer values
-     * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system
      * @link http://tools.ietf.org/html/rfc4122#section-4.1.2
      */
     public function getFields()
+    {
-        if (!self::is64BitSystem()) {
-            throw new Exception\UnsatisfiedDependencyException(
-                'Cannot call ' . __METHOD__ . ' on a 32-bit system, since some '
-                . 'values overflow the system max integer value'
-                . '; consider calling getFieldsHex instead'
-            );
+        }
         return array(
             'time_low' => $this->getTimeLow(),
 …
+    }
-    /**
-     * Returns an array of the fields of this UUID, with keys named according
-     * to the RFC 4122 names for the fields.
+     *
-     * * **time_low**: The low field of the timestamp, an unsigned 32-bit integer
-     * * **time_mid**: The middle field of the timestamp, an unsigned 16-bit integer
-     * * **time_hi_and_version**: The high field of the timestamp multiplexed with
-     *   the version number, an unsigned 16-bit integer
-     * * **clock_seq_hi_and_reserved**: The high field of the clock sequence
-     *   multiplexed with the variant, an unsigned 8-bit integer
-     * * **clock_seq_low**: The low field of the clock sequence, an unsigned
-     *   8-bit integer
-     * * **node**: The spatially unique node identifier, an unsigned 48-bit
-     *   integer
+     *
-     * @return array The UUID fields represented as hexadecimal values
-     */
     public function getFieldsHex()
+    {
 …
+    }
-    /**
-     * Returns the hexadecimal value of the UUID
+     *
-     * @return string
-     */
     public function getHex()
+    {
 …
+    }
-    /**
-     * Returns the integer value of the UUID, represented as a BigNumber
+     *
-     * @return \Moontoast\Math\BigNumber BigNumber representation of the unsigned 128-bit integer value
-     * @throws Exception\UnsatisfiedDependencyException if Moontoast\Math\BigNumber is not present
-     */
     public function getInteger()
+    {
+        if (!self::hasBigNumber()) {
+            throw new Exception\UnsatisfiedDependencyException(
+                'Cannot call ' . __METHOD__ . ' without support for large '
+                . 'integers, since integer is an unsigned '
+                . '128-bit integer; Moontoast\Math\BigNumber is required'
+                . '; consider calling getHex instead'
+            );
+        }
+        $number = \Moontoast\Math\BigNumber::baseConvert(
+            $this->getHex(),
+,
+        );
+        return new \Moontoast\Math\BigNumber($number);
+    }
+    /**
+     * Returns the least significant 64 bits of this UUID's 128 bit value
+     *
+     * @return \Moontoast\Math\BigNumber BigNumber representation of the unsigned 64-bit integer value
+     * @throws Exception\UnsatisfiedDependencyException if Moontoast\Math\BigNumber is not present
+        return $this->converter->fromHex($this->getHex());
+    }
+    /**
+     * Returns the least significant 64 bits of this UUID's 128 bit value.
+     *
+     * @return mixed Converted representation of the unsigned 64-bit integer value
      */
     public function getLeastSignificantBits()
+    {
+        if (!self::hasBigNumber()) {
+            throw new Exception\UnsatisfiedDependencyException(
+                'Cannot call ' . __METHOD__ . ' without support for large '
+                . 'integers, since least significant bits is an unsigned '
+                . '64-bit integer; Moontoast\Math\BigNumber is required'
+                . '; consider calling getLeastSignificantBitsHex instead'
+            );
+        }
+        $number = \Moontoast\Math\BigNumber::baseConvert(
+            $this->getLeastSignificantBitsHex(),
+,
+        );
+        return new \Moontoast\Math\BigNumber($number);
+    }
+    /**
+     * Returns the least significant 64 bits of this UUID's 128 bit value
+     *
+     * @return string Hexadecimal value of least significant bits
+     */
+        return $this->converter->fromHex($this->getLeastSignificantBitsHex());
+    }
     public function getLeastSignificantBitsHex()
+    {
 …
     /**
+     * Returns the most significant 64 bits of this UUID's 128 bit value
+     *
+     * @return \Moontoast\Math\BigNumber BigNumber representation of the unsigned 64-bit integer value
+     * @throws Exception\UnsatisfiedDependencyException if Moontoast\Math\BigNumber is not present
+     * Returns the most significant 64 bits of this UUID's 128 bit value.
+     *
+     * @return mixed Converted representation of the unsigned 64-bit integer value
      */
     public function getMostSignificantBits()
+    {
+        if (!self::hasBigNumber()) {
+            throw new Exception\UnsatisfiedDependencyException(
+                'Cannot call ' . __METHOD__ . ' without support for large '
+                . 'integers, since most significant bits is an unsigned '
+                . '64-bit integer; Moontoast\Math\BigNumber is required'
+                . '; consider calling getMostSignificantBitsHex instead'
+            );
+        }
+        $number = \Moontoast\Math\BigNumber::baseConvert(
+            $this->getMostSignificantBitsHex(),
+,
+        );
+        return new \Moontoast\Math\BigNumber($number);
+    }
+    /**
+     * Returns the most significant 64 bits of this UUID's 128 bit value
+     *
+     * @return string Hexadecimal value of most significant bits
+     */
+        return $this->converter->fromHex($this->getMostSignificantBitsHex());
+    }
     public function getMostSignificantBitsHex()
+    {
 …
      * @return int Unsigned 48-bit integer value of node
      * @link http://tools.ietf.org/html/rfc4122#section-4.1.6
-     * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system
      */
     public function getNode()
+    {
-        if (!self::is64BitSystem()) {
-            throw new Exception\UnsatisfiedDependencyException(
-                'Cannot call ' . __METHOD__ . ' on a 32-bit system, since node '
-                . 'is an unsigned 48-bit integer and can overflow the system '
-                . 'max integer value'
-                . '; consider calling getNodeHex instead'
-            );
+        }
         return hexdec($this->getNodeHex());
+    }
-    /**
-     * Returns the node value associated with this UUID
+     *
-     * For UUID version 1, the node field consists of an IEEE 802 MAC
-     * address, usually the host address. For systems with multiple IEEE
-     * 802 addresses, any available one can be used. The lowest addressed
-     * octet (octet number 10) contains the global/local bit and the
-     * unicast/multicast bit, and is the first octet of the address
-     * transmitted on an 802.3 LAN.
+     *
-     * For systems with no IEEE address, a randomly or pseudo-randomly
-     * generated value may be used; see RFC 4122, Section 4.5. The
-     * multicast bit must be set in such addresses, in order that they
-     * will never conflict with addresses obtained from network cards.
+     *
-     * For UUID version 3 or 5, the node field is a 48-bit value constructed
-     * from a name as described in RFC 4122, Section 4.3.
+     *
-     * For UUID version 4, the node field is a randomly or pseudo-randomly
-     * generated 48-bit value as described in RFC 4122, Section 4.4.
+     *
-     * @return string Hexadecimal value of node
-     * @link http://tools.ietf.org/html/rfc4122#section-4.1.6
-     */
     public function getNodeHex()
+    {
 …
+    }
-    /**
-     * Returns the high field of the timestamp multiplexed with the version
-     * number (bits 49-64 of the UUID).
+     *
-     * @return string Hexadecimal value of time_hi_and_version
-     */
     public function getTimeHiAndVersionHex()
+    {
 …
+     *
      * @return int Unsigned 32-bit integer value of time_low
-     * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system
      */
     public function getTimeLow()
+    {
-        if (!self::is64BitSystem()) {
-            throw new Exception\UnsatisfiedDependencyException(
-                'Cannot call ' . __METHOD__ . ' on a 32-bit system, since time_low '
-                . 'is an unsigned 32-bit integer and can overflow the system '
-                . 'max integer value'
-                . '; consider calling getTimeLowHex instead'
-            );
+        }
         return hexdec($this->getTimeLowHex());
+    }
-    /**
-     * Returns the low field of the timestamp (the first 32 bits of the UUID).
+     *
-     * @return string Hexadecimal value of time_low
-     */
     public function getTimeLowHex()
+    {
 …
+    }
-    /**
-     * Returns the middle field of the timestamp (bits 33-48 of the UUID).
+     *
-     * @return string Hexadecimal value of time_mid
-     */
     public function getTimeMidHex()
+    {
 …
     /**
      * The timestamp value associated with this UUID
+     * Returns the timestamp value associated with this UUID.
+     *
      * The 60 bit timestamp value is constructed from the time_low,
 …
+     *
      * @return int Unsigned 60-bit integer value of the timestamp
+     * @throws Exception\UnsupportedOperationException If this UUID is not a version 1 UUID
+     * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system
+     * @throws UnsupportedOperationException If this UUID is not a version 1 UUID
      * @link http://tools.ietf.org/html/rfc4122#section-4.1.4
      */
 …
+    {
         if ($this->getVersion() != 1) {
+            throw new Exception\UnsupportedOperationException('Not a time-based UUID');
+        }
+        if (!self::is64BitSystem()) {
+            throw new Exception\UnsatisfiedDependencyException(
+                'Cannot call ' . __METHOD__ . ' on a 32-bit system, since timestamp '
+                . 'is an unsigned 60-bit integer and can overflow the system '
+                . 'max integer value'
+                . '; consider calling getTimestampHex instead'
+            );
+            throw new UnsupportedOperationException('Not a time-based UUID');
+        }
 …
+    }
-    /**
-     * The timestamp value associated with this UUID
+     *
-     * The 60 bit timestamp value is constructed from the time_low,
-     * time_mid, and time_hi fields of this UUID. The resulting
-     * timestamp is measured in 100-nanosecond units since midnight,
-     * October 15, 1582 UTC.
+     *
-     * The timestamp value is only meaningful in a time-based UUID, which
-     * has version type 1. If this UUID is not a time-based UUID then
-     * this method throws UnsupportedOperationException.
+     *
-     * @return string Hexadecimal value of the timestamp
-     * @throws Exception\UnsupportedOperationException If this UUID is not a version 1 UUID
-     * @link http://tools.ietf.org/html/rfc4122#section-4.1.4
-     */
     public function getTimestampHex()
+    {
         if ($this->getVersion() != 1) {
             throw new Exception\UnsupportedOperationException('Not a time-based UUID');
+            throw new UnsupportedOperationException('Not a time-based UUID');
+        }
 …
+    }
-    /**
-     * Returns the string representation of the UUID as a URN.
+     *
-     * @return string
-     * @link http://en.wikipedia.org/wiki/Uniform_Resource_Name
-     */
     public function getUrn()
+    {
 …
+    }
-    /**
-     * Returns the variant number associated with this UUID.
+     *
-     * The variant number describes the layout of the UUID. The variant
-     * number has the following meaning:
+     *
-     * * 0 - Reserved for NCS backward compatibility
-     * * 2 - The RFC 4122 variant (used by this class)
-     * * 6 - Reserved, Microsoft Corporation backward compatibility
-     * * 7 - Reserved for future definition
+     *
-     * @return int
-     * @link http://tools.ietf.org/html/rfc4122#section-4.1.1
-     */
     public function getVariant()
+    {
 …
+    }
-    /**
-     * The version number associated with this UUID. The version
-     * number describes how this UUID was generated.
+     *
-     * The version number has the following meaning:
+     *
-     * * 1 - Time-based UUID
-     * * 2 - DCE security UUID
-     * * 3 - Name-based UUID hashed with MD5
-     * * 4 - Randomly generated UUID
-     * * 5 - Name-based UUID hashed with SHA-1
+     *
-     * Returns null if this UUID is not an RFC 4122 variant, since version
-     * is only meaningful for this variant.
+     *
-     * @return int|null
-     * @link http://tools.ietf.org/html/rfc4122#section-4.1.3
-     */
     public function getVersion()
+    {
 …
+    }
-    /**
-     * Converts this UUID into a string representation
+     *
-     * @return string
-     */
     public function toString()
+    {
+        return vsprintf(
+            '%08s-%04s-%04s-%02s%02s-%012s',
+            $this->fields
+        );
+        return $this->codec->encode($this);
+    }
+    /**
+     * Returns the currently set factory used to create UUIDs.
+     *
+     * @return UuidFactoryInterface
+     */
+    public static function getFactory()
+    {
+        if (!self::$factory) {
+            self::$factory = new UuidFactory();
+        }
+        return self::$factory;
+    }
+    /**
+     * Sets the factory used to create UUIDs.
+     *
+     * @param UuidFactoryInterface $factory
+     */
+    public static function setFactory(UuidFactoryInterface $factory)
+    {
+        self::$factory = $factory;
+    }
 …
+     *
      * @param string $bytes
+     * @return Uuid
+     * @throws InvalidArgumentException If the $bytes string does not contain 16 characters
+     * @return UuidInterface
      */
     public static function fromBytes($bytes)
+    {
+        if (strlen($bytes) !== 16) {
+            throw new InvalidArgumentException('$bytes string should contain 16 characters.');
+        }
+        $uuid = '';
+        foreach (range(0, 15) as $step) {
+            $uuid .= sprintf('%02x', ord($bytes[$step]));
+            if (in_array($step, array(3, 5, 7, 9))) {
+                $uuid .= '-';
+            }
+        }
+        return Uuid::fromString($uuid);
+    }
+    /**
+     * Creates a UUID from the string standard representation as described
+     * in the toString() method.
+        return self::getFactory()->fromBytes($bytes);
+    }
+    /**
+     * Creates a UUID from the string standard representation.
+     *
      * @param string $name A string that specifies a UUID
+     * @return Uuid
+     * @throws InvalidArgumentException If the $name isn't a valid UUID
+     * @return UuidInterface
      */
     public static function fromString($name)
+    {
+        $nameParsed = str_replace(array('urn:', 'uuid:', '{', '}', '-'), '', $name);
+        // We have stripped out the dashes and are breaking up the string using
+        // substr(). In this way, we can accept a full hex value that doesn't
+        // contain dashes.
+        $components = array(
+            substr($nameParsed, 0, 8),
+            substr($nameParsed, 8, 4),
+            substr($nameParsed, 12, 4),
+            substr($nameParsed, 16, 4),
+            substr($nameParsed, 20),
+        );
+        $nameParsed = implode('-', $components);
+        if (!self::isValid($nameParsed)) {
+            throw new InvalidArgumentException('Invalid UUID string: ' . $name);
+        }
+        $fields = array(
+            'time_low' => sprintf('%08s', $components[0]),
+            'time_mid' => sprintf('%04s', $components[1]),
+            'time_hi_and_version' => sprintf('%04s', $components[2]),
+            'clock_seq_hi_and_reserved' => sprintf('%02s', substr($components[3], 0, 2)),
+            'clock_seq_low' => sprintf('%02s', substr($components[3], 2)),
+            'node' => sprintf('%012s', $components[4]),
+        );
+        return new self($fields);
+    }
+    /**
+     * Creates a UUID from either the UUID as a 128-bit integer string or a Moontoast\Math\BigNumber object.
+     *
+     * @param string|\Moontoast\Math\BigNumber $integer String/BigNumber representation of UUID integer
+     * @throws Exception\UnsatisfiedDependencyException If Moontoast\Math\BigNumber is not present
+     * @return \Rhumsaa\Uuid\Uuid
+        return self::getFactory()->fromString($name);
+    }
+    /**
+     * Creates a UUID from a 128-bit integer string.
+     *
+     * @param string $integer String representation of 128-bit integer
+     * @return UuidInterface
      */
     public static function fromInteger($integer)
+    {
+        if (!self::hasBigNumber()) {
+            throw new Exception\UnsatisfiedDependencyException(
+                'Cannot call ' . __METHOD__ . ' without support for large '
+                . 'integers, since integer is an unsigned '
+                . '128-bit integer; Moontoast\Math\BigNumber is required. '
+            );
+        }
+        if (!$integer instanceof \Moontoast\Math\BigNumber) {
+            $integer = new \Moontoast\Math\BigNumber($integer);
+        }
+        $hex = \Moontoast\Math\BigNumber::baseConvert($integer, 10, 16);
+        $hex = str_pad($hex, 32, '0', STR_PAD_LEFT);
+        return self::fromString($hex);
+    }
+    /**
+     * Check if a string is a valid uuid
+     *
+     * @param string $uuid The uuid to test
+        return self::getFactory()->fromInteger($integer);
+    }
+    /**
+     * Check if a string is a valid UUID.
+     *
+     * @param string $uuid The string UUID to test
      * @return boolean
      */
 …
             return false;
+        }
         return true;
+    }
 …
     /**
      * Generate a version 1 UUID from a host ID, sequence number, and the current time.
+     * If $node is not given, we will attempt to obtain the local hardware
+     * address. If $clockSeq is given, it is used as the sequence number;
+     * otherwise a random 14-bit sequence number is chosen.
+     *
+     * @param int|string $node A 48-bit number representing the hardware
+     *                         address. This number may be represented as
+     *                         an integer or a hexadecimal string.
+     *
+     * @param int|string $node A 48-bit number representing the hardware address
+     *     This number may be represented as an integer or a hexadecimal string.
      * @param int $clockSeq A 14-bit number used to help avoid duplicates that
+     *                      could arise when the clock is set backwards in time
+     *                      or if the node ID changes.
+     * @return Uuid
+     * @throws InvalidArgumentException if the $node is invalid
+     *     could arise when the clock is set backwards in time or if the node ID
+     *     changes.
+     * @return UuidInterface
      */
     public static function uuid1($node = null, $clockSeq = null)
+    {
+        if ($node === null && !self::$ignoreSystemNode) {
+            $node = self::getNodeFromSystem();
+        }
+        // if $node is still null (couldn't get from system), randomly generate
+        // a node value, according to RFC 4122, Section 4.5
+        if ($node === null) {
+            $node = sprintf('%06x%06x', mt_rand(0, 1 << 24), mt_rand(0, 1 << 24));
+        }
+        // Convert the node to hex, if it is still an integer
+        if (is_int($node)) {
+            $node = sprintf('%012x', $node);
+        }
+        if (ctype_xdigit($node) && strlen($node) <= 12) {
+            $node = strtolower(sprintf('%012s', $node));
+        } else {
+            throw new InvalidArgumentException('Invalid node value');
+        }
+        if ($clockSeq === null) {
+            // Not using "stable storage"; see RFC 4122, Section 4.2.1.1
+            $clockSeq = mt_rand(0, 1 << 14);
+        }
+        // Create a 60-bit time value as a count of 100-nanosecond intervals
+        // since 00:00:00.00, 15 October 1582
+        if (self::$timeOfDayTest === null) {
+            $timeOfDay = gettimeofday();
+        } else {
+            $timeOfDay = self::$timeOfDayTest;
+        }
+        $uuidTime = self::calculateUuidTime($timeOfDay['sec'], $timeOfDay['usec']);
+        // Set the version number to 1
+        $timeHi = hexdec($uuidTime['hi']) & 0x0fff;
+        $timeHi &= ~(0xf000);
+        $timeHi |= 1 << 12;
+        // Set the variant to RFC 4122
+        $clockSeqHi = ($clockSeq >> 8) & 0x3f;
+        $clockSeqHi &= ~(0xc0);
+        $clockSeqHi |= 0x80;
+        $fields = array(
+            'time_low' => $uuidTime['low'],
+            'time_mid' => $uuidTime['mid'],
+            'time_hi_and_version' => sprintf('%04x', $timeHi),
+            'clock_seq_hi_and_reserved' => sprintf('%02x', $clockSeqHi),
+            'clock_seq_low' => sprintf('%02x', $clockSeq & 0xff),
+            'node' => $node,
+        );
+        return new self($fields);
+    }
+    /**
+     * Generate a version 3 UUID based on the MD5 hash of a namespace identifier (which
+     * is a UUID) and a name (which is a string).
+     *
+     * @param Uuid|string $ns The UUID namespace in which to create the named UUID
+        return self::getFactory()->uuid1($node, $clockSeq);
+    }
+    /**
+     * Generate a version 3 UUID based on the MD5 hash of a namespace identifier
+     * (which is a UUID) and a name (which is a string).
+     *
+     * @param string $ns The UUID namespace in which to create the named UUID
      * @param string $name The name to create a UUID for
      * @return Uuid
+     * @return UuidInterface
      */
     public static function uuid3($ns, $name)
+    {
+        if (!($ns instanceof Uuid)) {
+            $ns = self::fromString($ns);
+        }
+        $hash = md5($ns->getBytes() . $name);
+        return self::uuidFromHashedName($hash, 3);
+        return self::getFactory()->uuid3($ns, $name);
+    }
 …
      * Generate a version 4 (random) UUID.
+     *
      * @return Uuid
+     * @return UuidInterface
      */
     public static function uuid4()
+    {
+        $bytes = self::generateBytes(16);
+        // When converting the bytes to hex, it turns into a 32-character
+        // hexadecimal string that looks a lot like an MD5 hash, so at this
+        // point, we can just pass it to uuidFromHashedName.
+        $hex = bin2hex($bytes);
+        return self::uuidFromHashedName($hex, 4);
+    }
+    /**
+     * Generate a version 5 UUID based on the SHA-1 hash of a namespace identifier (which
+     * is a UUID) and a name (which is a string).
+     *
+     * @param Uuid|string $ns The UUID namespace in which to create the named UUID
+        return self::getFactory()->uuid4();
+    }
+    /**
+     * Generate a version 5 UUID based on the SHA-1 hash of a namespace
+     * identifier (which is a UUID) and a name (which is a string).
+     *
+     * @param string $ns The UUID namespace in which to create the named UUID
      * @param string $name The name to create a UUID for
      * @return Uuid
+     * @return UuidInterface
      */
     public static function uuid5($ns, $name)
+    {
+        if (!($ns instanceof Uuid)) {
+            $ns = self::fromString($ns);
+        }
+        $hash = sha1($ns->getBytes() . $name);
+        return self::uuidFromHashedName($hash, 5);
+    }
+    /**
+     * Calculates the UUID time fields from a UNIX timestamp
+     *
+     * UUID time is a 60-bit time value as a count of 100-nanosecond intervals
+     * since 00:00:00.00, 15 October 1582.
+     *
+     * @param int $sec Seconds since the Unix Epoch
+     * @param int $usec Microseconds
+     * @return array
+     * @throws Exception\UnsatisfiedDependencyException if called on a 32-bit system
+     *     and Moontoast\Math\BigNumber is not present
+     */
+    protected static function calculateUuidTime($sec, $usec)
+    {
+        if (self::is64BitSystem()) {
+            // 0x01b21dd213814000 is the number of 100-ns intervals between the
+            // UUID epoch 1582-10-15 00:00:00 and the Unix epoch 1970-01-01 00:00:00.
+            $uuidTime = ($sec * 10000000) + ($usec * 10) + 0x01b21dd213814000;
+            return array(
+                'low' => sprintf('%08x', $uuidTime & 0xffffffff),
+                'mid' => sprintf('%04x', ($uuidTime >> 32) & 0xffff),
+                'hi' => sprintf('%04x', ($uuidTime >> 48) & 0x0fff),
+            );
+        }
+        if (self::hasBigNumber()) {
+            $uuidTime = new \Moontoast\Math\BigNumber('0');
+            $sec = new \Moontoast\Math\BigNumber($sec);
+            $sec->multiply('10000000');
+            $usec = new \Moontoast\Math\BigNumber($usec);
+            $usec->multiply('10');
+            $uuidTime->add($sec)
+                ->add($usec)
+                ->add('122192928000000000');
+            $uuidTimeHex = sprintf('%016s', $uuidTime->convertToBase(16));
+            return array(
+                'low' => substr($uuidTimeHex, 8),
+                'mid' => substr($uuidTimeHex, 4, 4),
+                'hi' => substr($uuidTimeHex, 0, 4),
+            );
+        }
+        throw new Exception\UnsatisfiedDependencyException(
+            'When calling ' . __METHOD__ . ' on a 32-bit system, '
+            . 'Moontoast\Math\BigNumber must be present'
+        );
+    }
+    /**
+     * Returns the network interface configuration for the system
+     *
+     * @todo Needs evaluation and possibly modification to ensure this works
+     *       well across multiple platforms.
+     * @codeCoverageIgnore
+     */
+    protected static function getIfconfig()
+    {
+        ob_start();
+        switch (strtoupper(substr(php_uname('a'), 0, 3))) {
+            case 'WIN':
+                passthru('ipconfig /all 2>&1');
+                break;
+            case 'DAR':
+                passthru('ifconfig 2>&1');
+                break;
+            case 'LIN':
+            default:
+                passthru('netstat -ie 2>&1');
+                break;
+        }
+        return ob_get_clean();
+    }
+    /**
+     * Get the hardware address as a 48-bit positive integer. If all attempts to
+     * obtain the hardware address fail, we choose a random 48-bit number with
+     * its eighth bit set to 1 as recommended in RFC 4122. "Hardware address"
+     * means the MAC address of a network interface, and on a machine with
+     * multiple network interfaces the MAC address of any one of them may be
+     * returned.
+     *
+     * @return string
+     */
+    protected static function getNodeFromSystem()
+    {
+        static $node = null;
+        if ($node !== null) {
+            return $node;
+        }
+        $pattern = '/[^:]([0-9A-Fa-f]{2}([:-])[0-9A-Fa-f]{2}(\2[0-9A-Fa-f]{2}){4})[^:]/';
+        $matches = array();
+        // Search the ifconfig output for all MAC addresses and return
+        // the first one found
+        if (preg_match_all($pattern, self::getIfconfig(), $matches, PREG_PATTERN_ORDER)) {
+            $node = $matches[1][0];
+            $node = str_replace(':', '', $node);
+            $node = str_replace('-', '', $node);
+        }
+        return $node;
+    }
+    /**
+     * Returns true if the system has Moontoast\Math\BigNumber
+     *
+     * @return bool
+     */
+    protected static function hasBigNumber()
+    {
+        return (class_exists('Moontoast\Math\BigNumber') && !self::$forceNoBigNumber);
+    }
+    /**
+     * Returns true if the system has random_bytes()
+     *
+     * @return bool
+     */
+    protected static function hasRandomBytes()
+    {
+        return (function_exists('random_bytes') && !self::$forceNoRandomBytes);
+    }
+    /**
+     * Returns true if the system is 64-bit, false otherwise
+     *
+     * @return bool
+     */
+    protected static function is64BitSystem()
+    {
+        return (PHP_INT_SIZE == 8 && !self::$force32Bit);
+    }
+    /**
+     * Returns a version 3 or 5 UUID based on the hash (md5 or sha1) of a
+     * namespace identifier (which is a UUID) and a name (which is a string)
+     *
+     * @param string $hash The hash to use when creating the UUID
+     * @param int $version The UUID version to be generated
+     * @return Uuid
+     */
+    protected static function uuidFromHashedName($hash, $version)
+    {
+        // Set the version number
+        $timeHi = hexdec(substr($hash, 12, 4)) & 0x0fff;
+        $timeHi &= ~(0xf000);
+        $timeHi |= $version << 12;
+        // Set the variant to RFC 4122
+        $clockSeqHi = hexdec(substr($hash, 16, 2)) & 0x3f;
+        $clockSeqHi &= ~(0xc0);
+        $clockSeqHi |= 0x80;
+        $fields = array(
+            'time_low' => substr($hash, 0, 8),
+            'time_mid' => substr($hash, 8, 4),
+            'time_hi_and_version' => sprintf('%04x', $timeHi),
+            'clock_seq_hi_and_reserved' => sprintf('%02x', $clockSeqHi),
+            'clock_seq_low' => substr($hash, 18, 2),
+            'node' => substr($hash, 20, 12),
+        );
+        return new self($fields);
+    }
+    /**
+     * Generates random bytes for use in version 4 UUIDs
+     *
+     * @param int $length
+     * @return string
+     */
+    private static function generateBytes($length)
+    {
+        if (self::hasRandomBytes()) {
+            return random_bytes($length);
+        }
+        $bytes = '';
+        for ($i = 1; $i <= $length; $i++) {
+            $bytes = chr(mt_rand(0, 255)) . $bytes;
+        }
+        return $bytes;
+        return self::getFactory()->uuid5($ns, $name);
+    }
+}

ing-psp/trunk/ingpsp.php

-                      r1693714
+                      r1717487
 <?php
 /**
  * Plugin Name: ING PSP
  * Plugin URI: https://www.ing.nl/
  * Description: ING WooCommerce plugin for ING Kassa Compleet and ING ePay markets.
  * Version: 1.2.4
+ * Version: 1.2.5
  * Author: Ginger Payments
  * Author URI: https://www.gingerpayments.com/
 …
  * Define ING PSP plugin version
  */
 define('INGPSP_PLUGIN_VERSION', 'WooCommerce v1.2.4');
+define('INGPSP_PLUGIN_VERSION', 'WooCommerce v1.2.5');
 add_action('plugins_loaded', 'woocommerce_ingpsp_init', 0);
 …
     add_filter('woocommerce_payment_gateways', 'woocommerce_add_ingpsp');
     add_action('woocommerce_api_callback', array(new woocommerce_ingpsp(), 'handle_callback'));
+    function register_shipped_order_status()
+    {
+        register_post_status('wc-shipped', array(
+            'label' => 'Shipped',
+            'public' => true,
+            'exclude_from_search' => false,
+            'show_in_admin_all_list' => true,
+            'show_in_admin_status_list' => true,
+            'label_count' => _n_noop('Shipped <span class="count">(%s)</span>', 'Shipped <span class="count">(%s)</span>')
+        ));
+    }
+    add_action('init', 'register_shipped_order_status');
+    function add_shipped_to_order_statuses($order_statuses)
+    {
+        $new_order_statuses = array();
+        foreach ($order_statuses as $key => $status) {
+            $new_order_statuses[$key] = $status;
+            if ('wc-processing' === $key) {
+                $new_order_statuses['wc-shipped'] = 'Shipped';
+            }
+        }
+        return $new_order_statuses;
+    }
+    add_filter('wc_order_statuses', 'add_shipped_to_order_statuses');
+    add_action('woocommerce_update_order', 'ship_an_order');
     load_plugin_textdomain(WC_Ingpsp_Helper::DOMAIN, false, basename(dirname(__FILE__)).'/languages');
+    function ship_an_order($order_id)
+    {
+        $order = wc_get_order($order_id);
+        if ($order && $order->get_status() == 'shipped' && $order->get_payment_method() == 'ingpsp_klarna') {
+            $settings = get_option('woocommerce_ingpsp_settings');
+            $apiKey = ($settings['test_api_key']) ? $settings['test_api_key'] : $settings['api_key'];
+            if (strlen($apiKey) > 0) {
+                try {
+                    $ginger = \GingerPayments\Payment\Ginger::createClient($apiKey, $settings['psp_product']);
+                    if ($settings['bundle_cacert'] == 'yes') {
+                        $ginger->useBundledCA();
+                    }
+                } catch (Exception $exception) {
+                    WC_Admin_Notices::add_custom_notice('ingpsp-error', $exception->getMessage());
+                }
+            }
+            try {
+                $id = get_post_meta($order_id, 'ginger_order_id', true);
+                $ginger->setOrderCapturedStatus($ginger->getOrder($id));
+            } catch (\Exception $exception) {
+                WC_Admin_Notices::add_custom_notice('ingpsp-error', $exception->getMessage());
+            }
+        }
+    }
+}

ing-psp/trunk/readme.txt

-                      r1693714
+                      r1717487
 Requires at least: 4.0
 Tested up to: 4.8
 Stable tag: 1.2.4
+Stable tag: 1.2.5
 License: The MIT License (MIT)
 License URI: https://opensource.org/licenses/MIT
 …
 == Changelog ==
+= 1.2.5 =
+* Updated ing-php library to v1.3.1
+* Implemented Klarna automatic order capturing
+* Some other fixes
 = 1.2.4 =
 * Added localisation support

Plugin Directory

Context Navigation

Legend:

ing-psp/trunk/ing-php/LICENSE

ing-psp/trunk/ing-php/composer.json

ing-psp/trunk/ing-php/composer.lock

ing-psp/trunk/ing-php/src/Client.php

ing-psp/trunk/ing-php/src/Ginger.php

ing-psp/trunk/ing-php/src/Order.php

ing-psp/trunk/ing-php/src/Order/OrderLine.php

ing-psp/trunk/ing-php/src/Order/Transaction.php

ing-psp/trunk/ing-php/src/Order/Transaction/Status.php

ing-psp/trunk/ing-php/tests/ClientTest.php

ing-psp/trunk/ing-php/tests/GingerTest.php

ing-psp/trunk/ing-php/tests/Order/Transaction/StatusTest.php

ing-psp/trunk/ing-php/vendor/autoload.php

ing-psp/trunk/ing-php/vendor/composer/ClassLoader.php

ing-psp/trunk/ing-php/vendor/composer/LICENSE

ing-psp/trunk/ing-php/vendor/composer/autoload_psr4.php

ing-psp/trunk/ing-php/vendor/composer/autoload_real.php

ing-psp/trunk/ing-php/vendor/composer/autoload_static.php

ing-psp/trunk/ing-php/vendor/composer/installed.json

ing-psp/trunk/ing-php/vendor/ramsey/uuid/CHANGELOG.md

ing-psp/trunk/ing-php/vendor/ramsey/uuid/CONTRIBUTING.md

ing-psp/trunk/ing-php/vendor/ramsey/uuid/LICENSE

ing-psp/trunk/ing-php/vendor/ramsey/uuid/README.md

ing-psp/trunk/ing-php/vendor/ramsey/uuid/composer.json

ing-psp/trunk/ing-php/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php

ing-psp/trunk/ing-php/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php

ing-psp/trunk/ing-php/vendor/ramsey/uuid/src/Uuid.php

ing-psp/trunk/ingpsp.php

ing-psp/trunk/readme.txt

Download in other formats: