diff --git a/composer.json b/composer.json index 2f0c0fafe40..6a5d9a3f29c 100644 --- a/composer.json +++ b/composer.json @@ -21,9 +21,9 @@ "php": ">=7.4", "ext-json": "*", "ext-openssl": "*", - "cweagans/composer-patches": "^1.7", "google/apiclient": "^2.16", "google/apiclient-services-adsenselinks": "^0.1.0", + "google/apiclient-services-analyticsdata": "dev-latest", "google/apiclient-services-subscribewithgoogle": "^0.1.0", "guzzlehttp/guzzle": "^7.9.2", "symfony/polyfill-intl-idn": "^1.29.0" @@ -48,14 +48,12 @@ "sort-packages": true, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true, - "roots/wordpress-core-installer": true, - "cweagans/composer-patches": true + "roots/wordpress-core-installer": true } }, "extra": { "google/apiclient-services": [ "Adsense", - "AnalyticsData", "GoogleAnalyticsAdmin", "PagespeedInsights", "PeopleService", @@ -63,12 +61,7 @@ "SiteVerification", "TagManager" ], - "wordpress-install-dir": "vendor/roots/wordpress", - "patches": { - "google/apiclient-services": { - "Fixes for empty filter": "patches-composer/google-api-client-services-v0.355.0.patch" - } - } + "wordpress-install-dir": "vendor/roots/wordpress" }, "repositories": [ { @@ -78,6 +71,13 @@ "symlink": false } }, + { + "type": "path", + "url": "packages/apiclient-services-analyticsdata", + "options": { + "symlink": false + } + }, { "type": "path", "url": "packages/apiclient-services-subscribewithgoogle", diff --git a/composer.lock b/composer.lock index 6865177424f..ebe1619b679 100644 --- a/composer.lock +++ b/composer.lock @@ -4,56 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c71ae91707a1e63e890687b66846c64c", + "content-hash": "375a1ac1c1f290ef66bea9f0688bebe5", "packages": [ - { - "name": "cweagans/composer-patches", - "version": "1.7.3", - "source": { - "type": "git", - "url": "https://github.com/cweagans/composer-patches.git", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0 || ^2.0", - "php": ">=5.3.0" - }, - "require-dev": { - "composer/composer": "~1.0 || ~2.0", - "phpunit/phpunit": "~4.6" - }, - "type": "composer-plugin", - "extra": { - "class": "cweagans\\Composer\\Patches" - }, - "autoload": { - "psr-4": { - "cweagans\\Composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Cameron Eagans", - "email": "me@cweagans.net" - } - ], - "description": "Provides a way to patch Composer packages.", - "support": { - "issues": "https://github.com/cweagans/composer-patches/issues", - "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" - }, - "time": "2022-12-20T22:53:13+00:00" - }, { "name": "firebase/php-jwt", "version": "v6.10.0", @@ -249,6 +201,20 @@ "relative": true } }, + { + "name": "google/apiclient-services-analyticsdata", + "version": "dev-latest", + "dist": { + "type": "path", + "url": "packages/apiclient-services-analyticsdata", + "reference": "ef1191f75ac16f283dbb0c75e95d79a3c4911e60" + }, + "type": "library", + "transport-options": { + "symlink": false, + "relative": true + } + }, { "name": "google/apiclient-services-subscribewithgoogle", "version": "v0.1", @@ -5240,6 +5206,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "google/apiclient-services-analyticsdata": 20, "roave/security-advisories": 20 }, "prefer-stable": false, diff --git a/patches-composer/google-api-client-services-v0.355.0.patch b/patches-composer/google-api-client-services-v0.355.0.patch deleted file mode 100644 index 7f975a8bb7e..00000000000 --- a/patches-composer/google-api-client-services-v0.355.0.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/src/AnalyticsData/EmptyFilter.php b/src/AnalyticsData/EmptyFilter.php -new file mode 100644 -index 000000000..099753334 ---- /dev/null -+++ b/src/AnalyticsData/EmptyFilter.php -@@ -0,0 +1,25 @@ -+betweenFilter; - } -+ /** -+ * @param EmptyFilter -+ */ -+ public function setEmptyFilter(EmptyFilter $emptyFilter) -+ { -+ $this->emptyFilter = $emptyFilter; -+ } -+ /** -+ * @return EmptyFilter -+ */ -+ public function getEmptyFilter() -+ { -+ return $this->emptyFilter; -+ } - /** - * @param string - */