Skip to content

Commit 903c8a7

Browse files
committed
Updates README with conflict prevention info.
1 parent 9cc4aab commit 903c8a7

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

README.markdown

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ PropelBundle
44
This an unofficial implementation of [Propel 1.6](http://www.propelorm.org/) in Symfony, which has been modified to work
55
with PHP 7.2+ and Symfony 3.0+.
66

7+
## Preventing Conflicts
8+
9+
To prevent conflicts with a non-patched versions of Propel1, it is recommended to add the following to the `autoload` key of your project's `composer.json`:
10+
11+
"exclude-from-classmap": [ "vendor/propel/propel1/runtime/lib","vendor/propel/propel1/generator/lib" ]
12+
13+
These conflicts are created when a dependency you have specified has `propel/propel1` in their `required-dev` packages, and therefore cannot be otherwise avoided.
14+
715
## Branching model
816

917
### Propel1 integration

0 commit comments

Comments
 (0)