Merge remote-tracking branch 'remotes/origin/master' into storable

Babichev Maxim · Babichev Maxim · commit c5fad800a8b6 · 2019-09-19T16:28:38.000+03:00
# Conflicts:
#	src/Services/ProxyService.php
diff --git a/src/Objects/Cart.php b/src/Objects/Cart.php
@@ -26,6 +26,7 @@ class Cart implements Countable
     /**
      * @return static
      * @deprecated use app(Cart::class)
+     * @codeCoverageIgnore
      */
     public static function make(): self
     {
diff --git a/src/Services/LockService.php b/src/Services/LockService.php
@@ -54,6 +54,7 @@ protected function bindTo($self, \Closure $closure): \Closure
 
     /**
      * @return Store|null
+     * @codeCoverageIgnore
      */
     protected function cache(): ?Store
     {
diff --git a/src/Services/ProxyService.php b/src/Services/ProxyService.php
@@ -9,6 +9,7 @@
 /**
  * Class ProxyService
  * @package Bavix\Wallet\Services
+ * @codeCoverageIgnore
  * @deprecated
  */
 class ProxyService implements ArrayAccess

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ class Cart implements Countable`
`26`	`26`	`/**`
`27`	`27`	`* @return static`
`28`	`28`	`* @deprecated use app(Cart::class)`
	`29`	`+ * @codeCoverageIgnore`
`29`	`30`	`*/`
`30`	`31`	`public static function make(): self`
`31`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ protected function bindTo($self, \Closure $closure): \Closure`
`54`	`54`
`55`	`55`	`/**`
`56`	`56`	`* @return Store\|null`
	`57`	`+ * @codeCoverageIgnore`
`57`	`58`	`*/`
`58`	`59`	`protected function cache(): ?Store`
`59`	`60`	`{`