From 2949d8702aeb9bf51690908b923bac638ccceeae Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pakrym@stripe.com>
Date: Tue, 12 Apr 2022 16:07:30 -0700
Subject: [PATCH 1/2] Add a common Makefile

---
 Makefile | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index f9c597580..9a811753e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,7 @@
-export PHPDOCUMENTOR_VERSION := v3.0.0
+.PHONY: codegen-format update-version
+update-version:
+	@echo "$(VERSION)" > VERSION
+	@perl -pi -e 's|VERSION = '\''[.\d]+'\''|VERSION = '\''$(VERSION)'\''|' lib/Stripe.php
 
-vendor: composer.json
-	composer install
-
-vendor/bin/phpdoc: vendor
-	curl -sfL https://github.com/phpDocumentor/phpDocumentor/releases/download/$(PHPDOCUMENTOR_VERSION)/phpDocumentor.phar -o vendor/bin/phpdoc
-	chmod +x vendor/bin/phpdoc
-
-test: vendor
-	vendor/bin/phpunit
-.PHONY: test
-
-fmt: vendor
-	vendor/bin/php-cs-fixer fix -v --using-cache=no .
-.PHONY: fmt
-
-fmtcheck: vendor
-	vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no .
-.PHONY: fmtcheck
-
-phpdoc: vendor/bin/phpdoc
-	vendor/bin/phpdoc
-
-phpstan: vendor
-	php -d memory_limit=512M vendor/bin/phpstan analyse lib tests
-.PHONY: phpstan
-
-phpstan-baseline: vendor/bin/phpstan
-	php -d memory_limit=512M vendor/bin/phpstan analyse lib tests --generate-baseline
-.PHONY: phpstan-baseline
+codegen-format:
+	composer install && ./vendor/bin/php-cs-fixer fix -v --using-cache=no .

From cddb6745a842c11dddc00912f56db32320a42444 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pakrym@stripe.com>
Date: Tue, 12 Apr 2022 16:09:41 -0700
Subject: [PATCH 2/2] merge

---
 Makefile | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9a811753e..886733875 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,39 @@
-.PHONY: codegen-format update-version
+export PHPDOCUMENTOR_VERSION := v3.0.0
+
+vendor: composer.json
+	composer install
+
+vendor/bin/phpdoc: vendor
+	curl -sfL https://github.com/phpDocumentor/phpDocumentor/releases/download/$(PHPDOCUMENTOR_VERSION)/phpDocumentor.phar -o vendor/bin/phpdoc
+	chmod +x vendor/bin/phpdoc
+
+test: vendor
+	vendor/bin/phpunit
+.PHONY: test
+
+fmt: vendor
+	vendor/bin/php-cs-fixer fix -v --using-cache=no .
+.PHONY: fmt
+
+fmtcheck: vendor
+	vendor/bin/php-cs-fixer fix -v --dry-run --using-cache=no .
+.PHONY: fmtcheck
+
+phpdoc: vendor/bin/phpdoc
+	vendor/bin/phpdoc
+
+phpstan: vendor
+	php -d memory_limit=512M vendor/bin/phpstan analyse lib tests
+.PHONY: phpstan
+
+phpstan-baseline: vendor/bin/phpstan
+	php -d memory_limit=512M vendor/bin/phpstan analyse lib tests --generate-baseline
+.PHONY: phpstan-baseline
+
 update-version:
 	@echo "$(VERSION)" > VERSION
 	@perl -pi -e 's|VERSION = '\''[.\d]+'\''|VERSION = '\''$(VERSION)'\''|' lib/Stripe.php
+.PHONY: update-version
 
-codegen-format:
-	composer install && ./vendor/bin/php-cs-fixer fix -v --using-cache=no .
+codegen-format: fmt
+.PHONY: codegen-format