Resolve yiisoft#602 conflicts

rossaddison · Apr 10, 2024 · 793d8c5 · 793d8c5
1 parent c672355
commit 793d8c5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/blog/composer.json b/blog/composer.json
@@ -56,7 +56,7 @@
         "yiisoft/html": "^3.0",
         "yiisoft/http": "^1.2",
         "yiisoft/injector": "^1.0",
-        "yiisoft/input-http": "^1.0.0",
+        "yiisoft/input-http": "^1.0",
         "yiisoft/log": "^2.0",
         "yiisoft/log-target-file": "^3.0",
         "yiisoft/mailer": "^5.0",

diff --git a/blog/config/web/di/middleware-dispatcher.php b/blog/config/web/di/middleware-dispatcher.php
@@ -4,7 +4,7 @@
 
 use Yiisoft\Definitions\Reference;
 use Yiisoft\Input\Http\HydratorAttributeParametersResolver;
-//use Yiisoft\Input\Http\Request\Catcher\RequestCatcherParametersResolver;
+use Yiisoft\Input\Http\Request\Catcher\RequestCatcherParametersResolver;
 use Yiisoft\Input\Http\RequestInputParametersResolver;
 use Yiisoft\Middleware\Dispatcher\CompositeParametersResolver;
 use Yiisoft\Middleware\Dispatcher\ParametersResolverInterface;
@@ -17,7 +17,7 @@
     ParametersResolverInterface::class => [
         'class' => CompositeParametersResolver::class,
         '__construct()' => [
-            //Reference::to(RequestCatcherParametersResolver::class),
+            Reference::to(RequestCatcherParametersResolver::class),
             Reference::to(HydratorAttributeParametersResolver::class),
             Reference::to(RequestInputParametersResolver::class),
         ],

diff --git a/blog/src/Blog/Post/PostRepository.php b/blog/src/Blog/Post/PostRepository.php
@@ -9,10 +9,10 @@
 use DateTimeImmutable;
 use DateTimeInterface;
 use Throwable;
-use Yiisoft\Data\Reader\DataReaderInterface;
-use Yiisoft\Data\Reader\Sort;
 use Yiisoft\Data\Cycle\Reader\EntityReader;
 use Yiisoft\Data\Cycle\Writer\EntityWriter;
+use Yiisoft\Data\Reader\DataReaderInterface;
+use Yiisoft\Data\Reader\Sort;
 
 final class PostRepository extends Select\Repository
 {

diff --git a/blog/src/Command/Fixture/AddCommand.php b/blog/src/Command/Fixture/AddCommand.php
@@ -21,9 +21,9 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Throwable;
+use Yiisoft\Data\Cycle\Writer\EntityWriter;
 use Yiisoft\Yii\Console\ExitCode;
 use Yiisoft\Yii\Cycle\Command\CycleDependencyProxy;
-use Yiisoft\Data\Cycle\Writer\EntityWriter;
 
 final class AddCommand extends Command
 {

diff --git a/blog/src/User/UserRepository.php b/blog/src/User/UserRepository.php
@@ -6,10 +6,10 @@
 
 use Cycle\ORM\Select;
 use Throwable;
+use Yiisoft\Data\Cycle\Reader\EntityReader;
+use Yiisoft\Data\Cycle\Writer\EntityWriter;
 use Yiisoft\Data\Reader\DataReaderInterface;
 use Yiisoft\Data\Reader\Sort;
-use Yiisoft\Yii\Cycle\Data\Reader\EntityReader;
-use Yiisoft\Data\Cycle\Writer\EntityWriter;
 
 final class UserRepository extends Select\Repository
 {