From 36c3ccfab49e1f609a65ab9505bb2a36640edbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= Date: Tue, 11 Dec 2018 15:02:14 +0100 Subject: [PATCH 1/4] ncu -u && npm install --- package-lock.json | 116 ++++++++++++++++++---------------------------- package.json | 2 +- 2 files changed, 45 insertions(+), 73 deletions(-) diff --git a/package-lock.json b/package-lock.json index 650d4e3..b4bee5d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,17 +10,14 @@ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } }, "argparse": { "version": "1.0.10", @@ -117,16 +114,14 @@ } }, "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "cli": { @@ -140,9 +135,9 @@ }, "dependencies": { "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -246,22 +241,22 @@ "dependencies": { "domelementtype": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", "dev": true }, "entities": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", "dev": true } } }, "domelementtype": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", - "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", "dev": true }, "domhandler": { @@ -285,7 +280,7 @@ }, "entities": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "resolved": "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz", "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=", "dev": true }, @@ -434,14 +429,14 @@ } }, "grunt-contrib-jshint": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.1.0.tgz", - "integrity": "sha1-Np2QmyWTxA6L55lAshNAhQx5Oaw=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-2.0.0.tgz", + "integrity": "sha512-4qR411I1bhvVrPkKBzCUcrWkTEtBuWioXi9ABWRXHoplRScg03jiMqLDpzS4pDhVsLOTx5F9l+0cnMc+Gd2MWg==", "dev": true, "requires": { - "chalk": "^1.1.1", + "chalk": "^2.4.1", "hooker": "^0.2.3", - "jshint": "~2.9.4" + "jshint": "~2.9.6" } }, "grunt-known-options": { @@ -834,15 +829,6 @@ "integrity": "sha1-DnW+5rXC5l/aRQdWcqBs6yzs2Gk=", "dev": true }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -863,7 +849,7 @@ }, "htmlparser2": { "version": "3.8.3", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "resolved": "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", "dev": true, "requires": { @@ -961,27 +947,19 @@ } }, "jshint": { - "version": "2.9.5", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz", - "integrity": "sha1-HnJSkVzmgbQIJ+4UJIxG006apiw=", + "version": "2.9.7", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.7.tgz", + "integrity": "sha512-Q8XN38hGsVQhdlM+4gd1Xl7OB1VieSuCJf+fEJjpo59JH99bVJhXRXAh26qQ15wfdd1VPMuDWNeSWoNl53T4YA==", "dev": true, "requires": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", - "lodash": "3.7.x", + "lodash": "~4.17.10", "minimatch": "~3.0.2", "shelljs": "0.3.x", "strip-json-comments": "1.0.x" - }, - "dependencies": { - "lodash": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz", - "integrity": "sha1-Nni9irmVBXwHreg27S7wh9qBHUU=", - "dev": true - } } }, "load-grunt-tasks": { @@ -1282,7 +1260,7 @@ }, "readable-stream": { "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { @@ -1355,7 +1333,7 @@ }, "shelljs": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz", "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=", "dev": true }, @@ -1411,19 +1389,10 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", "dev": true }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, "strip-bom": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", @@ -1449,10 +1418,13 @@ "dev": true }, "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } }, "trim-newlines": { "version": "1.0.0", diff --git a/package.json b/package.json index dcf970b..7cebfd9 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "homepage": "http://www.wp-pay.org/gateways/common/", "devDependencies": { "grunt": "^1.0.3", - "grunt-contrib-jshint": "^1.1.0", + "grunt-contrib-jshint": "^2.0.0", "grunt-phpcs": "^0.4.0", "grunt-phplint": "0.1.0", "grunt-phpmd": "^0.1.1", From b03a314253dfcd527c60f830301c0bc81a6cc86f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reu=CC=88el=20van=20der=20Steege?= Date: Sun, 16 Dec 2018 19:33:54 +0100 Subject: [PATCH 2/4] Add Scrutinizer config. --- .scrutinizer.yml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .scrutinizer.yml diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000..a001bce --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,56 @@ +build: + environment: + variables: + WP_TESTS_DB_NAME: 'wp_phpunit_tests' + WP_TESTS_DB_USER: 'root' + WP_TESTS_DB_PASS: '' + WP_TESTS_DB_HOST: 'localhost' + project_setup: + before: + - mysql -e "CREATE DATABASE wp_phpunit_tests" + nodes: + coverage: + tests: + override: + - command: ./vendor/bin/phpunit + coverage: + file: build/logs/clover.xml + format: clover + +filter: + excluded_paths: + # Exclude the external `xmlseclibs.php` library. + - 'includes/xmlseclibs/*' + +checks: + php: + coding_standard: + name: WordPress + code_rating: true + duplication: true + +build_failure_conditions: + - 'issues.label("bug").exists' + +coding_style: + php: + indentation: + general: + use_tabs: true + spaces: + around_operators: + unary_additive: true + concatenation: true + negation: true + within: + brackets: false + array_initializer: true + grouping: true + function_call: true + function_declaration: true + if: true + for: true + while: true + switch: true + catch: true + type_cast: false From 3c20bd8438b297a8a8435424d219952c83a63418 Mon Sep 17 00:00:00 2001 From: Remco Tolsma Date: Fri, 28 Dec 2018 11:29:03 +0100 Subject: [PATCH 3/4] Depreacted this library. --- DEPRECATED.md | 3 ++ README.md | 2 +- composer.json | 4 +- package.json | 3 +- src/AbstractIntegration.php | 80 ------------------------------------ src/IntegrationInterface.php | 24 ----------- 6 files changed, 8 insertions(+), 108 deletions(-) create mode 100644 DEPRECATED.md delete mode 100644 src/AbstractIntegration.php delete mode 100644 src/IntegrationInterface.php diff --git a/DEPRECATED.md b/DEPRECATED.md new file mode 100644 index 0000000..17108f5 --- /dev/null +++ b/DEPRECATED.md @@ -0,0 +1,3 @@ +# Deprecated + +Classes moved to https://github.com/wp-pay/core. diff --git a/README.md b/README.md index a3ca69d..74f530f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# WordPress Pay Gateway: Common +# [DEPRECATED] WordPress Pay Gateway: Common **Common driver for the WordPress payment processing library.** diff --git a/composer.json b/composer.json index c8622e3..5a69fcf 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "wp-pay-gateways/common", - "description": "Common driver for the WordPress payment processing library.", - "keywords": ["wordpress", "wp", "pay", "common", "gateway", "pronamic"], + "description": "✗ [DEPRECATED] Common driver for the WordPress payment processing library.", + "keywords": ["deprecated", "wordpress", "wp", "pay", "common", "gateway", "pronamic"], "homepage": "http://www.wp-pay.org/gateways/common/", "license": "GPL-3.0-or-later", "authors": [ diff --git a/package.json b/package.json index 67ec893..31bccfa 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,13 @@ { "name": "common", "version": "2.0.1", - "description": "Common driver for the WordPress payment processing library.", + "description": "✗ [DEPRECATED] Common driver for the WordPress payment processing library.", "repository": { "type": "git", "url": "https://github.com/wp-pay-gateways/common" }, "keywords": [ + "deprecated", "wordpress", "wp", "pay", diff --git a/src/AbstractIntegration.php b/src/AbstractIntegration.php deleted file mode 100644 index 509575c..0000000 --- a/src/AbstractIntegration.php +++ /dev/null @@ -1,80 +0,0 @@ -id; - } - - public function set_id( $id ) { - $this->id = $id; - } - - public function get_name() { - return $this->name; - } - - public function set_name( $name ) { - $this->name = $name; - } - - /** - * Get required settings for this integration. - * - * @link https://github.com/wp-premium/gravityforms/blob/1.9.16/includes/fields/class-gf-field-multiselect.php#L21-L42 - * @return array - */ - public function get_settings() { - return array(); - } - - public function get_dashboard_url() { - $url = array(); - - if ( isset( $this->dashboard_url ) ) { - if ( is_string( $this->dashboard_url ) ) { - $url = array( $this->dashboard_url ); - } elseif ( is_array( $this->dashboard_url ) ) { - $url = $this->dashboard_url; - } - } - - return $url; - } - - public function get_product_url() { - $url = false; - - if ( isset( $this->product_url ) ) { - $url = $this->product_url; - } elseif ( isset( $this->url ) ) { - $url = $this->url; - } - - return $url; - } -} diff --git a/src/IntegrationInterface.php b/src/IntegrationInterface.php deleted file mode 100644 index 1a82312..0000000 --- a/src/IntegrationInterface.php +++ /dev/null @@ -1,24 +0,0 @@ - Date: Fri, 29 Mar 2019 15:40:53 +0100 Subject: [PATCH 4/4] Tagging version 2.0.2. --- CHANGELOG.md | 6 +++++- package.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20a6894..6c9a48e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C ## [Unreleased][unreleased] - +## [2.0.2] - 2019-03-29 +- Classes removed to `wp-pay/core`. + ## [2.0.1] - 2018-12-11 - Composer update. @@ -23,7 +26,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C ## 1.0.0 - 2015-01-29 - First release. -[unreleased]: https://github.com/wp-pay-gateways/common/compare/2.0.1...HEAD +[unreleased]: https://github.com/wp-pay-gateways/common/compare/2.0.2...HEAD +[2.0.2]: https://github.com/wp-pay-gateways/common/compare/2.0.1...2.0.2 [2.0.1]: https://github.com/wp-pay-gateways/common/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/wp-pay-gateways/common/compare/1.0.2...2.0.0 [1.0.2]: https://github.com/wp-pay-gateways/common/compare/1.0.1...1.0.2 diff --git a/package.json b/package.json index 31bccfa..43c5b8b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "common", - "version": "2.0.1", + "version": "2.0.2", "description": "✗ [DEPRECATED] Common driver for the WordPress payment processing library.", "repository": { "type": "git",