From 69005ad61b45a0763ef195db7b3a66eae1105555 Mon Sep 17 00:00:00 2001 From: "J. King" Date: Sat, 22 Jul 2017 23:18:42 -0400 Subject: [PATCH] Remove dependency on DrUUID until it's actually used --- composer.json | 2 - composer.lock | 139 +------------------------------------- lib/Db/AbstractDriver.php | 1 - 3 files changed, 1 insertion(+), 141 deletions(-) diff --git a/composer.json b/composer.json index 776ba959..d30f2153 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,6 @@ "ext-json": "*", "ext-hash": "*", "fguillot/picofeed": ">=0.1.31", - "jkingweb/druuid": "^3.0.0", - "phpseclib/phpseclib": "^2.0", "hosteurope/password-generator": "^1.0", "docopt/docopt": "^1.0" }, diff --git a/composer.lock b/composer.lock index 8553bd56..6a219860 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "360a767ae23dbd1b702c1b3b8b08b683", + "content-hash": "9b78e0506c2f21f63849711a86b275cb", "packages": [ { "name": "docopt/docopt", @@ -145,143 +145,6 @@ "description": "Password generator for generating policy-compliant passwords.", "time": "2016-12-08T09:32:12+00:00" }, - { - "name": "jkingweb/druuid", - "version": "3.0.0", - "source": { - "type": "git", - "url": "https://github.com/JKingweb/DrUUID.git", - "reference": "ca88019069f03ee9c0b1bb6b0200f421bbc9607e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JKingweb/DrUUID/zipball/ca88019069f03ee9c0b1bb6b0200f421bbc9607e", - "reference": "ca88019069f03ee9c0b1bb6b0200f421bbc9607e", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "suggest": { - "ext-bcmath": "Supported alternative to GMP on 32-bit systems", - "ext-gmp": "Recommended on 32-bit installations for time-base UUIDs", - "phpseclib/phpseclib": "Supported alternative to GMP or BC Math on 32-bit systems (either v1.x or v2.x)" - }, - "type": "library", - "autoload": { - "psr-4": { - "JKingWeb\\DrUUID\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "J. King", - "email": "jking@jkingweb.ca", - "homepage": "https://jkingweb.ca/" - } - ], - "description": "DrUUID RFC 4122 library for PHP", - "keywords": [ - "uuid" - ], - "time": "2017-02-09T14:17:01+00:00" - }, - { - "name": "phpseclib/phpseclib", - "version": "2.0.6", - "source": { - "type": "git", - "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "34a7699e6f31b1ef4035ee36444407cecf9f56aa" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34a7699e6f31b1ef4035ee36444407cecf9f56aa", - "reference": "34a7699e6f31b1ef4035ee36444407cecf9f56aa", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phing/phing": "~2.7", - "phpunit/phpunit": "~4.0", - "sami/sami": "~2.0", - "squizlabs/php_codesniffer": "~2.0" - }, - "suggest": { - "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", - "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", - "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", - "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations." - }, - "type": "library", - "autoload": { - "files": [ - "phpseclib/bootstrap.php" - ], - "psr-4": { - "phpseclib\\": "phpseclib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jim Wigginton", - "email": "terrafrost@php.net", - "role": "Lead Developer" - }, - { - "name": "Patrick Monnerat", - "email": "pm@datasphere.ch", - "role": "Developer" - }, - { - "name": "Andreas Fischer", - "email": "bantu@phpbb.com", - "role": "Developer" - }, - { - "name": "Hans-Jürgen Petrich", - "email": "petrich@tronic-media.com", - "role": "Developer" - }, - { - "name": "Graham Campbell", - "email": "graham@alt-three.com", - "role": "Developer" - } - ], - "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", - "homepage": "http://phpseclib.sourceforge.net", - "keywords": [ - "BigInteger", - "aes", - "asn.1", - "asn1", - "blowfish", - "crypto", - "cryptography", - "encryption", - "rsa", - "security", - "sftp", - "signature", - "signing", - "ssh", - "twofish", - "x.509", - "x509" - ], - "time": "2017-06-05T06:31:10+00:00" - }, { "name": "zendframework/zendxml", "version": "1.0.2", diff --git a/lib/Db/AbstractDriver.php b/lib/Db/AbstractDriver.php index 96d1aa7f..e8d1cc14 100644 --- a/lib/Db/AbstractDriver.php +++ b/lib/Db/AbstractDriver.php @@ -1,7 +1,6 @@