Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging v2.12 into v3.0-dev #658

Merged
merged 13 commits into from
Apr 11, 2022
Merged

Merging v2.12 into v3.0-dev #658

merged 13 commits into from
Apr 11, 2022

Conversation

msmakouz
Copy link
Member

Q A
Bugfix?
Breaks BC?
New feature?

roxblnfk and others added 13 commits March 24, 2022 11:34
Co-authored-by: Maxim Smakouz <m.smakouz@gmail.com>
Co-authored-by: Aleksei Gagarin <roxblnfk@ya.ru>
Update psr/log dependency version
Co-authored-by: roxblnfk <roxblnfk@ya.ru>
…-2.12

# Conflicts:
#	.scrutinizer.yml
#	CHANGELOG.md
#	composer.json
#	src/AnnotatedRoutes/composer.json
#	src/Annotations/composer.json
#	src/Annotations/src/AnnotatedClass.php
#	src/Annotations/src/AnnotatedMethod.php
#	src/Annotations/src/AnnotatedProperty.php
#	src/Attributes/composer.json
#	src/AuthHttp/composer.json
#	src/Boot/composer.json
#	src/Boot/src/AbstractKernel.php
#	src/Bridge/DataGrid/README.md
#	src/Bridge/DataGrid/composer.json
#	src/Bridge/DataGrid/src/Annotation/DataGrid.php
#	src/Bridge/DataGrid/src/Bootloader/GridBootloader.php
#	src/Bridge/DataGrid/src/Config/GridConfig.php
#	src/Bridge/DataGrid/src/GridInput.php
#	src/Bridge/DataGrid/src/Interceptor/GridInterceptor.php
#	src/Bridge/DataGrid/src/Response/GridResponse.php
#	src/Bridge/DataGrid/src/Response/GridResponseInterface.php
#	src/Bridge/Dotenv/composer.json
#	src/Bridge/Monolog/composer.json
#	src/Bridge/Stempler/composer.json
#	src/Cache/composer.json
#	src/Config/composer.json
#	src/Console/composer.json
#	src/Cookies/composer.json
#	src/Core/composer.json
#	src/Csrf/composer.json
#	src/DataGrid/composer.json
#	src/Debug/composer.json
#	src/Dumper/composer.json
#	src/Files/composer.json
#	src/Filters/composer.json
#	src/Framework/Bootloader/Broadcast/BroadcastBootloader.php
#	src/Framework/Bootloader/CommandBootloader.php
#	src/Framework/Bootloader/Http/WebsocketsBootloader.php
#	src/Framework/Broadcast/Config/WebsocketsConfig.php
#	src/Framework/Broadcast/Middleware/WebsocketsMiddleware.php
#	src/Framework/Command/Database/ListCommand.php
#	src/Framework/Command/Database/TableCommand.php
#	src/Framework/Command/GRPC/GenerateCommand.php
#	src/Framework/Command/GRPC/ListCommand.php
#	src/Framework/Command/Migrate/AbstractCommand.php
#	src/Framework/Command/Migrate/InitCommand.php
#	src/Framework/Command/Migrate/MigrateCommand.php
#	src/Framework/Command/Migrate/ReplayCommand.php
#	src/Framework/Command/Migrate/RollbackCommand.php
#	src/Framework/Command/Migrate/StatusCommand.php
#	src/Framework/GRPC/Exception/CompileException.php
#	src/Framework/GRPC/GRPCDispatcher.php
#	src/Framework/GRPC/LocatorInterface.php
#	src/Framework/GRPC/ProtoCompiler.php
#	src/Framework/GRPC/ServiceLocator.php
#	src/Framework/Http/LegacyRrDispatcher.php
#	src/Framework/Http/RrDispatcher.php
#	src/Hmvc/composer.json
#	src/Http/composer.json
#	src/Logger/composer.json
#	src/Mailer/composer.json
#	src/Models/composer.json
#	src/Pagination/composer.json
#	src/Prototype/composer.json
#	src/Prototype/src/Bootloader/PrototypeBootloader.php
#	src/Reactor/composer.json
#	src/Router/composer.json
#	src/Router/src/CoreHandler.php
#	src/Scaffolder/composer.json
#	src/Security/composer.json
#	src/SendIt/composer.json
#	src/Session/composer.json
#	src/Stempler/composer.json
#	src/Storage/composer.json
#	src/Streams/composer.json
#	src/Tokenizer/composer.json
#	src/Translator/composer.json
#	src/Validation/composer.json
#	src/Views/composer.json
@msmakouz msmakouz added this to the 3.0 milestone Apr 11, 2022
@msmakouz msmakouz requested a review from roxblnfk April 11, 2022 13:10
@msmakouz msmakouz self-assigned this Apr 11, 2022
@codecov
Copy link

codecov bot commented Apr 11, 2022

Codecov Report

Merging #658 (fdfb6ae) into 3.0 (3d67162) will decrease coverage by 0.26%.
The diff coverage is 92.22%.

@@             Coverage Diff              @@
##                3.0     #658      +/-   ##
============================================
- Coverage     82.22%   81.96%   -0.27%     
- Complexity     5356     5404      +48     
============================================
  Files           609      611       +2     
  Lines         13457    13573     +116     
============================================
+ Hits          11065    11125      +60     
- Misses         2392     2448      +56     
Impacted Files Coverage Δ
src/Framework/Http/SapiDispatcher.php 10.71% <0.00%> (-35.44%) ⬇️
src/Router/src/CoreHandler.php 98.30% <50.00%> (-1.70%) ⬇️
src/Http/src/Stream/GeneratorStream.php 94.44% <94.44%> (ø)
src/Dumper/src/Dumper.php 91.59% <100.00%> (ø)
src/Http/src/Emitter/SapiEmitter.php 100.00% <100.00%> (ø)
src/Framework/Http/Diactoros/UriFactory.php 0.00% <0.00%> (-100.00%) ⬇️
...work/Debug/StateCollector/EnvironmentCollector.php 0.00% <0.00%> (-85.72%) ⬇️
src/Framework/Bootloader/DebugBootloader.php 29.41% <0.00%> (-47.06%) ⬇️
...amework/Http/Middleware/ErrorHandlerMiddleware.php 57.77% <0.00%> (-24.45%) ⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3d67162...fdfb6ae. Read the comment docs.

@roxblnfk roxblnfk merged commit 20eeb6e into spiral:3.0 Apr 11, 2022
@msmakouz msmakouz deleted the maintenance/merging-2.12 branch April 18, 2022 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants