Skip to content

Commit 487b6de

Browse files
authored
Merge pull request #106 from laminas/2.23.x-merge-up-into-2.24.x_38pzvzoS
Merge release 2.23.1 into 2.24.x
2 parents 9c0604b + 9015fcb commit 487b6de

File tree

5 files changed

+6
-1
lines changed

5 files changed

+6
-1
lines changed

Diff for: src/SaveHandler/Cache.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public function getCacheStorage()
150150
}
151151

152152
/**
153-
* @deprecated Misspelled method - use getCacheStorage() instead
153+
* @deprecated Misspelled method - use getCacheStorage() instead. Will be removed in version 3.0
154154
*
155155
* @return CacheStorage
156156
*/

Diff for: src/Service/ContainerAbstractServiceFactory.php

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public function canCreate(ContainerInterface $container, $requestedName)
7474
}
7575

7676
/**
77+
* @deprecated This method will be removed in version 3.0
7778
* Can we create an instance of the given service? (v2 usage)
7879
*
7980
* @param string $name
@@ -98,6 +99,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
9899
}
99100

100101
/**
102+
* @deprecated This method will be removed in version 3.0
101103
* Create and return a named container (v2 usage).
102104
*
103105
* @param string $name

Diff for: src/Service/SessionConfigFactory.php

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
117117
}
118118

119119
/**
120+
* @deprecated This method will be removed in version 3.0
120121
* Create and return a config instance (v2 usage).
121122
*
122123
* @param null|string $canonicalName

Diff for: src/Service/SessionManagerFactory.php

+1
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
150150
}
151151

152152
/**
153+
* @deprecated This method will be removed in version 3.0
153154
* Create a SessionManager instance (v2 usage)
154155
*
155156
* @param null|string $canonicalName

Diff for: src/Service/StorageFactory.php

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
6161
}
6262

6363
/**
64+
* @deprecated This method will be removed in version 3.0
6465
* Create and return a storage instance (v2 usage).
6566
*
6667
* @param null|string $canonicalName

0 commit comments

Comments
 (0)