diff --git a/.gitignore b/.gitignore
index ccee4e13d113be1f96a4ab108233c83907912dde..57872d0f1e5f46731396e93c4e22b149809798f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
/vendor/
-/hyperdb/
diff --git a/composer.json b/composer.json
index dda995133ece7c9e5a3dc05f48afa5c17c350768..8ef2ef5ceb23c442832c7db806832ef345631c6c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,28 +1,15 @@
{
"name": "lucha/r2db",
"description": "r2db wordpress database",
- "type": "libray",
+ "type": "wordpress-plugin",
"license": "MIT",
"authors": [
{
"name": "lucha",
"email": "lucha@paranoici.org"
}
- ],
- "repositories": [
- {
- "type": "composer",
- "url" : "https://wpackagist.org"
- }
- ],
+ ],
"require": {
- "flexihash/flexihash": "^2.0",
- "wpackagist-plugin/hyperdb": "^1.6",
- "composer/installers": "^1.9"
- },
- "extra": {
- "installer-paths": {
- "hyperdb": ["wpackagist-plugin/hyperdb"]
- }
- }
+ "flexihash/flexihash": "^2.0"
+ }
}
diff --git a/composer.lock b/composer.lock
index 7ff6da461789c12462c1ef4129955615b9d33ef4..7b22d3a8847cc570257319947eb256f5445d9bd8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,135 +4,8 @@
"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": "969ecb964c3720238fbd1b5024615354",
+ "content-hash": "e52daa25e1055468071907a620892779",
"packages": [
- {
- "name": "composer/installers",
- "version": "v1.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/composer/installers.git",
- "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/composer/installers/zipball/b93bcf0fa1fccb0b7d176b0967d969691cd74cca",
- "reference": "b93bcf0fa1fccb0b7d176b0967d969691cd74cca",
- "shasum": ""
- },
- "require": {
- "composer-plugin-api": "^1.0 || ^2.0"
- },
- "replace": {
- "roundcube/plugin-installer": "*",
- "shama/baton": "*"
- },
- "require-dev": {
- "composer/composer": "1.6.* || 2.0.*@dev",
- "composer/semver": "1.0.* || 2.0.*@dev",
- "phpunit/phpunit": "^4.8.36",
- "sebastian/comparator": "^1.2.4",
- "symfony/process": "^2.3"
- },
- "type": "composer-plugin",
- "extra": {
- "class": "Composer\\Installers\\Plugin",
- "branch-alias": {
- "dev-master": "1.0-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Composer\\Installers\\": "src/Composer/Installers"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Kyle Robinson Young",
- "email": "kyle@dontkry.com",
- "homepage": "https://github.com/shama"
- }
- ],
- "description": "A multi-framework Composer library installer",
- "homepage": "https://composer.github.io/installers/",
- "keywords": [
- "Craft",
- "Dolibarr",
- "Eliasis",
- "Hurad",
- "ImageCMS",
- "Kanboard",
- "Lan Management System",
- "MODX Evo",
- "MantisBT",
- "Mautic",
- "Maya",
- "OXID",
- "Plentymarkets",
- "Porto",
- "RadPHP",
- "SMF",
- "Thelia",
- "Whmcs",
- "WolfCMS",
- "agl",
- "aimeos",
- "annotatecms",
- "attogram",
- "bitrix",
- "cakephp",
- "chef",
- "cockpit",
- "codeigniter",
- "concrete5",
- "croogo",
- "dokuwiki",
- "drupal",
- "eZ Platform",
- "elgg",
- "expressionengine",
- "fuelphp",
- "grav",
- "installer",
- "itop",
- "joomla",
- "known",
- "kohana",
- "laravel",
- "lavalite",
- "lithium",
- "magento",
- "majima",
- "mako",
- "mediawiki",
- "modulework",
- "modx",
- "moodle",
- "osclass",
- "phpbb",
- "piwik",
- "ppi",
- "puppet",
- "pxcms",
- "reindex",
- "roundcube",
- "shopware",
- "silverstripe",
- "sydes",
- "sylius",
- "symfony",
- "typo3",
- "wordpress",
- "yawik",
- "zend",
- "zikula"
- ],
- "time": "2020-04-07T06:57:05+00:00"
- },
{
"name": "flexihash/flexihash",
"version": "v2.0.2",
@@ -185,26 +58,6 @@
"description": "Flexihash is a small PHP library which implements consistent hashing",
"homepage": "https://github.com/pda/flexihash",
"time": "2016-04-22T21:03:23+00:00"
- },
- {
- "name": "wpackagist-plugin/hyperdb",
- "version": "1.6",
- "source": {
- "type": "svn",
- "url": "https://plugins.svn.wordpress.org/hyperdb/",
- "reference": "tags/1.6"
- },
- "dist": {
- "type": "zip",
- "url": "https://downloads.wordpress.org/plugin/hyperdb.1.6.zip",
- "reference": null,
- "shasum": null
- },
- "require": {
- "composer/installers": "~1.0"
- },
- "type": "wordpress-plugin",
- "homepage": "https://wordpress.org/plugins/hyperdb/"
}
],
"packages-dev": [],
diff --git a/db-hash.php b/db-hash.php
index 289458ded71521903b87d97238a3c4dbcf07a495..da0f231b60d07e3bb9b2ee02164fcd273682dd51 100644
--- a/db-hash.php
+++ b/db-hash.php
@@ -1,6 +1,8 @@
<?php
-require __DIR__ . '../vendor/autoload.php';
+if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+ require __DIR__ . '/vendor/autoload.php';
+}
require_once( ABSPATH . 'wp-config.php' );