…ilename

…rom the filename (weaverryan)

This PR was merged into the 1.x branch.

Discussion
----------

Fixing problem where rootDir is ".", which strips all dots from the filename

Fixes symfony/recipes#1120

In a normal siutation, `$rootDir` is `.`. The intention of this code is to strip the "rootDir" from the START of the `$file` path, so that we are left with only the relative path. The `.` + `str_replace()` was too greedy, and was causing things like `docker-composeryaml`.

The test uses an absolute root dir, and replicating the `.` would be tricky. But I tested this locally and the fix works.

Cheers!

Commits
-------

55d088e Fixinb problem where rootDir is ".", which strips all dots from the filename

…RecipeUpdate

This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead.

Discussion
----------

fix: deprecations triggered by debug class loader

Fixes following errors:

```
21:05:05 INFO      [php] User Deprecated: Method "Composer\Plugin\PluginInterface::activate()" might add "void" as a native return type declaration in the future. Do the same in implementation "Symfony\Flex\Flex" now to avoid errors or add an explicit `@return` annotation to suppress this message.
21:05:05 INFO      [php] User Deprecated: Method "Composer\Plugin\PluginInterface::deactivate()" might add "void" as a native return type declaration in the future. Do the same in implementation "Symfony\Flex\Flex" now to avoid errors or add an explicit `@return` annotation to suppress this message.
21:05:05 INFO      [php] User Deprecated: Method "Composer\Plugin\PluginInterface::uninstall()" might add "void" as a native return type declaration in the future. Do the same in implementation "Symfony\Flex\Flex" now to avoid errors or add an explicit `@return` annotation to suppress this message.
21:05:05 INFO      [php] User Deprecated: Method "JsonSerializable::jsonSerialize()" might add "mixed" as a native return type declaration in the future. Do the same in implementation "Symfony\Flex\Response" now to avoid errors or add an explicit `@return` annotation to suppress this message.
21:05:05 INFO      [php] User Deprecated: Method "Composer\DependencyResolver\Operation\OperationInterface::getOperationType()" might add "string" as a native return type declaration in the future. Do the same in implementation "Symfony\Flex\InformationOperation" now to avoid errors or add an explicit `@return` annotation to suppress this message.
21:05:05 INFO      [php] User Deprecated: Method "Composer\DependencyResolver\Operation\OperationInterface::show()" might add "string" as a native return type declaration in the future. Do the same in implementation "Symfony\Flex\InformationOperation" now to avoid errors or add an explicit `@return` annotation to suppress this message.
```

Commits
-------

67ddf63 fix: deprecations triggered by debug class loader

…e vs make them immediately (weaverryan)

This PR was squashed before being merged into the 1.x branch.

Discussion
----------

[AddLines] Fix update process to send changes to RecipeUpdate vs make them immediately

Hi!

This was an oversight when I create `AddLinesConfigurator`.

During `recipes:update`, the purpose of the `update()` method in each configurator is to record what the "original" contents of a file would look like from the original recipe & what the "new" contents of a file would look like with the new recipe. Then, LATER, the patcher system creates a diff from these.

The `AddLinesConfigurator` was going rogue and updating the files immediately, which caused the "patcher" system later to explode because this file was unexpectedly already modified.

The changes are less drastic than they look, as code needed to be moved from some public methods -> private methods.

Cheers!

Commits
-------

afd6260 Fixing bug where update changes were made immediately vs reported to RecipeUpdate
7e8967a Avoid exploding on conflict of controllers.json
6592349 Internal: moving most of method to a private method, no changes
436bad9 Moving guts of method to a private method - no real change
94a3e56 Internal: changing private functions to return a string