From ea9dbff80fcbeab59f31a69fe2843ca1a094e64c Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Tue, 6 Sep 2022 20:34:41 -0400 Subject: [PATCH] Implement RFC 0050: Rename Buildpack (#47) * Implement RFC 0050: Rename Buildpack Renames 'Paketo Composer Install Buildpack' to 'Paketo Buildpack for Composer Install'. Implements RFC 0050, https://github.com/paketo-buildpacks/rfcs/issues/233, for this buildpack. Signed-off-by: Daniel Mikusa * Fix buildpack name assertions * fix comment wording * remove buildpack name assertions Signed-off-by: Daniel Mikusa Co-authored-by: Timothy Hitchener Co-authored-by: Tim Hitchener Co-authored-by: Sophie Wigmore --- build.go | 2 +- buildpack.toml | 2 +- integration/custom_vendor_dir_test.go | 8 -------- integration/default_app_test.go | 8 -------- integration/global_test.go | 8 -------- integration/outside_autoloading_test.go | 8 -------- integration/with_extensions_test.go | 8 -------- integration/with_vendored_packages_test.go | 8 -------- 8 files changed, 2 insertions(+), 50 deletions(-) diff --git a/build.go b/build.go index 8d70de24..1944f9ae 100644 --- a/build.go +++ b/build.go @@ -418,7 +418,7 @@ extension = openssl.so`, os.Getenv(PhpExtensionDir)) // https://getcomposer.org/doc/03-cli.md#check-platform-reqs // // Any "missing" requirements will be added to an INI file that should be autoloaded via PHP_INI_SCAN_DIR, -// when used in conjunction with the `php-dist` Paketo Cloud Native Buildpack +// when used in conjunction with the `php-dist` Paketo Buildpack // INI file location: {workingDir}/.php.ini.d/composer-extensions.ini // PHP_INI_SCAN_DIR: https://github.com/paketo-buildpacks/php-dist/blob/bfed65e9c3b59cf2c5aee3752d82470f8259f655/build.go#L219-L223 // Requires `php-dist` 0.8.0+ (https://github.com/paketo-buildpacks/php-dist/releases/tag/v0.8.0) diff --git a/buildpack.toml b/buildpack.toml index be91026b..4c7565e5 100644 --- a/buildpack.toml +++ b/buildpack.toml @@ -5,7 +5,7 @@ api = "0.7" homepage = "https://github.com/paketo-buildpacks/composer-install" id = "paketo-buildpacks/composer-install" keywords = ["php", "composer"] - name = "Paketo Composer Install Buildpack" + name = "Paketo Buildpack for Composer Install" sbom-formats = ["application/vnd.cyclonedx+json", "application/spdx+json", "application/vnd.syft+json"] [[buildpack.licenses]] diff --git a/integration/custom_vendor_dir_test.go b/integration/custom_vendor_dir_test.go index 74c4e032..9f122ee6 100644 --- a/integration/custom_vendor_dir_test.go +++ b/integration/custom_vendor_dir_test.go @@ -70,14 +70,6 @@ func testCustomVendorDir(t *testing.T, context spec.G, it spec.S) { Expect(logs).To(ContainSubstring(fmt.Sprintf("Writing symlink /workspace/custom_vendor_dir => /layers/%s/composer-packages/vendor", strings.ReplaceAll(buildpackInfo.Buildpack.ID, "/", "_")))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack"))) - container, err = docker.Container.Run. WithEnv(map[string]string{"PORT": "8765"}). WithPublish("8765"). diff --git a/integration/default_app_test.go b/integration/default_app_test.go index da437811..76a534cd 100644 --- a/integration/default_app_test.go +++ b/integration/default_app_test.go @@ -67,14 +67,6 @@ func testDefaultApp(t *testing.T, context spec.G, it spec.S) { Expect(logs).To(ContainSubstring("Ran 'composer install --no-progress --no-dev --no-autoloader'")) - Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack"))) - container, err = docker.Container.Run. WithEnv(map[string]string{"PORT": "8765"}). WithPublish("8765"). diff --git a/integration/global_test.go b/integration/global_test.go index 1d3be170..3cd708fb 100644 --- a/integration/global_test.go +++ b/integration/global_test.go @@ -69,14 +69,6 @@ func testGlobal(t *testing.T, context spec.G, it spec.S) { Expect(logs).To(ContainSubstring("Ran 'composer global require --no-progress friendsofphp/php-cs-fixer'")) - Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack"))) - container, err = docker.Container.Run. WithEnv(map[string]string{"PORT": "8765"}). WithPublish("8765"). diff --git a/integration/outside_autoloading_test.go b/integration/outside_autoloading_test.go index 88da1722..02b3b1f7 100644 --- a/integration/outside_autoloading_test.go +++ b/integration/outside_autoloading_test.go @@ -67,14 +67,6 @@ func testOutsideAutoloading(t *testing.T, context spec.G, it spec.S) { Expect(logs).To(ContainSubstring("Ran 'composer install --no-progress --no-dev --no-autoloader'")) Expect(logs).To(ContainSubstring("Ran 'composer dump-autoload --classmap-authoritative'")) - Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack"))) - container, err = docker.Container.Run. WithEnv(map[string]string{"PORT": "8080"}). WithPublish("8080"). diff --git a/integration/with_extensions_test.go b/integration/with_extensions_test.go index ccc07827..93fbe16d 100644 --- a/integration/with_extensions_test.go +++ b/integration/with_extensions_test.go @@ -68,14 +68,6 @@ func testWithExtensions(t *testing.T, context spec.G, it spec.S) { Expect(logs).To(ContainSubstring("Ran 'composer check-platform-reqs', found extensions 'fileinfo, gd, mysqli, zip'")) - Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack"))) - container, err = docker.Container.Run. WithEnv(map[string]string{"PORT": "8765"}). WithPublish("8765"). diff --git a/integration/with_vendored_packages_test.go b/integration/with_vendored_packages_test.go index ccaabfb5..3d4a235c 100644 --- a/integration/with_vendored_packages_test.go +++ b/integration/with_vendored_packages_test.go @@ -67,14 +67,6 @@ func testWithVendoredPackages(t *testing.T, context spec.G, it spec.S) { Expect(logs).To(ContainSubstring("Detected existing vendored packages, will run 'composer install' with those packages")) - Expect(logs).To(ContainLines(ContainSubstring("PHP Distribution Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Composer Install Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP FPM Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("Nginx Server Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Nginx Buildpack"))) - Expect(logs).To(ContainLines(ContainSubstring("PHP Start Buildpack"))) - container, err = docker.Container.Run. WithEnv(map[string]string{"PORT": "8765"}). WithPublish("8765").