File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2727// Get all the possible containers that could be started
2828$ php_containers_matches = array ();
2929preg_match_all ("/php-([0-9]\.[0-9])[^:]*:/ " , file_get_contents ("$ docker_dev_root/compose/php.yml " ), $ php_containers_matches );
30- preg_match_all ("/php-([0-9]\.[0-9])[^:]*:/ " , file_get_contents ("$ docker_dev_root/compose/php-legacy.yml " ), $ php_containers_matches );
30+ $ php_legacy_containers_matches = array ();
31+ preg_match_all ("/php-([0-9]\.[0-9])[^:]*:/ " , file_get_contents ("$ docker_dev_root/compose/php-legacy.yml " ), $ php_legacy_containers_matches );
3132if (empty ($ php_containers_matches )) {
3233 fwrite (fopen ('php://stderr ' , 'wb ' ), "Fatal regex error " . PHP_EOL );
3334 exit (1 );
3435}
35- $ php_containers_available = array_unique ($ php_containers_matches [1 ]);
36+ $ php_containers_available = array_merge ( array_unique ($ php_containers_matches [1 ]), array_unique ( $ php_legacy_containers_matches [ 1 ]) );
3637asort ($ php_containers_available );
3738
3839// Get the versions to use from the site composer.json (if it exists)
You can’t perform that action at this time.
0 commit comments