bircher / php-merge Goto Github PK
View Code? Open in Web Editor NEWPhp library to merge text. 3 way merge like git in php.
License: MIT License
Php library to merge text. 3 way merge like git in php.
License: MIT License
Travis-ci.org is no longer an option, so we need a new CI.
Ideally we could test on all supported php versions, but I can easily run tests with dockerised php locally so the hard requirement is just to have "some" tests running.
For example scrutinizer or coveralls wait for the coverage reports to be uploaded.
We could probably relatively easily use github actions
Please add PHP 8 support to this lib.
The 1.0.0 release is stable and caters to a wide variety of php versions (from 5.4 onwards).
To refactor the code with php7 constructs we introduce a small API change, while at it we can better define what the API is by declaring classes as internal and/or final.
The \PhpMerge\PhpMergeInterface::merge
signature changes only adding the string type hint, so using it in code as described in the readme will continue to work.
The framework (Laravel) used in my project can not be installed because it requires a new version of sebastian/diff.
Can you change the definition of composer.json or support the latest version?
Problem 1
- Installation request for bircher/php-merge ^2.0 -> satisfiable by bircher/php-merge[2.0.0].
- Conclusion: remove sebastian/diff 3.0.1
- Conclusion: don't install sebastian/diff 3.0.1
- bircher/php-merge 2.0.0 requires sebastian/diff ^1.3 -> satisfiable by sebastian/diff[1.3.0, 1.4.0, 1.4.1, 1.4.2, 1.4.3, 1.4.x-dev].
- Can only install one of: sebastian/diff[1.3.0, 3.0.1].
- Can only install one of: sebastian/diff[1.4.0, 3.0.1].
- Can only install one of: sebastian/diff[1.4.1, 3.0.1].
- Can only install one of: sebastian/diff[1.4.2, 3.0.1].
- Can only install one of: sebastian/diff[1.4.3, 3.0.1].
- Can only install one of: sebastian/diff[1.4.x-dev, 3.0.1].
- Installation request for sebastian/diff (locked at 3.0.1) -> satisfiable by sebastian/diff[3.0.1].
A declarative, efficient, and flexible JavaScript library for building user interfaces.
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. ๐๐๐
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google โค๏ธ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.