Skip to content

Commit fc892ea

Browse files
rennokkirennokki
authored
Merge pull request #55 from renoki-co/feature/1-20
[upgrade] PHP 8.x
2 parents 2b8b28f + a0b9235 commit fc892ea

File tree

2 files changed

+30
-36
lines changed

2 files changed

+30
-36
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ jobs:
1919
strategy:
2020
matrix:
2121
php:
22-
- '7.3'
2322
- '7.4'
23+
- '8.0'
2424
kubernetes:
25-
- '1.17.13'
26-
- '1.18.10'
27-
- '1.19.3'
25+
- '1.17.16'
26+
- '1.18.14'
27+
- '1.19.6'
2828
laravel:
2929
- 7.*
3030
- 8.*
@@ -38,14 +38,8 @@ jobs:
3838
testbench: 6.*
3939

4040
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - K8s v${{ matrix.kubernetes }} --${{ matrix.prefer }}
41-
steps:
42-
- name: Setup PHP
43-
uses: shivammathur/setup-php@v2
44-
with:
45-
php-version: ${{ matrix.php }}
46-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, soap
47-
coverage: pcov
4841

42+
steps:
4943
- uses: actions/checkout@v1
5044

5145
- name: Setup PHP
@@ -61,7 +55,7 @@ jobs:
6155
path: ~/.composer/cache/files
6256
key: composer-php-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.prefer }}-${{ hashFiles('composer.json') }}
6357

64-
- uses: manusa/actions-setup-minikube@v2.0.1
58+
- uses: manusa/actions-setup-minikube@v2.2.0
6559
name: Setup Minikube
6660
with:
6761
minikube version: v1.14.2

‎src/K8s.php‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class K8s
77
/**
88
* Create a new Namespace kind.
99
*
10-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
10+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
1111
* @param array $attributes
1212
* @return \RenokiCo\PhpK8s\Kinds\K8sNamespace
1313
*/
@@ -19,7 +19,7 @@ public static function namespace($cluster = null, array $attributes = [])
1919
/**
2020
* Create a new ConfigMap kind.
2121
*
22-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
22+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
2323
* @param array $attributes
2424
* @return \RenokiCo\PhpK8s\Kinds\K8sConfigMap
2525
*/
@@ -31,7 +31,7 @@ public static function configmap($cluster = null, array $attributes = [])
3131
/**
3232
* Create a new Secret kind.
3333
*
34-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
34+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
3535
* @param array $attributes
3636
* @return \RenokiCo\PhpK8s\Kinds\K8sSecret
3737
*/
@@ -43,7 +43,7 @@ public static function secret($cluster = null, array $attributes = [])
4343
/**
4444
* Create a new Ingress kind.
4545
*
46-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
46+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
4747
* @param array $attributes
4848
* @return \RenokiCo\PhpK8s\Kinds\K8sIngress
4949
*/
@@ -55,7 +55,7 @@ public static function ingress($cluster = null, array $attributes = [])
5555
/**
5656
* Create a new Service kind.
5757
*
58-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
58+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
5959
* @param array $attributes
6060
* @return \RenokiCo\PhpK8s\Kinds\K8sService
6161
*/
@@ -67,7 +67,7 @@ public static function service($cluster = null, array $attributes = [])
6767
/**
6868
* Create a new StorageClass kind.
6969
*
70-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
70+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
7171
* @param array $attributes
7272
* @return \RenokiCo\PhpK8s\Kinds\K8sStorageClass
7373
*/
@@ -79,7 +79,7 @@ public static function storageClass($cluster = null, array $attributes = [])
7979
/**
8080
* Create a new PersistentVolume kind.
8181
*
82-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
82+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
8383
* @param array $attributes
8484
* @return \RenokiCo\PhpK8s\Kinds\K8sPersistentVolume
8585
*/
@@ -91,7 +91,7 @@ public static function persistentVolume($cluster = null, array $attributes = [])
9191
/**
9292
* Create a new PersistentVolumeClaim kind.
9393
*
94-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
94+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
9595
* @param array $attributes
9696
* @return \RenokiCo\PhpK8s\Kinds\K8sPersistentVolumeClaim
9797
*/
@@ -103,7 +103,7 @@ public static function persistentVolumeClaim($cluster = null, array $attributes
103103
/**
104104
* Create a new Pod kind.
105105
*
106-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
106+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
107107
* @param array $attributes
108108
* @return \RenokiCo\PhpK8s\Kinds\K8sPod
109109
*/
@@ -115,7 +115,7 @@ public static function pod($cluster = null, array $attributes = [])
115115
/**
116116
* Create a new StatefulSet kind.
117117
*
118-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
118+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
119119
* @param array $attributes
120120
* @return \RenokiCo\PhpK8s\Kinds\K8sStatefulSet
121121
*/
@@ -127,7 +127,7 @@ public static function statefulSet($cluster = null, array $attributes = [])
127127
/**
128128
* Create a new Deployment kind.
129129
*
130-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
130+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
131131
* @param array $attributes
132132
* @return \RenokiCo\PhpK8s\Kinds\K8sDeployment
133133
*/
@@ -139,7 +139,7 @@ public static function deployment($cluster = null, array $attributes = [])
139139
/**
140140
* Create a new Job kind.
141141
*
142-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
142+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
143143
* @param array $attributes
144144
* @return \RenokiCo\PhpK8s\Kinds\K8sJob
145145
*/
@@ -151,7 +151,7 @@ public static function job($cluster = null, array $attributes = [])
151151
/**
152152
* Create a new CronJob kind.
153153
*
154-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
154+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
155155
* @param array $attributes
156156
* @return \RenokiCo\PhpK8s\Kinds\CronJob
157157
*/
@@ -163,7 +163,7 @@ public static function cronjob($cluster = null, array $attributes = [])
163163
/**
164164
* Create a new DaemonSet kind.
165165
*
166-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
166+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
167167
* @param array $attributes
168168
* @return \RenokiCo\PhpK8s\Kinds\K8sJob
169169
*/
@@ -175,7 +175,7 @@ public static function daemonSet($cluster = null, array $attributes = [])
175175
/**
176176
* Create a new HorizontalPodAutoscaler kind.
177177
*
178-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
178+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
179179
* @param array $attributes
180180
* @return \RenokiCo\PhpK8s\Kinds\K8sHorizontalPodAutoscaler
181181
*/
@@ -187,7 +187,7 @@ public static function horizontalPodAutoscaler($cluster = null, array $attribute
187187
/**
188188
* Create a new ServiceAccount kind.
189189
*
190-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
190+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
191191
* @param array $attributes
192192
* @return \RenokiCo\PhpK8s\Kinds\K8sServiceAccount
193193
*/
@@ -199,7 +199,7 @@ public static function serviceAccount($cluster = null, array $attributes = [])
199199
/**
200200
* Create a new Role kind.
201201
*
202-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
202+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
203203
* @param array $attributes
204204
* @return \RenokiCo\PhpK8s\Kinds\K8sRole
205205
*/
@@ -211,7 +211,7 @@ public static function role($cluster = null, array $attributes = [])
211211
/**
212212
* Create a new ClusterRole kind.
213213
*
214-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
214+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
215215
* @param array $attributes
216216
* @return \RenokiCo\PhpK8s\Kinds\K8sClusterRole
217217
*/
@@ -223,7 +223,7 @@ public static function clusterRole($cluster = null, array $attributes = [])
223223
/**
224224
* Create a new RoleBinding kind.
225225
*
226-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
226+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
227227
* @param array $attributes
228228
* @return \RenokiCo\PhpK8s\Kinds\K8sRoleBinding
229229
*/
@@ -235,7 +235,7 @@ public static function roleBinding($cluster = null, array $attributes = [])
235235
/**
236236
* Create a new ClusterRoleBinding kind.
237237
*
238-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
238+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
239239
* @param array $attributes
240240
* @return \RenokiCo\PhpK8s\Kinds\K8sClusterRoleBinding
241241
*/
@@ -324,11 +324,11 @@ public static function volume(array $attributes = [])
324324
/**
325325
* Load Kind configuration from an YAML text.
326326
*
327-
* @param \RenokiCo\PhpK8s\KubernetesCluster $cluster
327+
* @param \RenokiCo\PhpK8s\KubernetesCluster|null $cluster
328328
* @param string $yaml
329329
* @return \RenokiCo\PhpK8s\Kinds\K8sResource|array[\RenokiCo\PhpK8s\Kinds\K8sResource]
330330
*/
331-
public static function fromYaml($cluster = null, string $yaml)
331+
public static function fromYaml($cluster, string $yaml)
332332
{
333333
$docs = explode('---', $yaml);
334334

@@ -353,11 +353,11 @@ public static function fromYaml($cluster = null, string $yaml)
353353
/**
354354
* Load Kind configuration from an YAML file.
355355
*
356-
* @param \RenokiCo\PhpK8s\Kinds\KubernetesCluster $cluster
356+
* @param \RenokiCo\PhpK8s\Kinds\KubernetesCluster|null $cluster
357357
* @param string $path
358358
* @return \RenokiCo\PhpK8s\Kinds\K8sResource|array[\RenokiCo\PhpK8s\Kinds\K8sResource]
359359
*/
360-
public static function fromYamlFile($cluster = null, string $path)
360+
public static function fromYamlFile($cluster, string $path)
361361
{
362362
return static::fromYaml($cluster, file_get_contents($path));
363363
}

0 commit comments

Comments
 (0)