Upstream improvements by SteelWagstaff · Pull Request #93 · pressbooks/bedrock

SteelWagstaff · 2021-08-31T14:16:06Z

This PR merges upstream improvements from the roots/bedrock project. It is a partial fix for pressbooks/private#113 and https://github.com/pressbooks/private/issues/688

Notes

We have not pulled upstream changes since inital creation. See roots/bedrock@1.7.6...master for full changelog.

Future improvements needed: We should add allow-plugins declarations to support any plugins we need, because Composer 2.2.0 default behaviour is to restrict installation of plugins unless explicitly declared (https://getcomposer.org/doc/06-config.md#allow-plugins)

Upstream changes we are not yet inheriting due to unresolved composer conflicts:

Add roave/security-advisories as a dev dependency: Adds roave/security-advisories to composer dev deps roots/bedrock#376 (conflict with illuminate/view, a dependency of jenssegers/blade, which is locked to 1.1.0 in pb-cli & pressbooks itself: https://github.com/pressbooks/pb-cli/blob/3a787736d9dd27de3232cb87f83a6f775811453e/composer.json#L10). Must fix Upgrade jenssegers/blade pressbooks#1734 to resolve.
Bump composer/installers from 1.12.0 to 2.0.1: Bump composer/installers from 1.12.0 to 2.0.1 roots/bedrock#621
Bump squizlabs/php_codesniffer to 3.6.2: Bump squizlabs/php_codesniffer from 3.6.1 to 3.6.2 roots/bedrock#623 (we have version locked in our own coding standards: https://github.com/pressbooks/coding-standards/blob/e332af77b246b088c5320934296746c1033a98cb/composer.json#L7)

Notable changes:

New Bedrock Configuration Model (#380) (adds wp-config plugin as dependency and changes how application config works)
Use new Bedrock Autoloader package: Use Bedrock Autoloader package roots/bedrock#519
Add support for using database DSN instead of defining all database variables: Allow to use a database DSN instead of all the database variables roots/bedrock#414 + Make DSN implementation more uniform roots/bedrock#415
Add WP_POST_REVISIONS as an option: Add WP_POST_REVISIONS as an option roots/bedrock#572 (we recently defined this ourselves for our golden bedrock: https://github.com/pressbooks/pressbooksedu-golden-bedrock/commit/d222f544c68a6c6d94c08ebc932053d2f9be7e31)
Add WP_DEBUG_LOG: Add WP_DEBUG_LOG roots/bedrock#499 + fix(debug-log): WP_DEBUG_LOG should be true by default roots/bedrock#505
Support Composer 2: Bump roots/wordpress-core-installer for composer 2 roots/bedrock#552
Detect HTTPS behind reverse proxy: Detect HTTPS if wordpress is behind a reverse proxy roots/bedrock#413
Move disallow indexing mu-plugin to package: Move disallow indexing mu-plugin to package roots/bedrock#521
Support .env.local config override: Support .env.local config override roots/bedrock#594
Update dependencies, including composer/installers: Bump composer/installers from 1.11.0 to 1.12.0 roots/bedrock#606, vlucas/phpdotenv: Wrong redirected URL when installing new WordPress bedrock 1.13.0 roots/bedrock#493 + chore(deps): Bump vlucas/phpdotenv from 5.2.0 to 5.3.0 roots/bedrock#570, oscarotero/env: chore(deps): Bump oscarotero/env from 2.0.0 to 2.1.0 roots/bedrock#531, bcrypt: Bump roots/wp-password-bcrypt from 1.0.0 to 1.1.0 roots/bedrock#613)

…/wordpress`

Update to WordPress 5.0, switch from from johnpbloch/wordpress to roots/wordpress

Update composer.lock

Ignore wp-cli.local.yml

Add PHP 7.3 to Travis test matrix

Dependencies.io: Filter updates

Update composer.lock

[Dependencies.io] Always suggest updating WordPress

Update roots/wordpress in composer.json from 5.0 to 5.0.1

Update roots/wordpress in composer.json from 5.0.1 to 5.0.2

Bump requirements to PHP 7.1

Update roots/wordpress in composer.json from 5.0.2 to 5.0.3

Bumps [roots/wordpress](https://github.com/WordPress/WordPress) from 5.8.1 to 5.8.2. - [Release notes](https://github.com/WordPress/WordPress/releases) - [Commits](WordPress/WordPress@5.8.1...5.8.2) --- updated-dependencies: - dependency-name: roots/wordpress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

roots/sage#2837

* Require PHP 7.4 * CI: Switch to setup-php * Update README.md

Bumps [roots/wordpress](https://github.com/WordPress/WordPress) from 5.8.2 to 5.8.3. - [Release notes](https://github.com/WordPress/WordPress/releases) - [Commits](WordPress/WordPress@5.8.2...5.8.3) --- updated-dependencies: - dependency-name: roots/wordpress dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [composer/installers](https://github.com/composer/installers) from 1.12.0 to 2.0.1. - [Release notes](https://github.com/composer/installers/releases) - [Changelog](https://github.com/composer/installers/blob/main/CHANGELOG.md) - [Commits](composer/installers@v1.12.0...v2.0.1) --- updated-dependencies: - dependency-name: composer/installers dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [vlucas/phpdotenv](https://github.com/vlucas/phpdotenv) from 5.3.1 to 5.4.1. - [Release notes](https://github.com/vlucas/phpdotenv/releases) - [Commits](vlucas/phpdotenv@v5.3.1...v5.4.1) --- updated-dependencies: - dependency-name: vlucas/phpdotenv dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [squizlabs/php_codesniffer](https://github.com/squizlabs/PHP_CodeSniffer) from 3.6.1 to 3.6.2. - [Release notes](https://github.com/squizlabs/PHP_CodeSniffer/releases) - [Commits](squizlabs/PHP_CodeSniffer@3.6.1...3.6.2) --- updated-dependencies: - dependency-name: squizlabs/php_codesniffer dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): Bump roots/wordpress to 5.9 * Update CHANGELOG [ci skip]

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…msater # Conflicts: # composer.json # composer.lock

Pull in latest roots updates

private-packagist · 2022-03-02T00:33:26Z

composer.lock

Click to show 109 changes in this composer.lock file

Package changes

Package	Operation	From	To	Changes
aws/aws-crt-php	add	-	v1.0.2	view code
graham-campbell/result-type	add	-	v1.0.4	view code
phpcompatibility/php-compatibility	add	-	9.3.5	view code
roots/bedrock-autoloader	add	-	1.0.4	view code
roots/bedrock-disallow-indexing	add	-	2.0.0	view code
squizlabs/php_codesniffer	add	-	3.5.8	view code
aws/aws-sdk-php	upgrade	3.173.19	3.211.1	diff
composer/installers	upgrade	v1.9.0	v1.12.0	diff
docraptor/docraptor	upgrade	1.3.0	3.0.1	diff
guzzlehttp/guzzle	upgrade	7.3.0	7.4.1	diff
guzzlehttp/promises	upgrade	1.4.1	1.5.1	diff
guzzlehttp/psr7	upgrade	1.8.1	2.1.0	diff
intervention/image	upgrade	2.5.1	2.7.1	diff
masterminds/html5	upgrade	2.7.4	2.7.5	diff
monolog/monolog	upgrade	2.2.0	2.3.5	diff
mtdowling/jmespath.php	upgrade	2.5.0	2.6.1	diff
oscarotero/env	upgrade	v1.2.0	v2.1.0	diff
paragonie/random_compat	upgrade	v2.0.20	v2.0.21	diff
phpoption/phpoption	upgrade	1.7.5	1.8.1	diff
predis/predis	upgrade	v1.1.7	v1.1.10	diff
pressbooks/pb-cli	upgrade	2.0.1	2.1.0	diff
pressbooks/pressbooks	upgrade	dev-dev 3217c73	dev-dev 9849480	diff
pressbooks/pressbooks-aldine	upgrade	dev-dev b9cf474	dev-dev 0566985	diff
pressbooks/pressbooks-book	upgrade	dev-dev dca488a	dev-dev 01246da	diff
pressbooks/pressbooks-clarke	upgrade	dev-dev d3d2652	dev-dev a36d312	diff
pressbooks/pressbooks-jacobs	upgrade	dev-dev 6685b3b	dev-dev d0cc9c8	diff
psr/log	upgrade	1.1.3	1.1.4	diff
rhubarbgroup/redis-cache	upgrade	2.0.18	2.0.23	diff
roots/wordpress	upgrade	5.6.2	5.9.1	diff
roots/wp-password-bcrypt	upgrade	1.0.0	1.1.0	diff
sinergi/browser-detector	upgrade	6.1.3	6.1.4	diff
spatie/color	upgrade	1.2.4	1.5.0	diff
symfony/deprecation-contracts	upgrade	v2.4.0	v2.5.0	diff
symfony/polyfill-ctype	upgrade	v1.22.1	v1.24.0	diff
symfony/polyfill-mbstring	upgrade	v1.13.1	v1.24.0	diff
symfony/polyfill-php80	upgrade	v1.22.1	v1.24.0	diff
vlucas/phpdotenv	upgrade	v3.6.8	v5.4.1	diff
clue/stream-filter	remove	v1.5.0	-	-
composer/package-versions-deprecated	remove	1.11.99.1	-	-
http-interop/http-factory-guzzle	remove	1.0.0	-	-
jean85/pretty-package-versions	remove	1.6.0	-	-
php-http/client-common	remove	2.3.0	-	-
php-http/discovery	remove	1.13.0	-	-
php-http/httplug	remove	2.2.0	-	-
php-http/message	remove	1.11.0	-	-
php-http/message-factory	remove	v1.0.2	-	-
php-http/promise	remove	1.1.0	-	-
psr/container	remove	1.0.0	-	-
sentry/sdk	remove	3.1.0	-	-
sentry/sentry	remove	3.2.1	-	-
symfony/http-client	remove	v5.2.6	-	-
symfony/http-client-contracts	remove	v2.4.0	-	-
symfony/options-resolver	remove	v5.2.4	-	-
symfony/polyfill-php73	remove	v1.13.1	-	-
symfony/polyfill-uuid	remove	v1.22.1	-	-
symfony/service-contracts	remove	v1.1.8	-	-

Dev Package changes

Package	Operation	From	To	Changes
automattic/vipwpcs	add	-	2.0.0	view code
dealerdirect/phpcodesniffer-composer-installer	add	-	v0.7.2	view code
nikic/php-parser	add	-	v4.13.2	view code
phpcompatibility/phpcompatibility-paragonie	add	-	1.3.1	view code
phpcompatibility/phpcompatibility-wp	add	-	2.1.3	view code
phpunit/php-invoker	add	-	3.1.1	view code
psr/container	add	-	1.1.2	view code
sebastian/cli-parser	add	-	1.0.1	view code
sebastian/code-unit	add	-	1.0.8	view code
sebastian/complexity	add	-	2.0.2	view code
sebastian/lines-of-code	add	-	1.0.3	view code
sebastian/type	add	-	2.3.4	view code
symfony/polyfill-intl-grapheme	add	-	v1.24.0	view code
symfony/polyfill-intl-normalizer	add	-	v1.24.0	view code
symfony/polyfill-php73	add	-	v1.24.0	view code
symfony/service-contracts	add	-	v2.5.0	view code
symfony/string	add	-	v5.4.3	view code
doctrine/instantiator	upgrade	1.2.0	1.4.0	diff
fig-r/psr2r-sniffer	upgrade	0.5.0	0.5.2	diff
humanmade/coding-standards	upgrade	v0.5.0	v1.1.3	diff
myclabs/deep-copy	upgrade	1.9.3	1.10.2	diff
phar-io/manifest	upgrade	1.0.3	2.0.3	diff
phar-io/version	upgrade	2.0.1	3.2.1	diff
phpdocumentor/reflection-common	upgrade	2.0.0	2.2.0	diff
phpdocumentor/reflection-docblock	upgrade	4.3.2	5.3.0	diff
phpdocumentor/type-resolver	upgrade	1.0.1	1.6.0	diff
phpspec/prophecy	upgrade	1.8.1	v1.15.0	diff
phpunit/php-code-coverage	upgrade	6.1.4	9.2.14	diff
phpunit/php-file-iterator	upgrade	2.0.2	3.0.6	diff
phpunit/php-text-template	upgrade	1.2.1	2.0.4	diff
phpunit/php-timer	upgrade	2.1.2	5.0.3	diff
phpunit/phpunit	upgrade	7.5.16	9.5.16	diff
pressbooks/coding-standards	upgrade	1.0.0	dev-master e332af7	diff
sebastian/code-unit-reverse-lookup	upgrade	1.0.1	2.0.3	diff
sebastian/comparator	upgrade	3.0.2	4.0.6	diff
sebastian/diff	upgrade	3.0.2	4.0.4	diff
sebastian/environment	upgrade	4.2.2	5.1.3	diff
sebastian/exporter	upgrade	3.1.2	4.0.4	diff
sebastian/global-state	upgrade	2.0.0	5.0.5	diff
sebastian/object-enumerator	upgrade	3.0.3	4.0.4	diff
sebastian/object-reflector	upgrade	1.1.1	2.0.4	diff
sebastian/recursion-context	upgrade	3.0.0	4.0.4	diff
sebastian/resource-operations	upgrade	2.0.1	3.0.3	diff
sebastian/version	upgrade	2.0.1	3.0.2	diff
symfony/console	upgrade	v4.4.1	v5.4.5	diff
theseer/tokenizer	upgrade	1.1.3	1.2.1	diff
webmozart/assert	upgrade	1.5.0	1.10.0	diff
wp-coding-standards/wpcs	upgrade	0.14.1	2.2.1	diff
wpreadme2markdown/wpreadme2markdown	upgrade	3.0.1	3.1.0	diff
phpunit/php-token-stream	remove	3.1.0	-	-
squizlabs/php_codesniffer	remove	3.3.2	-	-

Important Metadata Changes

Package	Version	Metadata	From	To
soberwp/intervention	1.2.0-p	dist url	https://api.github.com/repos/soberwp/intervention/zipball/1698e51efe696c5867fb78ef7c5d2efff9b79260	https://api.github.com/repos/darrenjacoby/intervention/zipball/1698e51efe696c5867fb78ef7c5d2efff9b79260
soberwp/intervention	1.2.0-p	source url	https://github.com/soberwp/intervention.git	https://github.com/darrenjacoby/intervention.git

Settings · Docs · Powered by Private Packagist

retlehs and others added 30 commits December 9, 2018 17:31

Update to WordPress 5.0, switch from johnpbloch/wordpress to `roots…

ae063de

…/wordpress`

Merge pull request roots#395 from roots/wp-5.0-and-johnpbloch-migration

37ea2d5

Update to WordPress 5.0, switch from from johnpbloch/wordpress to roots/wordpress

Update composer.lock

c912e54

Merge pull request roots#396 from roots/deps/update-03be1c1f

ab154e4

Update composer.lock

Ignore wp-cli.local.yml

2bacef7

Merge pull request roots#397 from roots/ignore-wp-cli-local

1f04b3a

Ignore wp-cli.local.yml

Update composer.lock

e4f83ab

Add PHP 7.3 to Travis test matrix

5e4e44b

Merge pull request roots#400 from knowler/travis-php-7.3

8418acc

Add PHP 7.3 to Travis test matrix

Dependencies.io: Filter updates

c60eec1

Merge pull request roots#401 from roots/dependencies.io-versions

0658437

Dependencies.io: Filter updates

Merge pull request roots#399 from roots/deps/update-06d39dad

be08c0c

Update composer.lock

[Dependencies.io] Always suggest updating WordPress [ci skip]

ec61793

Merge pull request roots#402 from roots/dependencies.io-versions2

d0843ff

[Dependencies.io] Always suggest updating WordPress

Update roots/wordpress from 5.0 to 5.0.1

de0be89

Merge pull request roots#403 from roots/deps/update-10848061

5178e30

Update roots/wordpress in composer.json from 5.0 to 5.0.1

1.10.1

8b292e7

Skip lockfile updates [ci skip]

e45c916

Update roots/wordpress from 5.0.1 to 5.0.2

202bc0a

Merge pull request roots#406 from roots/deps/update-7dffa682

8e1e56e

Update roots/wordpress in composer.json from 5.0.1 to 5.0.2

1.10.2

d14e1c8

Require PHP 7.1

8824c45

Update Composer keywords [ci skip]

48c251a

Merge pull request roots#405 from roots/require-php-7.1

c0f98d7

Bump requirements to PHP 7.1

1.11.0

c57ac1b

Update README [ci skip]

8d74437

Update sponsors [ci skip]

a406ce0

Update roots/wordpress from 5.0.2 to 5.0.3

c549efc

Merge pull request roots#408 from roots/deps/update-0ef927c9

d068794

Update roots/wordpress in composer.json from 5.0.2 to 5.0.3

1.11.1

e0450b7

dependabot Bot and others added 18 commits November 16, 2021 18:17

Update CHANGELOG [ci skip]

5f37b02

Ignore Acorn cache dir (roots#618)

f4a3185

roots/sage#2837

Remove issue closer (roots#620)

1d75c87

Bump requirements to PHP 7.4 (roots#619)

d88322a

* Require PHP 7.4 * CI: Switch to setup-php * Update README.md

Update CHANGELOG [ci skip]

cddd11f

Update docs links [ci skip]

0140dbe

chore(deps): allow required composer plugins (roots#624)

86100a1

Update CHANGELOG [ci skip]

0cd202c

chore(deps): Bump roots/wordpress to 5.9 (roots#626)

ca76ac5

* chore(deps): Bump roots/wordpress to 5.9 * Update CHANGELOG [ci skip]

Update README.md

bd55fcc

🔧 update description

1f0b459

Bump roots/wordpress from 5.9 to 5.9.1 (roots#630)

4144587

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

📝 update changelog

6945816

SteelWagstaff mentioned this pull request Mar 1, 2022

Pull in upstream changes #94

Merged

SteelWagstaff added 4 commits March 1, 2022 16:23

Merge branch 'master' of https://github.com/roots/bedrock into roots-…

f7e4865

…msater # Conflicts: # composer.json # composer.lock

Add pressbooks/* to allow-plugins list

b8c91d5

tweak CI

3657829

Merge pull request #95 from pressbooks/roots-master

7742d00

Pull in latest roots updates

SteelWagstaff marked this pull request as ready for review March 2, 2022 00:43

richard015ar requested a review from cmurtagh March 2, 2022 15:09

richard015ar assigned cmurtagh Mar 2, 2022

cmurtagh approved these changes Mar 9, 2022

View reviewed changes

cmurtagh merged commit 8072644 into master Mar 9, 2022

SteelWagstaff deleted the upstream-improvements branch January 24, 2023 18:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Upstream improvements#93

Upstream improvements#93
cmurtagh merged 293 commits into
masterfrom
upstream-improvements

SteelWagstaff commented Aug 31, 2021 •

edited

Loading

Uh oh!

private-packagist Bot commented Mar 2, 2022

Package changes

Dev Package changes

Important Metadata Changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Conversation

SteelWagstaff commented Aug 31, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Notes

Notable changes:

Uh oh!

private-packagist Bot commented Mar 2, 2022

composer.lock

Package changes

Dev Package changes

Important Metadata Changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

SteelWagstaff commented Aug 31, 2021 •

edited

Loading