Skip to content

Commit

Permalink
Merge branch 'feature/#39-remove-laminas-zendframework-bridge-depende…
Browse files Browse the repository at this point in the history
…ncy' into 4.0.x

Fixes #39
Close #39
  • Loading branch information
Ocramius committed Nov 30, 2020
2 parents 05f5d96 + 803f4f0 commit 765d88d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ All notable changes to this project will be documented in this file, in reverse

### Changed

- BC BREAK [laminas/laminas-code#39](https://github.com/laminas/laminas-code/pull/39) changed generated class
- BC BREAK [laminas/laminas-code#38](https://github.com/laminas/laminas-code/pull/38) changed generated class
output to no longer contain excessive whitespace around contents. The structure of the generated output
will still be the same, but spacing changed, which will likely lead o breakages if you
are asserting/depending upon the strings produced by `Laminas\Code\Generator\ClassGenerator#generate()`
Expand All @@ -21,8 +21,12 @@ All notable changes to this project will be documented in this file, in reverse

### Removed

- [zendframwork/zend-code#153](https://github.com/zendframework/zend-code/pull/153) Removed
- BC BREAK [zendframwork/zend-code#153](https://github.com/zendframework/zend-code/pull/153) Removed
the annotation API from the library
- BC BREAK [laminas/laminas-code#39](https://github.com/laminas/laminas-code/pull/39) the
`laminas/laminas-zendframework-bridge` has been removed, and is instead to be installed optionally
by consumers of the library. If you are still migrating from `zendframework/zend-code`, you will
need to add it to your `composer.json` yourself, or directly use to `Laminas\Code` symbols.

### Fixed

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
},
"require": {
"php": "^7.3 || ~8.0.0",
"laminas/laminas-eventmanager": "^3.3",
"laminas/laminas-zendframework-bridge": "^1.1"
"laminas/laminas-eventmanager": "^3.3"
},
"require-dev": {
"ext-phar": "*",
Expand All @@ -36,7 +35,8 @@
},
"suggest": {
"doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
"laminas/laminas-stdlib": "Laminas\\Stdlib component"
"laminas/laminas-stdlib": "Laminas\\Stdlib component",
"laminas/laminas-zendframework-bridge": "A bridge with Zend Framework"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 765d88d

Please sign in to comment.