Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefix four dependencies during composer install/update (symfony/console, twig, monolog & php-di) #19712

Closed
wants to merge 144 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
ecf155d
add prefix-dependency command that downloads and runs php-scoper
diosmosis Sep 6, 2022
aaac69c
Merge branch '4.x-dev' into 16905-php-scoper
diosmosis Sep 6, 2022
840e908
get command to work
diosmosis Sep 6, 2022
0c13b62
get the scoped autoloader to work with twig
diosmosis Sep 7, 2022
8ac9a58
make it possible to use matomo w/o prefixing twig
diosmosis Sep 7, 2022
61d5c17
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Sep 7, 2022
d597225
tweaks
diosmosis Sep 7, 2022
566d784
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Sep 7, 2022
01a08d6
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Sep 12, 2022
cd00d7f
remove autoloader that provided BC, add --all-supported option to pre…
diosmosis Sep 12, 2022
dbd0b30
unfinished commit, starting prefixing process w/ monolog
diosmosis Sep 12, 2022
669dafb
keep list of dependencies in one place
diosmosis Sep 12, 2022
98e27a1
get prefixing monolog to work to some degree
diosmosis Sep 12, 2022
5982f2f
prefix NullHandler
diosmosis Sep 12, 2022
65a39d6
prefix more class references
diosmosis Sep 13, 2022
9d501f7
store original autoloader as static var
diosmosis Sep 13, 2022
4c13b08
proxy autoload.php file in case something else includes it before cor…
diosmosis Sep 13, 2022
6602090
remove php 8 warning
diosmosis Sep 13, 2022
9f99ec7
prefix command should not be for development if part of composer work…
diosmosis Sep 13, 2022
a0107de
add command to composer workflow (without removing the original depen…
diosmosis Sep 13, 2022
f83825a
remove original dependencies after prefixing in composer workflow
diosmosis Sep 13, 2022
acbfcfd
bump php version in travis to 7.4 for php-scoper
diosmosis Sep 13, 2022
0e00bc0
update tests/travis submodule
diosmosis Sep 13, 2022
e4b5503
replace monolog logger uses in tests
diosmosis Sep 13, 2022
572e64a
add some debugging for weird warning
diosmosis Sep 13, 2022
822680c
replace unprefixed twig functions
diosmosis Sep 13, 2022
83945b5
update failing test
diosmosis Sep 13, 2022
3196d18
more debugging of strange notice
diosmosis Sep 13, 2022
5b1e098
more precise replace
diosmosis Sep 13, 2022
c245b3c
prefix use statement
diosmosis Sep 13, 2022
d5a1118
better debuggingg
diosmosis Sep 13, 2022
7c722f3
try more debugging
diosmosis Sep 13, 2022
a58fc81
try to fix deprecated notice
diosmosis Sep 13, 2022
14ddaa2
try another fix
diosmosis Sep 13, 2022
dde809b
update submodule
diosmosis Sep 13, 2022
98bc983
update expected screenshots
diosmosis Sep 13, 2022
850bc29
fix fatail exception test
diosmosis Sep 13, 2022
4d3da89
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Sep 18, 2022
22680a6
make sure MATOMO_ORIGINAL_AUTOLOADER is set before trying to use it t…
diosmosis Sep 19, 2022
3063e5f
initial attempt at plugin dependency prefixing support
diosmosis Sep 19, 2022
8edc62a
get prefix dependency command to work with plugins
diosmosis Sep 19, 2022
2df8a24
tweak license header
diosmosis Sep 20, 2022
8718930
refactor existing prefixing command into Prefixer class and make it h…
diosmosis Sep 21, 2022
a19c1ea
use forked php-scoper URL for now
diosmosis Sep 21, 2022
a9b0677
get composer install to work and skip dependencies that have "files" …
diosmosis Sep 21, 2022
166b8b1
fix constant use in proxied autoload.php
diosmosis Sep 21, 2022
960394e
prefix Psr since its a dependency of Monolog and get core prefixing t…
diosmosis Sep 21, 2022
6056692
should not need extra check for whether were in composer if setting u…
diosmosis Sep 21, 2022
38587d7
correct vendor path for prefixing plugins + check if could not find a…
diosmosis Sep 21, 2022
3a8a948
do not use constant
diosmosis Sep 21, 2022
4958804
prefix NullLogger use
diosmosis Sep 21, 2022
4a06fd9
two more Psr uses
diosmosis Sep 21, 2022
1d93bbb
update submodules
diosmosis Sep 23, 2022
5c28871
update php-scoper URL
diosmosis Sep 23, 2022
fe80e91
remove need for prefixed skipping autoloader by dumping the composer …
diosmosis Sep 23, 2022
a1d6875
remove original dependencies by default after prefixing
diosmosis Sep 23, 2022
dbdbc99
fix core dependencies namespaces detection when prefixing plugin depe…
diosmosis Sep 23, 2022
3dd3964
handle case where a plugin has composer dependencies but does not wan…
diosmosis Sep 23, 2022
b6fec65
fixing tests
diosmosis Sep 23, 2022
f7a103c
update expected test files
diosmosis Sep 23, 2022
b426f92
remove trailing comma
diosmosis Sep 23, 2022
f3eb26f
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Oct 11, 2022
515032f
apply review feedback
diosmosis Oct 11, 2022
91d62ee
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Oct 17, 2022
e98835a
use latest .phpstorm.meta.php syntax
diosmosis Oct 18, 2022
a9ef04c
try using php7.4 on travis just to run composer install on travis whe…
diosmosis Oct 18, 2022
a3e9f6d
fix bash command
diosmosis Oct 18, 2022
0110c55
disable autoupdate of .travis.yml
diosmosis Oct 18, 2022
46f9c79
debugging
diosmosis Oct 18, 2022
26a7787
more debugging
diosmosis Oct 18, 2022
9bb2961
more debugging
diosmosis Oct 18, 2022
3a34373
use MATOMO_PREFIX_PHP in both required places
diosmosis Oct 18, 2022
ea7dfee
in prefix dependency command, detect whether being installed as a com…
diosmosis Nov 3, 2022
251a64b
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Nov 3, 2022
1f2dadd
remove prefixAutoload.php if present before prefixing
diosmosis Nov 3, 2022
22ed60f
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Nov 3, 2022
a7abe9f
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Nov 15, 2022
585c64b
prefix php-di
diosmosis Nov 15, 2022
cf58274
fix ConsoleTest
diosmosis Nov 15, 2022
7b3b9fc
switch to autowire
diosmosis Nov 15, 2022
3971f4f
fix another test
diosmosis Nov 15, 2022
50eb656
use autowire
diosmosis Nov 15, 2022
8b07154
update screenshots
diosmosis Nov 15, 2022
8349c5c
debug one click update test failure
diosmosis Nov 15, 2022
e9e1765
overwrite latestStableInstall file w/ file w/ debug statements
diosmosis Nov 15, 2022
d0dc501
more debugging
diosmosis Nov 15, 2022
4091e58
try to fix failure
diosmosis Nov 16, 2022
fdeb414
more oneclickupdate debugging
diosmosis Nov 16, 2022
a94518a
try again to fix the issue
diosmosis Nov 16, 2022
e87df94
more debugging (disable fatal error handling)
diosmosis Nov 16, 2022
d953b3e
another tweak
diosmosis Nov 16, 2022
4ffba06
another tweak
diosmosis Nov 16, 2022
38f7497
try to fix the issue at least for latest stable install
diosmosis Nov 16, 2022
88bf626
remove some debugging code
diosmosis Nov 16, 2022
53e46f5
fix broken code
diosmosis Nov 16, 2022
65c10d9
more debugging
diosmosis Nov 16, 2022
af3ae0d
more debugging
diosmosis Nov 16, 2022
9fe87fd
more debugging
diosmosis Nov 16, 2022
cea54f3
try checking if the prefixed class exists?
diosmosis Nov 16, 2022
72315c5
another debugging attempt
diosmosis Nov 16, 2022
e6963d2
try another fix
diosmosis Nov 16, 2022
fead201
re-enable all tests and remove debugging code
diosmosis Nov 16, 2022
9c353f5
get unprefixed code to work in composer install and start on UI test …
diosmosis Nov 16, 2022
2c4df1d
fix condition
diosmosis Nov 16, 2022
446655d
use PIWIK_VENDOR_PATH for searchengine-and-social-list paths so they …
diosmosis Nov 16, 2022
634389d
another fix for composer installed matomos
diosmosis Nov 16, 2022
94a83f2
get ComposerInstall test to pass locally
diosmosis Nov 16, 2022
2025280
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Nov 16, 2022
60bfb45
unneeded twig adapters
diosmosis Nov 16, 2022
985493f
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Dec 1, 2022
ddec44f
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Jan 30, 2023
e1523eb
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Feb 17, 2023
9cb379a
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Mar 22, 2023
10d881e
run tests on PHP7.4 instead of 7.2
sgiehl Mar 22, 2023
a14864a
allow symfony to use monolog after the prefix command completes
diosmosis Mar 23, 2023
3f7660a
prefix symfony/console too as quick fix for issue introduced in new s…
diosmosis Mar 23, 2023
41bc677
ignore symfony/polyfill-php80 which defines global polyfill functions
diosmosis Mar 23, 2023
2bd68ad
update submodule
diosmosis Mar 23, 2023
bc97f6a
prefix DI uses in ui-test.php environment config
diosmosis Mar 23, 2023
c5acac5
debug build
diosmosis Mar 23, 2023
8f18cd2
fix dependency skipping check
diosmosis Mar 23, 2023
b9e9777
actually fix dependency skipping check
diosmosis Mar 23, 2023
f71893c
update submodule
diosmosis Mar 23, 2023
ee62973
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Mar 24, 2023
38549b4
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Mar 27, 2023
60909ae
fix some tests
sgiehl Mar 27, 2023
05bbd33
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Mar 28, 2023
8e8e8ab
use correct branch for testing
sgiehl Mar 28, 2023
da160e8
ensure to remove existing composer test files
sgiehl Mar 28, 2023
2904b4c
hide composer install messages
sgiehl Mar 28, 2023
9f6bae3
fix credentials used in composer install test
sgiehl Mar 28, 2023
3477208
fix return types of prefixing command
sgiehl Mar 29, 2023
ecd28ff
create dir only when needed
sgiehl Mar 30, 2023
0ba251e
ensure install fixtures are clean up again
sgiehl Mar 31, 2023
e330e21
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Mar 31, 2023
8d6218c
try to lock in var-dumper version for when installing matomo through …
diosmosis Mar 31, 2023
6ab9c3f
try to fix composer install test
sgiehl Apr 3, 2023
84975ef
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Apr 3, 2023
268764d
when regenerating original autoloader, manually remove prefixed depen…
diosmosis Apr 5, 2023
97907e6
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis Apr 5, 2023
1d975eb
when regenerating original autoloader, also create temporary folders …
diosmosis Apr 5, 2023
20bd718
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Apr 5, 2023
3a7a78a
run tests on php 8.2
sgiehl Apr 5, 2023
60e0216
Merge branch '5.x-dev' into 16905-php-scoper
sgiehl Apr 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch '5.x-dev' into 16905-php-scoper
diosmosis committed Sep 12, 2022
commit 01a08d61c93f97152b5f98a83e67344fa661a472

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.