Merge pull request #152 from bearsunday/mobile-detect

koriym · web-flow · commit 6ad2c5d9302e · 2024-11-26T20:11:38.000+09:00
Update mobiledetect/mobiledetectlib dependency version and make it optional
diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -4,6 +4,7 @@
     "static", "self", "parent",
     "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
     "Attribute", "Memcached", "Redis", "RedisException",
-    "Doctrine\\Common\\Cache\\ArrayCache", "Doctrine\\Common\\Cache\\MemcachedCache", "Doctrine\\Common\\Cache\\RedisCache"
+    "Doctrine\\Common\\Cache\\ArrayCache", "Doctrine\\Common\\Cache\\MemcachedCache", "Doctrine\\Common\\Cache\\RedisCache",
+    "Detection\\MobileDetect"
   ]
 }
diff --git a/composer.json b/composer.json
@@ -15,7 +15,6 @@
         "bear/sunday": "^1.5",
         "doctrine/annotations": "^1.8 || ^2.0",
         "doctrine/cache": "^1.12 || ^2.0",
-        "mobiledetect/mobiledetectlib": "^3.74",
         "psr/cache": "^1.0 || ^2.0 || ^3.0",
         "ray/aop": "^2.16",
         "ray/di": "^2.17.2",
@@ -28,6 +27,7 @@
         "bamarni/composer-bin-plugin": "^1.8",
         "koriym/attributes": "^1.0.1",
         "madapaja/twig-module": "^2.3",
+        "mobiledetect/mobiledetectlib": "^3.74 || ^4.8",
         "phpunit/phpunit": "^9.5.28",
         "predis/predis": "^2.2",
         "symfony/process": "^4.3 || ^5.4 || ^6.1 || ^7.1",
diff --git a/src/MobileEtagModule.php b/src/MobileEtagModule.php
@@ -4,9 +4,13 @@
 
 namespace BEAR\QueryRepository;
 
+use Detection\MobileDetect;
+use LogicException;
 use Ray\Di\AbstractModule;
 use Ray\Di\Scope;
 
+use function class_exists;
+
 /**
  * Provides EtagSetterInterface
  *
@@ -21,6 +25,10 @@ final class MobileEtagModule extends AbstractModule
      */
     protected function configure(): void
     {
+        if (! class_exists(MobileDetect::class)) {
+            throw new LogicException('Install mobile-detect/mobiledetectlib'); // @codeCoverageIgnore
+        }
+
         $this->bind(EtagSetterInterface::class)->to(MobileEtagSetter::class)->in(Scope::SINGLETON);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"static", "self", "parent",`
`5`	`5`	`"array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",`
`6`	`6`	`"Attribute", "Memcached", "Redis", "RedisException",`
`7`		`- "Doctrine\\Common\\Cache\\ArrayCache", "Doctrine\\Common\\Cache\\MemcachedCache", "Doctrine\\Common\\Cache\\RedisCache"`
	`7`	`+ "Doctrine\\Common\\Cache\\ArrayCache", "Doctrine\\Common\\Cache\\MemcachedCache", "Doctrine\\Common\\Cache\\RedisCache",`
	`8`	`+ "Detection\\MobileDetect"`
`8`	`9`	`]`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,13 @@`
`4`	`4`
`5`	`5`	`namespace BEAR\QueryRepository;`
`6`	`6`
	`7`	`+use Detection\MobileDetect;`
	`8`	`+use LogicException;`
`7`	`9`	`use Ray\Di\AbstractModule;`
`8`	`10`	`use Ray\Di\Scope;`
`9`	`11`
	`12`	`+use function class_exists;`
	`13`	`+`
`10`	`14`	`/**`
`11`	`15`	`* Provides EtagSetterInterface`
`12`	`16`	`*`
`@@ -21,6 +25,10 @@ final class MobileEtagModule extends AbstractModule`
`21`	`25`	`*/`
`22`	`26`	`protected function configure(): void`
`23`	`27`	`{`
	`28`	`+ if (! class_exists(MobileDetect::class)) {`
	`29`	`+ throw new LogicException('Install mobile-detect/mobiledetectlib'); // @codeCoverageIgnore`
	`30`	`+ }`
	`31`	`+`
`24`	`32`	`$this->bind(EtagSetterInterface::class)->to(MobileEtagSetter::class)->in(Scope::SINGLETON);`
`25`	`33`	`}`
`26`	`34`	`}`