From 600e50f0b513c5335f966d5e8024859c7ba31cb0 Mon Sep 17 00:00:00 2001 From: MILAN88888 Date: Tue, 1 Oct 2024 12:53:41 +0545 Subject: [PATCH 1/9] Add - Basic setup for the oxygen builder --- addons/Addons.php | 85 +++ addons/OxygenBuilder/OxygenBuilder.php | 23 + .../sections/all_extensions.json | 22 +- composer.json | 6 + composer.lock | 708 +++++++++--------- everest-forms.php | 50 ++ includes/class-everest-forms.php | 12 + traits/Singleton.php | 52 ++ 8 files changed, 613 insertions(+), 345 deletions(-) create mode 100644 addons/Addons.php create mode 100644 addons/OxygenBuilder/OxygenBuilder.php create mode 100644 traits/Singleton.php diff --git a/addons/Addons.php b/addons/Addons.php new file mode 100644 index 000000000..4f837fd7c --- /dev/null +++ b/addons/Addons.php @@ -0,0 +1,85 @@ + OxygenBuilder::class, + ) + ); + } + + /** + * Initializes the Everest Forms addons. + * + * @since xx.xx.xx + */ + public function addons_init() { + + $classes = $this->get_addon_list(); + + if ( empty( $classes ) ) { + return; + } + + if ( ! function_exists( 'evf_get_license_plan' ) || ! evf_get_license_plan() ) { + return; + } + + $enabled_features = get_option( 'everest_forms_enabled_features', array() ); + + if ( empty( $enabled_features ) ) { + return; + } + + foreach ( $classes as $key => $class_name ) { + $key = 'everest-forms-' . $key; + if ( in_array( $key, $enabled_features, true ) ) { + + if ( class_exists( $class_name ) ) { + $class_name::init(); + } + } + } + } +} diff --git a/addons/OxygenBuilder/OxygenBuilder.php b/addons/OxygenBuilder/OxygenBuilder.php new file mode 100644 index 000000000..0dc4511f4 --- /dev/null +++ b/addons/OxygenBuilder/OxygenBuilder.php @@ -0,0 +1,23 @@ +=5.3", - "react/stream": "^1.0 || ^0.7" + "react/stream": "^1.2" }, "require-dev": { - "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8", - "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/event-loop": "^1.2" }, "type": "library", "autoload": { @@ -286,7 +286,7 @@ ], "support": { "issues": "https://github.com/clue/reactphp-term/issues", - "source": "https://github.com/clue/reactphp-term/tree/v1.3.0" + "source": "https://github.com/clue/reactphp-term/tree/v1.4.0" }, "funding": [ { @@ -298,20 +298,20 @@ "type": "github" } ], - "time": "2020-11-06T11:50:12+00:00" + "time": "2024-01-30T10:22:09+00:00" }, { "name": "clue/utf8-react", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/clue/reactphp-utf8.git", - "reference": "8bc3f8c874cdf642c8f10f9ae93aadb8cd63da96" + "reference": "d5cd04d39cb5457aa5df830b7c4b301d2694217e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/clue/reactphp-utf8/zipball/8bc3f8c874cdf642c8f10f9ae93aadb8cd63da96", - "reference": "8bc3f8c874cdf642c8f10f9ae93aadb8cd63da96", + "url": "https://api.github.com/repos/clue/reactphp-utf8/zipball/d5cd04d39cb5457aa5df830b7c4b301d2694217e", + "reference": "d5cd04d39cb5457aa5df830b7c4b301d2694217e", "shasum": "" }, "require": { @@ -319,7 +319,7 @@ "react/stream": "^1.0 || ^0.7 || ^0.6 || ^0.5 || ^0.4 || ^0.3" }, "require-dev": { - "phpunit/phpunit": "^9.3 ||^5.7 || ^4.8", + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", "react/stream": "^1.0 || ^0.7" }, "type": "library", @@ -349,7 +349,7 @@ ], "support": { "issues": "https://github.com/clue/reactphp-utf8/issues", - "source": "https://github.com/clue/reactphp-utf8/tree/v1.2.0" + "source": "https://github.com/clue/reactphp-utf8/tree/v1.3.0" }, "funding": [ { @@ -361,7 +361,7 @@ "type": "github" } ], - "time": "2020-11-06T11:48:09+00:00" + "time": "2023-12-06T14:52:17+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -443,16 +443,16 @@ }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { @@ -484,9 +484,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "doctrine/instantiator", @@ -607,16 +607,16 @@ }, { "name": "gettext/gettext", - "version": "v4.8.11", + "version": "v4.8.12", "source": { "type": "git", "url": "https://github.com/php-gettext/Gettext.git", - "reference": "b632aaf5e4579d0b2ae8bc61785e238bff4c5156" + "reference": "11af89ee6c087db3cf09ce2111a150bca5c46e12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/b632aaf5e4579d0b2ae8bc61785e238bff4c5156", - "reference": "b632aaf5e4579d0b2ae8bc61785e238bff4c5156", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/11af89ee6c087db3cf09ce2111a150bca5c46e12", + "reference": "11af89ee6c087db3cf09ce2111a150bca5c46e12", "shasum": "" }, "require": { @@ -668,7 +668,7 @@ "support": { "email": "oom@oscarotero.com", "issues": "https://github.com/oscarotero/Gettext/issues", - "source": "https://github.com/php-gettext/Gettext/tree/v4.8.11" + "source": "https://github.com/php-gettext/Gettext/tree/v4.8.12" }, "funding": [ { @@ -684,7 +684,7 @@ "type": "patreon" } ], - "time": "2023-08-14T15:15:05+00:00" + "time": "2024-05-18T10:25:07+00:00" }, { "name": "gettext/languages", @@ -762,24 +762,24 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.1.1", + "version": "v1.1.3", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831" + "reference": "3ba905c11371512af9d9bdd27d99b782216b6945" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", - "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945", + "reference": "3ba905c11371512af9d9bdd27d99b782216b6945", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", - "phpoption/phpoption": "^1.9.1" + "phpoption/phpoption": "^1.9.3" }, "require-dev": { - "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, "type": "library", "autoload": { @@ -808,7 +808,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.1" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3" }, "funding": [ { @@ -820,7 +820,7 @@ "type": "tidelift" } ], - "time": "2023-02-25T20:23:15+00:00" + "time": "2024-07-20T21:45:45+00:00" }, { "name": "jolicode/jolinotif", @@ -891,16 +891,16 @@ }, { "name": "mck89/peast", - "version": "v1.15.4", + "version": "v1.16.3", "source": { "type": "git", "url": "https://github.com/mck89/peast.git", - "reference": "1df4dc28a6b5bb7ab117ab073c1712256e954e18" + "reference": "645ec21b650bc2aced18285c85f220d22afc1430" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mck89/peast/zipball/1df4dc28a6b5bb7ab117ab073c1712256e954e18", - "reference": "1df4dc28a6b5bb7ab117ab073c1712256e954e18", + "url": "https://api.github.com/repos/mck89/peast/zipball/645ec21b650bc2aced18285c85f220d22afc1430", + "reference": "645ec21b650bc2aced18285c85f220d22afc1430", "shasum": "" }, "require": { @@ -913,7 +913,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15.4-dev" + "dev-master": "1.16.3-dev" } }, "autoload": { @@ -934,9 +934,9 @@ "description": "Peast is PHP library that generates AST for JavaScript code", "support": { "issues": "https://github.com/mck89/peast/issues", - "source": "https://github.com/mck89/peast/tree/v1.15.4" + "source": "https://github.com/mck89/peast/tree/v1.16.3" }, - "time": "2023-08-12T08:29:29+00:00" + "time": "2024-07-23T14:00:32+00:00" }, { "name": "mustache/mustache", @@ -990,16 +990,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -1007,11 +1007,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -1037,7 +1038,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -1045,7 +1046,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "phar-io/manifest", @@ -1221,28 +1222,28 @@ }, { "name": "phpcompatibility/phpcompatibility-paragonie", - "version": "1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", - "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26" + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/bba5a9dfec7fcfbd679cfaf611d86b4d3759da26", - "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/293975b465e0e709b571cbf0c957c6c0a7b9a2ac", + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac", "shasum": "" }, "require": { "phpcompatibility/php-compatibility": "^9.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "paragonie/random_compat": "dev-master", "paragonie/sodium_compat": "dev-master" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -1272,22 +1273,37 @@ ], "support": { "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/security/policy", "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie" }, - "time": "2022-10-25T01:46:02+00:00" + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:30:46+00:00" }, { "name": "phpcompatibility/phpcompatibility-wp", - "version": "2.1.4", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", - "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5" + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5", - "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/01c1ff2704a58e46f0cb1ca9d06aee07b3589082", + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082", "shasum": "" }, "require": { @@ -1295,10 +1311,10 @@ "phpcompatibility/phpcompatibility-paragonie": "^1.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7" + "dealerdirect/phpcodesniffer-composer-installer": "^1.0" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -1327,35 +1343,50 @@ ], "support": { "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityWP/security/policy", "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP" }, - "time": "2022-10-24T09:00:36+00:00" + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:37:59+00:00" }, { "name": "phpcsstandards/phpcsextra", - "version": "1.1.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHPCSExtra.git", - "reference": "61a9be9f74a53735f7c421d7de8dc64fa80488e6" + "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/61a9be9f74a53735f7c421d7de8dc64fa80488e6", - "reference": "61a9be9f74a53735f7c421d7de8dc64fa80488e6", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSExtra/zipball/11d387c6642b6e4acaf0bd9bf5203b8cca1ec489", + "reference": "11d387c6642b6e4acaf0bd9bf5203b8cca1ec489", "shasum": "" }, "require": { "php": ">=5.4", - "phpcsstandards/phpcsutils": "^1.0.8", - "squizlabs/php_codesniffer": "^3.7.1" + "phpcsstandards/phpcsutils": "^1.0.9", + "squizlabs/php_codesniffer": "^3.8.0" }, "require-dev": { "php-parallel-lint/php-console-highlighter": "^1.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcsstandards/phpcsdevcs": "^1.1.6", "phpcsstandards/phpcsdevtools": "^1.2.1", - "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.5 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "type": "phpcodesniffer-standard", "extra": { @@ -1390,35 +1421,50 @@ ], "support": { "issues": "https://github.com/PHPCSStandards/PHPCSExtra/issues", + "security": "https://github.com/PHPCSStandards/PHPCSExtra/security/policy", "source": "https://github.com/PHPCSStandards/PHPCSExtra" }, - "time": "2023-07-19T19:40:11+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2023-12-08T16:49:07+00:00" }, { "name": "phpcsstandards/phpcsutils", - "version": "1.0.8", + "version": "1.0.12", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHPCSUtils.git", - "reference": "69465cab9d12454e5e7767b9041af0cd8cd13be7" + "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/69465cab9d12454e5e7767b9041af0cd8cd13be7", - "reference": "69465cab9d12454e5e7767b9041af0cd8cd13be7", + "url": "https://api.github.com/repos/PHPCSStandards/PHPCSUtils/zipball/87b233b00daf83fb70f40c9a28692be017ea7c6c", + "reference": "87b233b00daf83fb70f40c9a28692be017ea7c6c", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0", "php": ">=5.4", - "squizlabs/php_codesniffer": "^3.7.1 || 4.0.x-dev@dev" + "squizlabs/php_codesniffer": "^3.10.0 || 4.0.x-dev@dev" }, "require-dev": { "ext-filter": "*", "php-parallel-lint/php-console-highlighter": "^1.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcsstandards/phpcsdevcs": "^1.1.6", - "yoast/phpunit-polyfills": "^1.0.5 || ^2.0.0" + "yoast/phpunit-polyfills": "^1.1.0 || ^2.0.0" }, "type": "phpcodesniffer-standard", "extra": { @@ -1463,9 +1509,24 @@ "support": { "docs": "https://phpcsutils.com/", "issues": "https://github.com/PHPCSStandards/PHPCSUtils/issues", + "security": "https://github.com/PHPCSStandards/PHPCSUtils/security/policy", "source": "https://github.com/PHPCSStandards/PHPCSUtils" }, - "time": "2023-07-16T21:39:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-05-20T13:34:27+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1522,28 +1583,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.1", "ext-filter": "*", - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", + "phpdocumentor/type-resolver": "^1.7", + "phpstan/phpdoc-parser": "^1.7", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "mockery/mockery": "~1.3.5", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^5.13" }, "type": "library", "extra": { @@ -1567,33 +1635,33 @@ }, { "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "email": "opensource@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2024-05-21T05:55:05+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.3", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -1631,22 +1699,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2023-08-12T11:01:26+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phpoption/phpoption", - "version": "1.9.1", + "version": "1.9.3", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e" + "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e", - "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54", + "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54", "shasum": "" }, "require": { @@ -1654,13 +1722,13 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" + "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28" }, "type": "library", "extra": { "bamarni-bin": { "bin-links": true, - "forward-command": true + "forward-command": false }, "branch-alias": { "dev-master": "1.9-dev" @@ -1696,7 +1764,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.9.1" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.3" }, "funding": [ { @@ -1708,33 +1776,33 @@ "type": "tidelift" } ], - "time": "2023-02-25T19:38:58+00:00" + "time": "2024-07-20T21:41:07+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.17.0", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2" + "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/15873c65b207b07765dbc3c95d20fdf4a320cbe2", - "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", - "phpunit/phpunit": "^8.0 || ^9.0" + "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" }, "type": "library", "extra": { @@ -1767,6 +1835,7 @@ "keywords": [ "Double", "Dummy", + "dev", "fake", "mock", "spy", @@ -1774,22 +1843,22 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.17.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.19.0" }, - "time": "2023-02-02T15:41:36+00:00" + "time": "2024-02-29T11:52:51+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.23.1", + "version": "1.32.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" + "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", "shasum": "" }, "require": { @@ -1821,9 +1890,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" }, - "time": "2023-08-03T16:32:59+00:00" + "time": "2024-09-26T07:23:32+00:00" }, { "name": "phpunit/php-code-coverage", @@ -1894,16 +1963,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "2.0.5", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" + "reference": "69deeb8664f611f156a924154985fbd4911eb36b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/69deeb8664f611f156a924154985fbd4911eb36b", + "reference": "69deeb8664f611f156a924154985fbd4911eb36b", "shasum": "" }, "require": { @@ -1942,7 +2011,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.6" }, "funding": [ { @@ -1950,7 +2019,7 @@ "type": "github" } ], - "time": "2021-12-02T12:42:26+00:00" + "time": "2024-03-01T13:39:50+00:00" }, { "name": "phpunit/php-text-template", @@ -1999,16 +2068,16 @@ }, { "name": "phpunit/php-timer", - "version": "2.1.3", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "reference": "a691211e94ff39a34811abd521c31bd5b305b0bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/a691211e94ff39a34811abd521c31bd5b305b0bb", + "reference": "a691211e94ff39a34811abd521c31bd5b305b0bb", "shasum": "" }, "require": { @@ -2046,7 +2115,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.4" }, "funding": [ { @@ -2054,7 +2123,7 @@ "type": "github" } ], - "time": "2020-11-30T08:20:02+00:00" + "time": "2024-03-01T13:42:41+00:00" }, { "name": "phpunit/php-token-stream", @@ -2259,16 +2328,16 @@ }, { "name": "react/event-loop", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/reactphp/event-loop.git", - "reference": "6e7e587714fff7a83dcc7025aee42ab3b265ae05" + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/event-loop/zipball/6e7e587714fff7a83dcc7025aee42ab3b265ae05", - "reference": "6e7e587714fff7a83dcc7025aee42ab3b265ae05", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", "shasum": "" }, "require": { @@ -2319,7 +2388,7 @@ ], "support": { "issues": "https://github.com/reactphp/event-loop/issues", - "source": "https://github.com/reactphp/event-loop/tree/v1.4.0" + "source": "https://github.com/reactphp/event-loop/tree/v1.5.0" }, "funding": [ { @@ -2327,20 +2396,20 @@ "type": "open_collective" } ], - "time": "2023-05-05T10:11:24+00:00" + "time": "2023-11-13T13:48:05+00:00" }, { "name": "react/stream", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/reactphp/stream.git", - "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66" + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/stream/zipball/6fbc9672905c7d5a885f2da2fc696f65840f4a66", - "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66", + "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d", "shasum": "" }, "require": { @@ -2350,7 +2419,7 @@ }, "require-dev": { "clue/stream-filter": "~1.2", - "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "type": "library", "autoload": { @@ -2397,7 +2466,7 @@ ], "support": { "issues": "https://github.com/reactphp/stream/issues", - "source": "https://github.com/reactphp/stream/tree/v1.3.0" + "source": "https://github.com/reactphp/stream/tree/v1.4.0" }, "funding": [ { @@ -2405,7 +2474,7 @@ "type": "open_collective" } ], - "time": "2023-06-16T10:52:11+00:00" + "time": "2024-06-11T12:45:25+00:00" }, { "name": "roots/wordpress", @@ -2535,16 +2604,16 @@ }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54", + "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54", "shasum": "" }, "require": { @@ -2578,7 +2647,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.3" }, "funding": [ { @@ -2586,7 +2655,7 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2024-03-01T13:45:45+00:00" }, { "name": "sebastian/comparator", @@ -2664,16 +2733,16 @@ }, { "name": "sebastian/diff", - "version": "3.0.4", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae" + "reference": "98ff311ca519c3aa73ccd3de053bdb377171d7b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/6296a0c086dd0117c1b78b059374d7fcbe7545ae", - "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/98ff311ca519c3aa73ccd3de053bdb377171d7b6", + "reference": "98ff311ca519c3aa73ccd3de053bdb377171d7b6", "shasum": "" }, "require": { @@ -2718,7 +2787,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/3.0.6" }, "funding": [ { @@ -2726,20 +2795,20 @@ "type": "github" } ], - "time": "2023-05-07T05:30:20+00:00" + "time": "2024-03-02T06:16:36+00:00" }, { "name": "sebastian/environment", - "version": "4.2.4", + "version": "4.2.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "reference": "56932f6049a0482853056ffd617c91ffcc754205" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/56932f6049a0482853056ffd617c91ffcc754205", + "reference": "56932f6049a0482853056ffd617c91ffcc754205", "shasum": "" }, "require": { @@ -2781,7 +2850,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + "source": "https://github.com/sebastianbergmann/environment/tree/4.2.5" }, "funding": [ { @@ -2789,24 +2858,24 @@ "type": "github" } ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2024-03-01T13:49:59+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.5", + "version": "3.1.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6" + "reference": "1939bc8fd1d39adcfa88c5b35335910869214c56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6", - "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1939bc8fd1d39adcfa88c5b35335910869214c56", + "reference": "1939bc8fd1d39adcfa88c5b35335910869214c56", "shasum": "" }, "require": { - "php": ">=7.0", + "php": ">=7.2", "sebastian/recursion-context": "^3.0" }, "require-dev": { @@ -2858,7 +2927,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.6" }, "funding": [ { @@ -2866,7 +2935,7 @@ "type": "github" } ], - "time": "2022-09-14T06:00:17+00:00" + "time": "2024-03-02T06:21:38+00:00" }, { "name": "sebastian/global-state", @@ -2925,16 +2994,16 @@ }, { "name": "sebastian/object-enumerator", - "version": "3.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "reference": "ac5b293dba925751b808e02923399fb44ff0d541" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/ac5b293dba925751b808e02923399fb44ff0d541", + "reference": "ac5b293dba925751b808e02923399fb44ff0d541", "shasum": "" }, "require": { @@ -2970,7 +3039,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.5" }, "funding": [ { @@ -2978,20 +3047,20 @@ "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2024-03-01T13:54:02+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "1d439c229e61f244ff1f211e5c99737f90c67def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/1d439c229e61f244ff1f211e5c99737f90c67def", + "reference": "1d439c229e61f244ff1f211e5c99737f90c67def", "shasum": "" }, "require": { @@ -3025,7 +3094,7 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.3" }, "funding": [ { @@ -3033,20 +3102,20 @@ "type": "github" } ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2024-03-01T13:56:04+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/9bfd3c6f1f08c026f542032dfb42813544f7d64c", + "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c", "shasum": "" }, "require": { @@ -3088,7 +3157,7 @@ "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.2" }, "funding": [ { @@ -3096,20 +3165,20 @@ "type": "github" } ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2024-03-01T14:07:30+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "reference": "72a7f7674d053d548003b16ff5a106e7e0e06eee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/72a7f7674d053d548003b16ff5a106e7e0e06eee", + "reference": "72a7f7674d053d548003b16ff5a106e7e0e06eee", "shasum": "" }, "require": { @@ -3139,8 +3208,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.3" }, "funding": [ { @@ -3148,7 +3216,7 @@ "type": "github" } ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2024-03-01T13:59:09+00:00" }, { "name": "sebastian/version", @@ -3258,16 +3326,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.10.3", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", "shasum": "" }, "require": { @@ -3277,11 +3345,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -3296,22 +3364,45 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-09-18T10:38:58+00:00" }, { "name": "symfony/console", @@ -3467,20 +3558,20 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -3490,9 +3581,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3529,7 +3617,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -3545,24 +3633,24 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -3572,9 +3660,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3612,7 +3697,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -3628,30 +3713,27 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3691,7 +3773,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -3707,30 +3789,27 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -3774,7 +3853,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -3790,7 +3869,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", @@ -4006,16 +4085,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -4044,7 +4123,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -4052,7 +4131,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "vlucas/phpdotenv", @@ -4383,16 +4462,16 @@ }, { "name": "wp-cli/php-cli-tools", - "version": "v0.11.19", + "version": "v0.11.22", "source": { "type": "git", "url": "https://github.com/wp-cli/php-cli-tools.git", - "reference": "2d27f0db5c36f5aa0064abecddd6d05f28c4d001" + "reference": "a6bb94664ca36d0962f9c2ff25591c315a550c51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/2d27f0db5c36f5aa0064abecddd6d05f28c4d001", - "reference": "2d27f0db5c36f5aa0064abecddd6d05f28c4d001", + "url": "https://api.github.com/repos/wp-cli/php-cli-tools/zipball/a6bb94664ca36d0962f9c2ff25591c315a550c51", + "reference": "a6bb94664ca36d0962f9c2ff25591c315a550c51", "shasum": "" }, "require": { @@ -4400,7 +4479,7 @@ }, "require-dev": { "roave/security-advisories": "dev-latest", - "wp-cli/wp-cli-tests": "^3.1.6" + "wp-cli/wp-cli-tests": "^4" }, "type": "library", "extra": { @@ -4440,22 +4519,22 @@ ], "support": { "issues": "https://github.com/wp-cli/php-cli-tools/issues", - "source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.19" + "source": "https://github.com/wp-cli/php-cli-tools/tree/v0.11.22" }, - "time": "2023-07-21T11:37:15+00:00" + "time": "2023-12-03T19:25:05+00:00" }, { "name": "wp-cli/wp-cli", - "version": "v2.8.1", + "version": "v2.11.0", "source": { "type": "git", "url": "https://github.com/wp-cli/wp-cli.git", - "reference": "5dd2340b9a01c3cfdbaf5e93a140759fdd190eee" + "reference": "53f0df112901fcf95099d0f501912a209429b6a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/5dd2340b9a01c3cfdbaf5e93a140759fdd190eee", - "reference": "5dd2340b9a01c3cfdbaf5e93a140759fdd190eee", + "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/53f0df112901fcf95099d0f501912a209429b6a9", + "reference": "53f0df112901fcf95099d0f501912a209429b6a9", "shasum": "" }, "require": { @@ -4472,7 +4551,7 @@ "wp-cli/entity-command": "^1.2 || ^2", "wp-cli/extension-command": "^1.1 || ^2", "wp-cli/package-command": "^1 || ^2", - "wp-cli/wp-cli-tests": "^3.1.6" + "wp-cli/wp-cli-tests": "^4.0.1" }, "suggest": { "ext-readline": "Include for a better --prompt implementation", @@ -4485,7 +4564,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.9.x-dev" + "dev-main": "2.11.x-dev" } }, "autoload": { @@ -4512,20 +4591,20 @@ "issues": "https://github.com/wp-cli/wp-cli/issues", "source": "https://github.com/wp-cli/wp-cli" }, - "time": "2023-06-05T06:55:55+00:00" + "time": "2024-08-08T03:04:55+00:00" }, { "name": "wp-coding-standards/wpcs", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/WordPress/WordPress-Coding-Standards.git", - "reference": "bb792cb331472b82c5d7f28fb9b8ec2d20f68826" + "reference": "9333efcbff231f10dfd9c56bb7b65818b4733ca7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/bb792cb331472b82c5d7f28fb9b8ec2d20f68826", - "reference": "bb792cb331472b82c5d7f28fb9b8ec2d20f68826", + "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/9333efcbff231f10dfd9c56bb7b65818b4733ca7", + "reference": "9333efcbff231f10dfd9c56bb7b65818b4733ca7", "shasum": "" }, "require": { @@ -4534,16 +4613,16 @@ "ext-tokenizer": "*", "ext-xmlreader": "*", "php": ">=5.4", - "phpcsstandards/phpcsextra": "^1.1.0", - "phpcsstandards/phpcsutils": "^1.0.8", - "squizlabs/php_codesniffer": "^3.7.2" + "phpcsstandards/phpcsextra": "^1.2.1", + "phpcsstandards/phpcsutils": "^1.0.10", + "squizlabs/php_codesniffer": "^3.9.0" }, "require-dev": { "php-parallel-lint/php-console-highlighter": "^1.0.0", "php-parallel-lint/php-parallel-lint": "^1.3.2", "phpcompatibility/php-compatibility": "^9.0", "phpcsstandards/phpcsdevtools": "^1.2.0", - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "suggest": { "ext-iconv": "For improved results", @@ -4572,7 +4651,13 @@ "source": "https://github.com/WordPress/WordPress-Coding-Standards", "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki" }, - "time": "2023-08-21T14:28:38+00:00" + "funding": [ + { + "url": "https://opencollective.com/php_codesniffer", + "type": "custom" + } + ], + "time": "2024-03-25T16:39:00+00:00" }, { "name": "wp-phpunit/wp-phpunit", @@ -4666,67 +4751,6 @@ }, "time": "2023-06-07T03:09:42+00:00" }, - { - "name": "yoast/phpunit-polyfills", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/Yoast/PHPUnit-Polyfills.git", - "reference": "5ea3536428944955f969bc764bbe09738e151ada" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/5ea3536428944955f969bc764bbe09738e151ada", - "reference": "5ea3536428944955f969bc764bbe09738e151ada", - "shasum": "" - }, - "require": { - "php": ">=5.4", - "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" - }, - "require-dev": { - "yoast/yoastcs": "^2.2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.x-dev", - "dev-develop": "1.x-dev" - } - }, - "autoload": { - "files": [ - "phpunitpolyfills-autoload.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Team Yoast", - "email": "support@yoast.com", - "homepage": "https://yoast.com" - }, - { - "name": "Contributors", - "homepage": "https://github.com/Yoast/PHPUnit-Polyfills/graphs/contributors" - } - ], - "description": "Set of polyfills for changed PHPUnit functionality to allow for creating PHPUnit cross-version compatible tests", - "homepage": "https://github.com/Yoast/PHPUnit-Polyfills", - "keywords": [ - "phpunit", - "polyfill", - "testing" - ], - "support": { - "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues", - "source": "https://github.com/Yoast/PHPUnit-Polyfills" - }, - "time": "2021-11-23T01:37:03+00:00" - }, { "name": "yosymfony/resource-watcher", "version": "v1.3.0", @@ -4794,5 +4818,5 @@ "php": ">=5.6.20" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/everest-forms.php b/everest-forms.php index 4cd183b95..e6fbd2975 100644 --- a/everest-forms.php +++ b/everest-forms.php @@ -21,6 +21,56 @@ define( 'EVF_PLUGIN_FILE', __FILE__ ); } +/** + * Autoload the packages. + * + * We want to fail gracefully if `composer install` has not been executed yet, so we are checking for the autoloader. + * If the autoloader is not present, let's log the failure and display a nice admin notice. + */ +$autoloader = __DIR__ . '/vendor/autoload.php'; +if ( is_readable( $autoloader ) && version_compare( PHP_VERSION, '7.1.3', '>=' ) ) { + require $autoloader; +} else { + if ( version_compare( PHP_VERSION, '7.1.3', '<=' ) ) { + return; + } + + if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) { + error_log( // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log + sprintf( + /* translators: 1: composer command. 2: plugin directory */ + esc_html__( 'Your installation of the Everest Forms plugin is incomplete. Please run %1$s within the %2$s directory.', 'everest-forms' ), + '`composer install`', + '`' . esc_html( str_replace( ABSPATH, '', __DIR__ ) ) . '`' + ) + ); + } + + /** + * Outputs an admin notice if composer install has not been ran. + */ + add_action( + 'admin_notices', + function() { + ?> +
+

+ composer install', + '' . esc_html( str_replace( ABSPATH, '', __DIR__ ) ) . '' + ); + ?> +

+
+ define_constants(); $this->define_tables(); $this->includes(); + $this->init_addons(); $this->init_hooks(); add_action( 'plugins_loaded', array( $this, 'objects' ), 1 ); @@ -350,6 +353,15 @@ public function includes() { include_once EVF_ABSPATH . 'includes/libraries/wptt-webfont-loader.php'; } + /** + * Loaded the addons. + * + * @since xx.xx.xx + */ + public function init_addons() { + Addons::init(); + } + /** * Include required frontend files. */ diff --git a/traits/Singleton.php b/traits/Singleton.php new file mode 100644 index 000000000..ea9273e4f --- /dev/null +++ b/traits/Singleton.php @@ -0,0 +1,52 @@ + Date: Tue, 1 Oct 2024 13:25:45 +0545 Subject: [PATCH 2/9] Add - Notices if the oxygen is not installed --- addons/OxygenBuilder/Helper.php | 63 ++++++++++++++++++++++++++ addons/OxygenBuilder/OxygenBuilder.php | 24 +++++++++- 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 addons/OxygenBuilder/Helper.php diff --git a/addons/OxygenBuilder/Helper.php b/addons/OxygenBuilder/Helper.php new file mode 100644 index 000000000..a71918fc6 --- /dev/null +++ b/addons/OxygenBuilder/Helper.php @@ -0,0 +1,63 @@ +

%s %s

', + esc_html( 'Everest Forms:' ), + wp_kses_post( 'Oxygen Integration addon requires Oxygen to be installed and activated.', 'everest-forms' ), + esc_html__( 'Dismiss this notice.', 'everest-forms' ) + ); + } + ); + + return; + } +} diff --git a/addons/OxygenBuilder/OxygenBuilder.php b/addons/OxygenBuilder/OxygenBuilder.php index 0dc4511f4..4c076cf7c 100644 --- a/addons/OxygenBuilder/OxygenBuilder.php +++ b/addons/OxygenBuilder/OxygenBuilder.php @@ -8,6 +8,7 @@ namespace EverestForms\Addons\OxygenBuilder; use EverestForms\Traits\Singleton; +use EverestForms\Addons\OxygenBuilder\Helper; /** * OxygenBuilder. @@ -17,7 +18,28 @@ class OxygenBuilder { use Singleton; - + /** + * Constructor. + * + * @since xx.xx.xx + */ public function __construct() { + $this->init(); } + /** + * Init. + * + * @since xx.xx.xx + */ + public function init() { + + if ( ! Helper::is_oxygen_active() ) { + + Helper::print_admin_notice(); + + return; + } + + } + } From 68dd92d30d4f4fdeee96c65e01ce34ba206b94e7 Mon Sep 17 00:00:00 2001 From: MILAN88888 Date: Tue, 1 Oct 2024 16:19:54 +0545 Subject: [PATCH 3/9] Add - Widget and render the form --- addons/OxygenBuilder/Helper.php | 2 +- addons/OxygenBuilder/OxygenBuilder.php | 33 ++++++- addons/OxygenBuilder/OxygenElement.php | 58 +++++++++++ addons/OxygenBuilder/OxygenFormWidget.php | 113 ++++++++++++++++++++++ 4 files changed, 203 insertions(+), 3 deletions(-) create mode 100644 addons/OxygenBuilder/OxygenElement.php create mode 100644 addons/OxygenBuilder/OxygenFormWidget.php diff --git a/addons/OxygenBuilder/Helper.php b/addons/OxygenBuilder/Helper.php index a71918fc6..d8fcac6d2 100644 --- a/addons/OxygenBuilder/Helper.php +++ b/addons/OxygenBuilder/Helper.php @@ -44,7 +44,7 @@ public static function is_oxygen_editor() { * * @since xx.xx.xx */ - public function print_admin_notice() { + public static function print_admin_notice() { add_action( 'admin_notices', diff --git a/addons/OxygenBuilder/OxygenBuilder.php b/addons/OxygenBuilder/OxygenBuilder.php index 4c076cf7c..7b9cd2eb0 100644 --- a/addons/OxygenBuilder/OxygenBuilder.php +++ b/addons/OxygenBuilder/OxygenBuilder.php @@ -18,20 +18,21 @@ class OxygenBuilder { use Singleton; + /** * Constructor. * * @since xx.xx.xx */ public function __construct() { - $this->init(); + $this->setup(); } /** * Init. * * @since xx.xx.xx */ - public function init() { + public function setup() { if ( ! Helper::is_oxygen_active() ) { @@ -40,6 +41,34 @@ public function init() { return; } + if ( ! class_exists( 'OxyEl' ) ) { + return; + } + + add_action( 'oxygen_add_plus_sections', array( $this, 'add_accordion_section' ) ); + add_action( 'oxygen_add_plus_everest-forms_section_content', array( $this, 'register_add_plus_subsections' ) ); + + new OxygenFormWidget(); + + } + + /** + * Add accordin section in the elements. + * + * @since xx.xx.xx + */ + public function add_accordion_section() { + $brand_name = __( 'Everest Forms', 'everest-forms' ); + \CT_Toolbar::oxygen_add_plus_accordion_section( 'everest-forms', $brand_name ); + } + + /** + * Add subsection. + * + * @since xx.xx.xx + */ + public function register_add_plus_subsections() { + do_action( 'oxygen_add_plus_everest-forms_form' ); } } diff --git a/addons/OxygenBuilder/OxygenElement.php b/addons/OxygenBuilder/OxygenElement.php new file mode 100644 index 000000000..a3594b3d9 --- /dev/null +++ b/addons/OxygenBuilder/OxygenElement.php @@ -0,0 +1,58 @@ +El->useAJAXControls(); + } + + /** + * Class names. + * + * @since xx.xx.xx + */ + public function class_names() { + return array( 'evf-oxy-element' ); + } + + /** + * Accordion button places. + * + * @since xx.xx.xx + */ + public function button_place() { + $button_place = $this->accordion_button_place(); + + if ( $button_place ) { + return 'everest-forms::' . $button_place; + } + + return ''; + } + + /** + * Button priority. + * + * @since xx.xx.xx + */ + public function button_priority() { + return ''; + } +} diff --git a/addons/OxygenBuilder/OxygenFormWidget.php b/addons/OxygenBuilder/OxygenFormWidget.php new file mode 100644 index 000000000..ef8c4dbf9 --- /dev/null +++ b/addons/OxygenBuilder/OxygenFormWidget.php @@ -0,0 +1,113 @@ +addOptionControl( + array( + 'type' => 'dropdown', + 'name' => __( 'Select a Form', 'everest-forms' ), + 'slug' => 'evf_form', + 'value' => evf_get_all_forms(), + 'default' => 'no', + 'css' => false, + ) + ); + + $templates_control->rebuildElementOnChange(); + + } + + /** + * Render the element's UI by outputting HTML. + * + * @since xx.xx.xx + * + * @param array $options + * @param array $defaults + * @param mixed $content + */ + public function render( $options, $defaults, $content ) { + + $content = sprintf( '
%s
', esc_html__( 'Everest Forms' ) ); + + if ( ! isset( $options['evf_form'] ) || empty( $options['evf_form'] ) ) { + + echo $content; + + return; + } + + $form_id = absint( $options['evf_form'] ); + + if ( empty( $form_id ) ) { + + echo $content; + + return; + } + + // Getting the form. + $content = \EVF_Shortcodes::shortcode_wrapper( + array( 'EVF_Shortcode_Form', 'output' ), + array( + 'id' => $form_id, + ), + array( 'class' => 'evf-oxygen-builder' ) + ); + + echo $content; + } +} From 63f49e9d36dbad9f98c482b9136a5a22480963cf Mon Sep 17 00:00:00 2001 From: MILAN88888 Date: Tue, 1 Oct 2024 17:18:25 +0545 Subject: [PATCH 4/9] Add - Enqueue style --- addons/OxygenBuilder/OxygenFormWidget.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/OxygenBuilder/OxygenFormWidget.php b/addons/OxygenBuilder/OxygenFormWidget.php index ef8c4dbf9..68ae52dd2 100644 --- a/addons/OxygenBuilder/OxygenFormWidget.php +++ b/addons/OxygenBuilder/OxygenFormWidget.php @@ -39,7 +39,19 @@ public function slug() { public function accordion_button_place() { return 'form'; } + /** + * Enqueue the styles. + * + * @since xx.xx.xx + */ + public function custom_init() { + wp_register_style( 'everest-forms-admin', evf()->plugin_url() . '/assets/css/admin.css', array(), EVF_VERSION ); + wp_register_style( 'everest-forms-general', evf()->plugin_url() . '/assets/css/everest-forms.css', array(), EVF_VERSION ); + + wp_enqueue_style( 'everest-forms-admin' ); + wp_enqueue_style( 'everest-forms-general' ); + } /** * Icon. * @@ -105,7 +117,7 @@ public function render( $options, $defaults, $content ) { array( 'id' => $form_id, ), - array( 'class' => 'evf-oxygen-builder' ) + array( 'class' => 'everest-forms' ) ); echo $content; From 4ca00fbfece837eb83e8d5bc09d16f3a826e1c45 Mon Sep 17 00:00:00 2001 From: MILAN88888 Date: Tue, 1 Oct 2024 17:25:44 +0545 Subject: [PATCH 5/9] Tweak - form list --- addons/OxygenBuilder/Helper.php | 17 +++++++++++++++++ addons/OxygenBuilder/OxygenFormWidget.php | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/addons/OxygenBuilder/Helper.php b/addons/OxygenBuilder/Helper.php index d8fcac6d2..4bbde365c 100644 --- a/addons/OxygenBuilder/Helper.php +++ b/addons/OxygenBuilder/Helper.php @@ -60,4 +60,21 @@ function() { return; } + + /** + * Get the form list. + * + * @since xx.xx.xx + */ + public static function get_form_list() { + $forms = evf_get_all_forms(); + + if ( empty( $forms ) ) { + return $forms; + } + + $forms[0] = esc_html__( 'Select a Form', 'everest-forms' ); + + return $forms; + } } diff --git a/addons/OxygenBuilder/OxygenFormWidget.php b/addons/OxygenBuilder/OxygenFormWidget.php index 68ae52dd2..5415e109e 100644 --- a/addons/OxygenBuilder/OxygenFormWidget.php +++ b/addons/OxygenBuilder/OxygenFormWidget.php @@ -72,7 +72,7 @@ public function controls() { 'type' => 'dropdown', 'name' => __( 'Select a Form', 'everest-forms' ), 'slug' => 'evf_form', - 'value' => evf_get_all_forms(), + 'value' => Helper::get_form_list(), 'default' => 'no', 'css' => false, ) From 87cb1f7393a2e26a72662058734996577f588787 Mon Sep 17 00:00:00 2001 From: MILAN88888 Date: Tue, 1 Oct 2024 18:12:38 +0545 Subject: [PATCH 6/9] Add - Label, Submit and container style --- addons/OxygenBuilder/OxygenFormWidget.php | 169 ++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/addons/OxygenBuilder/OxygenFormWidget.php b/addons/OxygenBuilder/OxygenFormWidget.php index 5415e109e..d54f04fe0 100644 --- a/addons/OxygenBuilder/OxygenFormWidget.php +++ b/addons/OxygenBuilder/OxygenFormWidget.php @@ -80,6 +80,175 @@ public function controls() { $templates_control->rebuildElementOnChange(); + $this->form_container_style_controls(); + $this->form_input_labels_style(); + $this->submit_btn_style(); + + } + + /** + * Form contrainer style controls. + * + * @since xx.xx.xx + */ + public function form_container_style_controls() { + $section_container = $this->addControlSection( + 'evf_container', + __( 'Form Container', 'everest-forms' ), + 'assets/icon.png', + $this + ); + $selector = '.everest-forms'; + $section_container->addStyleControls( + array( + array( + 'name' => __( 'Background Color', 'everest-forms' ), + 'selector' => $selector, + 'property' => 'background-color', + ), + array( + 'name' => __( 'Max Width', 'everest-forms' ), + 'selector' => $selector, + 'property' => 'width', + ), + ) + ); + + $section_container->addPreset( + 'padding', + 'evf_container_padding', + __( 'Padding', 'everest-forms' ), + $selector + )->whiteList(); + + $section_container->addPreset( + 'margin', + 'evf_container_margin', + __( 'Margin', 'everest-forms' ), + $selector + )->whiteList(); + + $section_container->addPreset( + 'border', + 'evf_container_border', + __( 'Border', 'everest-forms' ), + $selector + )->whiteList(); + + $section_container->addPreset( + 'border-radius', + 'evf_container_radius', + __( 'Border Radius', 'everest-forms' ), + $selector + )->whiteList(); + + $section_container->boxShadowSection( + __( 'Box Shadow', 'everest-forms' ), + $selector, + $this + ); + } + + /** + * Field input label styles. + * + * @since xx.xx.xx + */ + public function form_input_labels_style() { + $section_label = $this->addControlSection( + 'evf-label', + __( 'Labels', 'everest-forms' ), + 'assets/icon.png', + $this + ); + + $selector = '.evf-field-label'; + $section_label->typographySection( __( 'Typography' ), $selector, $this ); + $section_label->addStyleControls( + array( + array( + 'name' => __( 'Text Color', 'everest-forms' ), + 'selector' => $selector, + 'property' => 'color', + ), + ) + ); + $section_label->addStyleControl( + array( + 'name' => __( 'Asterisk Color', 'everest-forms' ), + 'selector' => '.evf-field-label .required', + 'property' => 'color', + ) + ); + } + + /** + * Submit button style. + * + * @since xx.xx.xx + */ + public function submit_btn_style() { + $section_submit_btn = $this->addControlSection( + 'evf-submit-button', + __( 'Submit Button', 'fluentform' ), + 'assets/icon.png', + $this + ); + + $selector_submit_bttn = '.everest-forms-submit-button'; + $section_submit_btn->addStyleControls( + array( + array( + 'name' => __( 'Color', 'fluentform' ), + 'selector' => $selector_submit_bttn, + 'property' => 'color', + ), + array( + 'name' => __( 'Background Color', 'fluentform' ), + 'selector' => $selector_submit_bttn, + 'property' => 'background-color', + ), + array( + 'name' => __( 'Hover Color', 'fluentform' ), + 'selector' => '.ff-btn-submit:hover', + 'property' => 'background-color', + ), + array( + 'name' => __( 'Width', 'fluentform' ), + 'selector' => $selector_submit_bttn, + 'property' => 'width', + 'control_type' => 'slider-measurebox', + 'unit' => 'px', + ), + array( + 'name' => __( 'Margin Top', 'fluentform' ), + 'selector' => $selector_submit_bttn, + 'property' => 'margin-top', + 'control_type' => 'slider-measurebox', + 'unit' => 'px', + ), + ) + ); + + $section_submit_btn->addPreset( + 'padding', + 'evf_submit_bttn_padding', + __( 'Padding', 'fluentform' ), + $selector_submit_bttn + )->whiteList(); + + $section_submit_btn->addPreset( + 'margin', + 'evf_submit_bttn_margin', + __( 'Margin', 'fluentform' ), + $selector_submit_bttn + )->whiteList(); + + $section_submit_btn->typographySection( __( 'Typography', 'fluentform' ), $selector_submit_bttn, $this ); + $section_submit_btn->borderSection( __( 'Border', 'fluentform' ), $selector_submit_bttn, $this ); + $section_submit_btn->borderSection( __( 'Hover Border', 'fluentform' ), $selector_submit_bttn . ':hover', $this ); + $section_submit_btn->boxShadowSection( __( 'Box Shadow', 'fluentform' ), $selector_submit_bttn, $this ); + $section_submit_btn->boxShadowSection( __( 'Hover Box Shadow', 'fluentform' ), $selector_submit_bttn . ':hover', $this ); } /** From 75244f88c434664d1615d02775c9674da8409d3b Mon Sep 17 00:00:00 2001 From: MILAN88888 Date: Wed, 2 Oct 2024 10:17:50 +0545 Subject: [PATCH 7/9] Tweak - Builder in free --- addons/Addons.php | 4 ---- .../RestApi/controllers/version1/class-evf-modules.php | 3 +++ src/dashboard/Constants/Products.js | 5 +++++ src/dashboard/screens/Modules/components/ModuleItem.js | 8 +++++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/addons/Addons.php b/addons/Addons.php index 4f837fd7c..317edeba7 100644 --- a/addons/Addons.php +++ b/addons/Addons.php @@ -62,10 +62,6 @@ public function addons_init() { return; } - if ( ! function_exists( 'evf_get_license_plan' ) || ! evf_get_license_plan() ) { - return; - } - $enabled_features = get_option( 'everest_forms_enabled_features', array() ); if ( empty( $enabled_features ) ) { diff --git a/includes/RestApi/controllers/version1/class-evf-modules.php b/includes/RestApi/controllers/version1/class-evf-modules.php index 845d8f0a4..fb4cb9748 100644 --- a/includes/RestApi/controllers/version1/class-evf-modules.php +++ b/includes/RestApi/controllers/version1/class-evf-modules.php @@ -113,6 +113,9 @@ public static function get_modules() { $feature->link = $feature->link . '&utm_campaign=' . EVF()->utm_campaign; $feature->type = 'feature'; $features_lists[ $key ] = $feature; + if ( in_array( $feature->slug, array( 'everest-forms-oxygen-builder' ), true ) ) { + $feature->required_plan = esc_html__( 'Free', 'everest-forms' ); + } } // Get Addons Lists. diff --git a/src/dashboard/Constants/Products.js b/src/dashboard/Constants/Products.js index 8a37c03cf..9723b3d65 100644 --- a/src/dashboard/Constants/Products.js +++ b/src/dashboard/Constants/Products.js @@ -111,3 +111,8 @@ export const THEMES = [ liveDemoURL: "https://themegrilldemos.com/colormag-demos/#/", }, ]; + +export const FreeModules = [ + 'ai-contact-form', + 'everest-forms-oxygen-builder' +] diff --git a/src/dashboard/screens/Modules/components/ModuleItem.js b/src/dashboard/screens/Modules/components/ModuleItem.js index 63f626cc9..cc29da7ec 100644 --- a/src/dashboard/screens/Modules/components/ModuleItem.js +++ b/src/dashboard/screens/Modules/components/ModuleItem.js @@ -37,6 +37,7 @@ import { FaInfoCircle, FaPlayCircle } from 'react-icons/fa'; import { activateModule, deactivateModule } from "./modules-api"; import DashboardContext from "./../../../context/DashboardContext"; import { actionTypes } from "./../../../reducers/DashboardReducer"; +import { FreeModules } from "../../../Constants/Products"; const ModuleItem = (props) => { /* global _EVF_DASHBOARD_ */ @@ -80,6 +81,7 @@ const ModuleItem = (props) => { const [moduleStatus, setModuleStatus] = useState(status); const [isPerformingAction, setIsPerformingAction] = useState(false); const [moduleSettingsURL, setModuleSettingsURL] = useState(''); +console.log(data); const handleModuleAction = () => { setAddonActivated(true); @@ -181,14 +183,14 @@ const ModuleItem = (props) => { } else { setLicenseActivated(false); setModuleEnabled(false); - if(data.slug=='ai-contact-form'){ + if(FreeModules.includes(data.slug)){ setModuleEnabled(true); }else{ setModuleEnabled(false); } } } else { - if(data.slug=='ai-contact-form'){ + if(FreeModules.includes(data.slug)){ setModuleEnabled(true); }else{ setModuleEnabled(false); @@ -347,7 +349,7 @@ const ModuleItem = (props) => { p="5px" m="5px" > - {data.required_plan ? data.slug === 'ai-contact-form' ? 'Free' : data.required_plan : "Pro"} + {data.required_plan ? FreeModules.includes(data.slug) ? 'Free' : data.required_plan : "Pro"} From 5aa89500fe1eb17bf66c8394c77f808980918403 Mon Sep 17 00:00:00 2001 From: riteelama Date: Thu, 7 Nov 2024 13:25:49 +0545 Subject: [PATCH 8/9] Updated --- addons/OxygenBuilder/OxygenFormWidget.php | 26 +++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/OxygenBuilder/OxygenFormWidget.php b/addons/OxygenBuilder/OxygenFormWidget.php index d54f04fe0..fef3e15a2 100644 --- a/addons/OxygenBuilder/OxygenFormWidget.php +++ b/addons/OxygenBuilder/OxygenFormWidget.php @@ -190,7 +190,7 @@ public function form_input_labels_style() { public function submit_btn_style() { $section_submit_btn = $this->addControlSection( 'evf-submit-button', - __( 'Submit Button', 'fluentform' ), + __( 'Submit Button', 'everest-forms' ), 'assets/icon.png', $this ); @@ -199,29 +199,29 @@ public function submit_btn_style() { $section_submit_btn->addStyleControls( array( array( - 'name' => __( 'Color', 'fluentform' ), + 'name' => __( 'Color', 'everest-forms' ), 'selector' => $selector_submit_bttn, 'property' => 'color', ), array( - 'name' => __( 'Background Color', 'fluentform' ), + 'name' => __( 'Background Color', 'everest-forms' ), 'selector' => $selector_submit_bttn, 'property' => 'background-color', ), array( - 'name' => __( 'Hover Color', 'fluentform' ), + 'name' => __( 'Hover Color', 'everest-forms' ), 'selector' => '.ff-btn-submit:hover', 'property' => 'background-color', ), array( - 'name' => __( 'Width', 'fluentform' ), + 'name' => __( 'Width', 'everest-forms' ), 'selector' => $selector_submit_bttn, 'property' => 'width', 'control_type' => 'slider-measurebox', 'unit' => 'px', ), array( - 'name' => __( 'Margin Top', 'fluentform' ), + 'name' => __( 'Margin Top', 'everest-forms' ), 'selector' => $selector_submit_bttn, 'property' => 'margin-top', 'control_type' => 'slider-measurebox', @@ -233,22 +233,22 @@ public function submit_btn_style() { $section_submit_btn->addPreset( 'padding', 'evf_submit_bttn_padding', - __( 'Padding', 'fluentform' ), + __( 'Padding', 'everest-forms' ), $selector_submit_bttn )->whiteList(); $section_submit_btn->addPreset( 'margin', 'evf_submit_bttn_margin', - __( 'Margin', 'fluentform' ), + __( 'Margin', 'everest-forms' ), $selector_submit_bttn )->whiteList(); - $section_submit_btn->typographySection( __( 'Typography', 'fluentform' ), $selector_submit_bttn, $this ); - $section_submit_btn->borderSection( __( 'Border', 'fluentform' ), $selector_submit_bttn, $this ); - $section_submit_btn->borderSection( __( 'Hover Border', 'fluentform' ), $selector_submit_bttn . ':hover', $this ); - $section_submit_btn->boxShadowSection( __( 'Box Shadow', 'fluentform' ), $selector_submit_bttn, $this ); - $section_submit_btn->boxShadowSection( __( 'Hover Box Shadow', 'fluentform' ), $selector_submit_bttn . ':hover', $this ); + $section_submit_btn->typographySection( __( 'Typography', 'everest-forms' ), $selector_submit_bttn, $this ); + $section_submit_btn->borderSection( __( 'Border', 'everest-forms' ), $selector_submit_bttn, $this ); + $section_submit_btn->borderSection( __( 'Hover Border', 'everest-forms' ), $selector_submit_bttn . ':hover', $this ); + $section_submit_btn->boxShadowSection( __( 'Box Shadow', 'everest-forms' ), $selector_submit_bttn, $this ); + $section_submit_btn->boxShadowSection( __( 'Hover Box Shadow', 'everest-forms' ), $selector_submit_bttn . ':hover', $this ); } /** From 3cc0930c4f0078da60159f9b31b0f10fbdf431e0 Mon Sep 17 00:00:00 2001 From: riteelama Date: Tue, 12 Nov 2024 13:45:16 +0545 Subject: [PATCH 9/9] Update - Changelog --- addons/Addons.php | 12 ++++++------ addons/OxygenBuilder/Helper.php | 14 ++++++------- addons/OxygenBuilder/OxygenBuilder.php | 16 +++++++-------- addons/OxygenBuilder/OxygenElement.php | 22 ++++++++++----------- addons/OxygenBuilder/OxygenFormWidget.php | 24 +++++++++++------------ assets/js/frontend/everest-forms.js | 6 +++--- changelog.txt | 3 +++ everest-forms.php | 4 ++-- includes/class-everest-forms.php | 2 +- includes/class-evf-ajax.php | 2 +- includes/evf-core-functions.php | 2 +- readme.txt | 7 +++++-- 12 files changed, 58 insertions(+), 56 deletions(-) diff --git a/addons/Addons.php b/addons/Addons.php index 317edeba7..1fc7d39b1 100644 --- a/addons/Addons.php +++ b/addons/Addons.php @@ -2,7 +2,7 @@ /** * Addons main files. * - * @since xx.xx.xx + * @since 3.0.5 * @package EverestForms\Addons\Addons */ @@ -14,7 +14,7 @@ /** * Addon class. * - * @since xx.xx.xx + * @since 3.0.5 */ class Addons { @@ -23,7 +23,7 @@ class Addons { /** * Class constructor. * - * @since xx.xx.xx + * @since 3.0.5 */ public function __construct() { add_action( 'init', array( $this, 'addons_init' ) ); @@ -32,13 +32,13 @@ public function __construct() { /** * Get addon list. * - * @since xx.xx.xx + * @since 3.0.5 */ public function get_addon_list() { /** * Everest forms addon list. * - * @since xx.xx.xx + * @since 3.0.5 * @return array List of addon class. */ return apply_filters( @@ -52,7 +52,7 @@ public function get_addon_list() { /** * Initializes the Everest Forms addons. * - * @since xx.xx.xx + * @since 3.0.5 */ public function addons_init() { diff --git a/addons/OxygenBuilder/Helper.php b/addons/OxygenBuilder/Helper.php index 4bbde365c..1e0736936 100644 --- a/addons/OxygenBuilder/Helper.php +++ b/addons/OxygenBuilder/Helper.php @@ -2,7 +2,7 @@ /** * Oxygen Integration helper functions. * - * @since xx.xx.xx + * @since 3.0.5 * @package EverestForms\Addons\OxygenBuilder */ @@ -13,14 +13,14 @@ * * @package EverestForms\Addons\OxygenBuilder * - * @since xx.xx.xx + * @since 3.0.5 */ class Helper { /** * Return if Oxygen is active. * - * @since xx.xx.xx + * @since 3.0.5 * * @return boolean */ @@ -31,7 +31,7 @@ public static function is_oxygen_active() { /** * Check if the current request is for oxygen editor. * - * @since xx.xx.xx + * @since 3.0.5 * * @return boolean */ @@ -42,13 +42,13 @@ public static function is_oxygen_editor() { /** * Notice if the oxygen is not instaled. * - * @since xx.xx.xx + * @since 3.0.5 */ public static function print_admin_notice() { add_action( 'admin_notices', - function() { + function () { printf( '

%s %s

', esc_html( 'Everest Forms:' ), @@ -64,7 +64,7 @@ function() { /** * Get the form list. * - * @since xx.xx.xx + * @since 3.0.5 */ public static function get_form_list() { $forms = evf_get_all_forms(); diff --git a/addons/OxygenBuilder/OxygenBuilder.php b/addons/OxygenBuilder/OxygenBuilder.php index 7b9cd2eb0..20b4f0b32 100644 --- a/addons/OxygenBuilder/OxygenBuilder.php +++ b/addons/OxygenBuilder/OxygenBuilder.php @@ -2,7 +2,7 @@ /** * Oxygen builder integration. * - * @since xx.xx.xx + * @since 3.0.5 * @package EverestForms\Addons\OxygenBuilder\OxygenBuilder */ namespace EverestForms\Addons\OxygenBuilder; @@ -13,7 +13,7 @@ /** * OxygenBuilder. * - * @since xx.xx.xx + * @since 3.0.5 */ class OxygenBuilder { @@ -22,7 +22,7 @@ class OxygenBuilder { /** * Constructor. * - * @since xx.xx.xx + * @since 3.0.5 */ public function __construct() { $this->setup(); @@ -30,7 +30,7 @@ public function __construct() { /** * Init. * - * @since xx.xx.xx + * @since 3.0.5 */ public function setup() { @@ -49,13 +49,12 @@ public function setup() { add_action( 'oxygen_add_plus_everest-forms_section_content', array( $this, 'register_add_plus_subsections' ) ); new OxygenFormWidget(); - } /** - * Add accordin section in the elements. + * Add accordion section in the elements. * - * @since xx.xx.xx + * @since 3.0.5 */ public function add_accordion_section() { $brand_name = __( 'Everest Forms', 'everest-forms' ); @@ -65,10 +64,9 @@ public function add_accordion_section() { /** * Add subsection. * - * @since xx.xx.xx + * @since 3.0.5 */ public function register_add_plus_subsections() { do_action( 'oxygen_add_plus_everest-forms_form' ); } - } diff --git a/addons/OxygenBuilder/OxygenElement.php b/addons/OxygenBuilder/OxygenElement.php index a3594b3d9..9441b389d 100644 --- a/addons/OxygenBuilder/OxygenElement.php +++ b/addons/OxygenBuilder/OxygenElement.php @@ -2,22 +2,22 @@ /** * Oxygen elements. * - * @since xx.xx.xx + * @since 3.0.5 * @package EverestForms\Addons\OxygenBuilder\OxygenElement */ - namespace EverestForms\Addons\OxygenBuilder; +namespace EverestForms\Addons\OxygenBuilder; - /** - * Oxygen elements. - * - * @since xx.xx.xx - */ +/** + * Oxygen elements. + * + * @since 3.0.5 + */ class OxygenElement extends \OxyEl { /** * Init. * - * @since xx.xx.xx + * @since 3.0.5 */ public function init() { $this->El->useAJAXControls(); @@ -26,7 +26,7 @@ public function init() { /** * Class names. * - * @since xx.xx.xx + * @since 3.0.5 */ public function class_names() { return array( 'evf-oxy-element' ); @@ -35,7 +35,7 @@ public function class_names() { /** * Accordion button places. * - * @since xx.xx.xx + * @since 3.0.5 */ public function button_place() { $button_place = $this->accordion_button_place(); @@ -50,7 +50,7 @@ public function button_place() { /** * Button priority. * - * @since xx.xx.xx + * @since 3.0.5 */ public function button_priority() { return ''; diff --git a/addons/OxygenBuilder/OxygenFormWidget.php b/addons/OxygenBuilder/OxygenFormWidget.php index fef3e15a2..20ae75aa4 100644 --- a/addons/OxygenBuilder/OxygenFormWidget.php +++ b/addons/OxygenBuilder/OxygenFormWidget.php @@ -2,7 +2,7 @@ /** * Oxygen form widget. * - * @since xx.xx.xx + * @since 3.0.5 * @package EverestForms\Addons\OxygenBuilder\OxygenFormWidget */ namespace EverestForms\Addons\OxygenBuilder; @@ -16,7 +16,7 @@ class OxygenFormWidget extends OxygenElement { /** * Name. * - * @since xx.xx.xx + * @since 3.0.5 */ public function name() { return __( 'Forms', 'everest-forms' ); @@ -25,7 +25,7 @@ public function name() { /** * Slug. * - * @since xx.xx.xx + * @since 3.0.5 */ public function slug() { return 'evf_form_widget'; @@ -34,7 +34,7 @@ public function slug() { /** * Accordion place. * - * @since xx.xx.xx + * @since 3.0.5 */ public function accordion_button_place() { return 'form'; @@ -42,7 +42,7 @@ public function accordion_button_place() { /** * Enqueue the styles. * - * @since xx.xx.xx + * @since 3.0.5 */ public function custom_init() { wp_register_style( 'everest-forms-admin', evf()->plugin_url() . '/assets/css/admin.css', array(), EVF_VERSION ); @@ -50,12 +50,11 @@ public function custom_init() { wp_enqueue_style( 'everest-forms-admin' ); wp_enqueue_style( 'everest-forms-general' ); - } /** * Icon. * - * @since xx.xx.xx + * @since 3.0.5 */ public function icon() { return \EVF_Admin_Menus::get_icon_svg(); @@ -64,7 +63,7 @@ public function icon() { /** * Add controls. * - * @since xx.xx.xx + * @since 3.0.5 */ public function controls() { $templates_control = $this->addOptionControl( @@ -83,13 +82,12 @@ public function controls() { $this->form_container_style_controls(); $this->form_input_labels_style(); $this->submit_btn_style(); - } /** * Form contrainer style controls. * - * @since xx.xx.xx + * @since 3.0.5 */ public function form_container_style_controls() { $section_container = $this->addControlSection( @@ -152,7 +150,7 @@ public function form_container_style_controls() { /** * Field input label styles. * - * @since xx.xx.xx + * @since 3.0.5 */ public function form_input_labels_style() { $section_label = $this->addControlSection( @@ -185,7 +183,7 @@ public function form_input_labels_style() { /** * Submit button style. * - * @since xx.xx.xx + * @since 3.0.5 */ public function submit_btn_style() { $section_submit_btn = $this->addControlSection( @@ -254,7 +252,7 @@ public function submit_btn_style() { /** * Render the element's UI by outputting HTML. * - * @since xx.xx.xx + * @since 3.0.5 * * @param array $options * @param array $defaults diff --git a/assets/js/frontend/everest-forms.js b/assets/js/frontend/everest-forms.js index 979029df6..b7f2d259a 100644 --- a/assets/js/frontend/everest-forms.js +++ b/assets/js/frontend/everest-forms.js @@ -52,7 +52,7 @@ jQuery( function ( $ ) { /** * Focus on first error on submit. * - * @since xx.xx.xx + * @since 3.0.5 */ this.$everest_form.on( 'submit', function(){ everest_forms.onSubmitErrorScroll(); @@ -738,11 +738,11 @@ jQuery( function ( $ ) { }, 1000 ); } }, - + /** * Focus on first error on submit. * - * @since xx.xx.xx + * @since 3.0.5 */ onSubmitErrorScroll: function(){ if ( $( '.everest-forms-invalid' ).length ) { diff --git a/changelog.txt b/changelog.txt index f55c2d656..5f81ff745 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ == Changelog == += 3.0.5 - xx-xx-2024 +* Feature - Oxygen builder integration. + = 3.0.4.2 - 03-11-2024 * Fix - Escaping issue in required field. diff --git a/everest-forms.php b/everest-forms.php index fd74e3ec9..dd0462f1a 100644 --- a/everest-forms.php +++ b/everest-forms.php @@ -3,7 +3,7 @@ * Plugin Name: Everest Forms * Plugin URI: https://everestforms.net/ * Description: Drag and Drop contact form builder to easily create simple to complex forms for any purpose. Lightweight, Beautiful design, responsive and more. - * Version: 3.0.4.2 + * Version: 3.0.5 * Author: WPEverest * Author URI: https://wpeverest.com * Text Domain: everest-forms @@ -51,7 +51,7 @@ */ add_action( 'admin_notices', - function() { + function () { ?>

diff --git a/includes/class-everest-forms.php b/includes/class-everest-forms.php index 24cd64be3..14ed445b2 100644 --- a/includes/class-everest-forms.php +++ b/includes/class-everest-forms.php @@ -356,7 +356,7 @@ public function includes() { /** * Loaded the addons. * - * @since xx.xx.xx + * @since 3.0.5 */ public function init_addons() { Addons::init(); diff --git a/includes/class-evf-ajax.php b/includes/class-evf-ajax.php index 5a1616a4f..246905910 100644 --- a/includes/class-evf-ajax.php +++ b/includes/class-evf-ajax.php @@ -1731,7 +1731,7 @@ public static function import_entries() { /** * Generate the restapi key * - * @since xx.xx.xx + * @since 3.0.5 */ public static function generate_restapi_key() { try { diff --git a/includes/evf-core-functions.php b/includes/evf-core-functions.php index c6578aab3..9008c7f6e 100644 --- a/includes/evf-core-functions.php +++ b/includes/evf-core-functions.php @@ -5612,7 +5612,7 @@ function evf_get_next_key_array( $arr, $key ) { /** * Function to generate the api key base on the string. * - * @since xx.xx.xx + * @since 3.0.5 * @param $string The string value. */ function generate_api_key( $string = 'evf_restapi', $length = 32 ) { diff --git a/readme.txt b/readme.txt index a29aa146f..15cd03677 100644 --- a/readme.txt +++ b/readme.txt @@ -2,9 +2,9 @@ Contributors: WPEverest Tags: contact form, custom form, form builder, forms, survey Requires at least: 5.2 -Tested up to: 6.6.2 +Tested up to: 6.7 Requires PHP: 7.2 -Stable tag: 3.0.4.2 +Stable tag: 3.0.5 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -308,6 +308,9 @@ Yes you can! Join in on our [GitHub repository](https://github.com/wpeverest/eve == Changelog == += 3.0.5 - xx-xx-2024 +* Feature - Oxygen builder integration. + = 3.0.4.2 - 03-11-2024 * Fix - Escaping issue in required field.