Skip to content

Commit 7337ac7

Browse files
committed
Upgrade skeleton
1 parent 0f407d0 commit 7337ac7

File tree

7 files changed

+34
-16
lines changed

7 files changed

+34
-16
lines changed

.github/workflows/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
77

8-
FROM hyperf/hyperf:8.0-alpine-v3.15-swoole
8+
FROM hyperf/hyperf:8.0-alpine-v3.16-swoole
99
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT" app.name="Hyperf"
1010

1111
##
@@ -25,7 +25,7 @@ RUN set -ex \
2525
&& php -m \
2626
&& php --ri swoole \
2727
# ---------- some config ----------
28-
&& cd /etc/php8 \
28+
&& cd /etc/php* \
2929
# - config PHP
3030
&& { \
3131
echo "upload_max_filesize=128M"; \

.phpstorm.meta.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?php
22

33
namespace PHPSTORM_META {
4-
54
// Reflect
6-
override(\Psr\Container\ContainerInterface::get(0), map('@'));
7-
override(\Hyperf\Utils\Context::get(0), map('@'));
8-
override(\make(0), map('@'));
9-
override(\di(0), map('@'));
10-
11-
}
5+
override(\Psr\Container\ContainerInterface::get(0), map(['' => '@']));
6+
override(\Hyperf\Context\Context::get(0), map(['' => '@']));
7+
override(\make(0), map(['' => '@']));
8+
override(\di(0), map(['' => '@']));
9+
}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
# @license https://github.com/hyperf/hyperf/blob/master/LICENSE
77

8-
FROM hyperf/hyperf:8.0-alpine-v3.15-swoole
8+
FROM hyperf/hyperf:8.0-alpine-v3.16-swoole
99
LABEL maintainer="Hyperf Developers <[email protected]>" version="1.0" license="MIT" app.name="Hyperf"
1010

1111
##
@@ -25,7 +25,7 @@ RUN set -ex \
2525
&& php -m \
2626
&& php --ri swoole \
2727
# ---------- some config ----------
28-
&& cd /etc/php8 \
28+
&& cd /etc/php* \
2929
# - config PHP
3030
&& { \
3131
echo "upload_max_filesize=128M"; \

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) Hyperf
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

config/autoload/listeners.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@
1010
* @license https://github.com/hyperf/hyperf/blob/master/LICENSE
1111
*/
1212
return [
13+
Hyperf\ExceptionHandler\Listener\ErrorExceptionHandler::class,
14+
Hyperf\Command\Listener\FailToHandleListener::class,
1315
];

config/container.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
use Hyperf\Di\Definition\DefinitionSourceFactory;
1717
use Hyperf\Utils\ApplicationContext;
1818

19-
$container = new Container((new DefinitionSourceFactory(true))());
19+
$container = new Container((new DefinitionSourceFactory())());
2020

21-
if (! $container instanceof \Psr\Container\ContainerInterface) {
22-
throw new RuntimeException('The dependency injection container is invalid.');
23-
}
2421
return ApplicationContext::setContainer($container);

deploy.test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
- "APP_PROJECT=hyperf"
77
- "APP_ENV=test"
88
ports:
9-
- 9501:9501
9+
- "9501:9501"
1010
deploy:
1111
replicas: 1
1212
restart_policy:

0 commit comments

Comments
 (0)