fix: solve merge conflicts

Author: pietroid

analysis_options.yaml

@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml

lib/mockingjay.dart

@@ -1,6 +1,6 @@
 /// A package that makes it easy to mock, test and verify
 /// navigation calls in Flutter.
-library mockingjay;
+library;
 
 export 'package:mocktail/mocktail.dart';
 

lib/src/matchers.dart

@@ -18,19 +18,12 @@ import 'package:test/test.dart';
 ///
 /// ```
 Matcher isRoute<T extends Object?>({
-  @Deprecated('Use `whereName` instead') String? named,
   Matcher? whereSettings,
   Matcher? whereName,
   Matcher? whereArguments,
   Matcher? whereMaintainState,
   Matcher? whereFullscreenDialog,
 }) {
-  // Remove once `named` argument is removed.
-  if (whereName == null && named != null) {
-    // ignore: parameter_assignments
-    whereName = equals(named);
-  }
-
   assert(
     whereSettings == null || (whereName == null && whereArguments == null),
     'Cannot specify both `whereSettings` and `whereName` or `whereArguments`',
@@ -90,8 +83,8 @@ class _RouteMatcher<T> extends Matcher {
       hasMaintainStateMatcher ||
       hasFullscreenDialogMatcher;
 
-  /// Takes an [input] string that looks like "FooBarRoute<MyType>" and extracts
-  /// the part "MyType".
+  /// Takes an [input] string that looks like `FooBarRoute<MyType>` and extracts
+  /// the part `MyType`.
   ///
   /// If the `Route<` part cannot be found, it returns the input string
   /// unchaged.
@@ -293,8 +286,8 @@ class _RouteMatcher<T> extends Matcher {
       if (!maintainStateMatches) {
         final mismatch =
             item is! ModalRoute
-                ? 'is not a property on `${item.runtimeType}` and can only be used '
-                    'with `ModalRoute`s'
+                ? 'is not a property on `${item.runtimeType}` and can only be '
+                    'used with `ModalRoute`s'
                 : whereMaintainState!.describeMismatchAsString(
                   item.maintainState,
                   matchState,
@@ -305,8 +298,8 @@ class _RouteMatcher<T> extends Matcher {
       if (!fullscreenDialogMatches) {
         final mismatch =
             item is! PageRoute
-                ? 'is not a property on `${item.runtimeType}` and can only be used '
-                    'with `PageRoute`s'
+                ? 'is not a property on `${item.runtimeType}` and can only be '
+                    'used with `PageRoute`s'
                 : whereFullscreenDialog!.describeMismatchAsString(
                   item.fullscreenDialog,
                   matchState,

lib/src/mock_navigator.dart

@@ -17,7 +17,7 @@ class _MockMaterialPageRoute extends MaterialPageRoute<void> {
         // By the time the setState is called, the attribute is already set
         // so we just ignore the error and the hack will do its job.
         state.insert(entry);
-      } catch (_) {}
+      } on Object catch (_) {}
       // Set mounted back to false to make sure the state doesn't get
       // marked as dirty during OverlayEntry.remove().
       state._mounted = false;

pubspec.yaml

@@ -17,4 +17,4 @@ dependencies:
   test: ^1.25.7
 
 dev_dependencies:
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0

test/src/matchers_test.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:matcher/src/feature_matcher.dart';
 import 'package:mockingjay/mockingjay.dart';
 
 class NonModalRoute extends Mock implements TransitionRoute<void> {}
@@ -46,20 +45,8 @@ void main() {
       }
 
       group('constructor', () {
-        test('wraps deprecated name value in equals matcher', () {
-          expect(
-            // ignore: deprecated_member_use_from_same_package
-            isRoute(named: '/test'),
-            isA<dynamic>().having(
-              // ignore: avoid_dynamic_calls
-              (dynamic m) => m.whereName,
-              'whereName',
-              isA<FeatureMatcher<String>>(),
-            ),
-          );
-        });
-
-        test('throws AssertionError when both whereSettings '
+        test(
+            'throws AssertionError when both whereSettings '
             'and whereName or whereArguments matchers are provided', () {
           expect(
             () => isRoute(
@@ -147,7 +134,8 @@ void main() {
           );
         });
 
-        test('does not match anything that is not a route '
+        test(
+            'does not match anything that is not a route '
             'with matching settings', () {
           expectToFail(
             createRoute<dynamic>(name: '/test'),
@@ -232,15 +220,13 @@ is a route where the route's `name` is different.
             expectToFail(
               createRoute<dynamic>(arguments: {'a': 1}),
               isRoute(whereArguments: equals({'a': 2})),
-              withMessage:
-                  "is a route where the route's `arguments` "
+              withMessage: "is a route where the route's `arguments` "
                   "at location ['a'] is <1> instead of <2>",
             );
             expectToFail(
               createRoute<dynamic>(arguments: {'a': 1}),
               isRoute(whereArguments: equals({'b': 1})),
-              withMessage:
-                  "is a route where the route's `arguments` "
+              withMessage: "is a route where the route's `arguments` "
                   "is missing map key 'b'",
             );
             expectToFail(
@@ -257,20 +243,19 @@ is a route where the route's `name` is different.
           expect(createRoute<dynamic>(), isRoute(whereMaintainState: isTrue));
         });
 
-        test('does not match anything that is not a route with matching '
+        test(
+            'does not match anything that is not a route with matching '
             'maintainState argument', () {
           expectToFail(
             createRoute<dynamic>(),
             isRoute(whereMaintainState: isFalse),
-            withMessage:
-                'is a route where `maintainState` '
+            withMessage: 'is a route where `maintainState` '
                 'is true instead of false',
           );
           expectToFail(
             NonModalRoute(),
             isRoute(whereMaintainState: isTrue),
-            withMessage:
-                'is a route where `maintainState` '
+            withMessage: 'is a route where `maintainState` '
                 'is not a property on `NonModalRoute` and can only be used '
                 'with `ModalRoute`s',
           );
@@ -290,20 +275,19 @@ is a route where the route's `name` is different.
           );
         });
 
-        test('does not match anything that is not a route with matching '
+        test(
+            'does not match anything that is not a route with matching '
             'fullscreenDialog argument', () {
           expectToFail(
             createRoute<dynamic>(fullscreenDialog: true),
             isRoute(whereFullscreenDialog: isFalse),
-            withMessage:
-                'is a route where `fullscreenDialog` '
+            withMessage: 'is a route where `fullscreenDialog` '
                 'is true instead of false',
           );
           expectToFail(
             NonModalRoute(),
             isRoute(whereFullscreenDialog: isFalse),
-            withMessage:
-                'is a route where `fullscreenDialog` '
+            withMessage: 'is a route where `fullscreenDialog` '
                 'is not a property on `NonModalRoute` and can only be used '
                 'with `PageRoute`s',
           );