Skip to content
This repository was archived by the owner on Feb 20, 2025. It is now read-only.

Commit 6d47043

Browse files
author
Andrey Helldar
committed
Updated tests
1 parent c784c10 commit 6d47043

File tree

6 files changed

+190
-186
lines changed

6 files changed

+190
-186
lines changed

‎src/Services/Compiler.php

-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ protected function compile(): string
6565
$result = '';
6666

6767
foreach ($this->items as $values) {
68-
ksort($values);
69-
7068
foreach ($values as $key => $value) {
7169
$result .= "{$key}={$value}{$this->separator}";
7270
}

‎src/Services/Parser.php

+6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public function files(array $files): self
2020
public function get(): array
2121
{
2222
$this->each();
23+
$this->sort();
2324

2425
return $this->keys();
2526
}
@@ -33,6 +34,11 @@ protected function each(): void
3334
}
3435
}
3536

37+
protected function sort(): void
38+
{
39+
ksort($this->keys);
40+
}
41+
3642
protected function parse(string $content): void
3743
{
3844
foreach ($this->match($content) as $match) {

‎tests/fixtures/laravel/expected

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ABLY_KEY=null
2+
13
APP_DEBUG=false
24
APP_ENV=production
35
APP_KEY=null
@@ -6,33 +8,21 @@ APP_URL=http://localhost
68

79
ASSET_URL=null
810

9-
BROADCAST_DRIVER=redis
10-
11-
PUSHER_APP_CLUSTER=null
12-
PUSHER_APP_ID=null
13-
PUSHER_APP_KEY=null
14-
PUSHER_APP_SECRET=null
15-
16-
ABLY_KEY=null
17-
18-
CACHE_DRIVER=redis
19-
CACHE_PREFIX=null
20-
21-
MEMCACHED_HOST=127.0.0.1
22-
MEMCACHED_PASSWORD=null
23-
MEMCACHED_PERSISTENT_ID=null
24-
MEMCACHED_PORT=11211
25-
MEMCACHED_USERNAME=null
26-
2711
AWS_ACCESS_KEY_ID=null
2812
AWS_BUCKET=null
2913
AWS_DEFAULT_REGION=us-east-1
3014
AWS_ENDPOINT=null
3115
AWS_SECRET_ACCESS_KEY=null
3216
AWS_URL=null
3317

34-
DYNAMODB_CACHE_TABLE=cache
35-
DYNAMODB_ENDPOINT=null
18+
BCRYPT_ROUNDS=10
19+
20+
BROADCAST_DRIVER=redis
21+
22+
CACHE_DRIVER=redis
23+
CACHE_PREFIX=null
24+
25+
DATABASE_URL=null
3626

3727
DB_CONNECTION=mysql
3828
DB_DATABASE=default
@@ -43,32 +33,19 @@ DB_PORT=3306
4333
DB_SOCKET=null
4434
DB_USERNAME=null
4535

46-
DATABASE_URL=null
47-
48-
MYSQL_ATTR_SSL_CA=null
49-
50-
REDIS_CACHE_DB=1
51-
REDIS_CLIENT=null
52-
REDIS_CLUSTER=redis
53-
REDIS_DB=0
54-
REDIS_HOST=127.0.0.1
55-
REDIS_PASSWORD=null
56-
REDIS_PORT=6379
57-
REDIS_PREFIX=null
58-
REDIS_QUEUE=default
59-
REDIS_URL=null
36+
DYNAMODB_CACHE_TABLE=cache
37+
DYNAMODB_ENDPOINT=null
6038

6139
FILESYSTEM_DRIVER=local
6240

63-
BCRYPT_ROUNDS=10
64-
6541
LOG_CHANNEL=daily
6642
LOG_LEVEL=debug
6743
LOG_SLACK_WEBHOOK_URL=null
6844
LOG_STDERR_FORMATTER=null
6945

70-
PAPERTRAIL_PORT=null
71-
PAPERTRAIL_URL=null
46+
MAILGUN_DOMAIN=null
47+
MAILGUN_ENDPOINT=api.mailgun.net
48+
MAILGUN_SECRET=null
7249

7350
MAIL_ENCRYPTION=tls
7451
[email protected]
@@ -80,22 +57,45 @@ MAIL_PASSWORD=null
8057
MAIL_PORT=1025
8158
MAIL_USERNAME=null
8259

83-
QUEUE_CONNECTION=redis
84-
QUEUE_FAILED_DRIVER=database-uuids
60+
MEMCACHED_HOST=127.0.0.1
61+
MEMCACHED_PASSWORD=null
62+
MEMCACHED_PERSISTENT_ID=null
63+
MEMCACHED_PORT=11211
64+
MEMCACHED_USERNAME=null
8565

86-
SQS_PREFIX=https://sqs.us-east-1.amazonaws.com/your-account-id
87-
SQS_QUEUE=your-queue-name
88-
SQS_SUFFIX=null
66+
MYSQL_ATTR_SSL_CA=null
8967

90-
MAILGUN_DOMAIN=null
91-
MAILGUN_ENDPOINT=api.mailgun.net
92-
MAILGUN_SECRET=null
68+
PAPERTRAIL_PORT=null
69+
PAPERTRAIL_URL=null
9370

9471
POSTMARK_TOKEN=null
9572

73+
PUSHER_APP_CLUSTER=null
74+
PUSHER_APP_ID=null
75+
PUSHER_APP_KEY=null
76+
PUSHER_APP_SECRET=null
77+
78+
QUEUE_CONNECTION=redis
79+
QUEUE_FAILED_DRIVER=database-uuids
80+
81+
REDIS_CACHE_DB=1
82+
REDIS_CLIENT=null
83+
REDIS_CLUSTER=redis
84+
REDIS_DB=0
85+
REDIS_HOST=127.0.0.1
86+
REDIS_PASSWORD=null
87+
REDIS_PORT=6379
88+
REDIS_PREFIX=null
89+
REDIS_QUEUE=default
90+
REDIS_URL=null
91+
9692
SESSION_CONNECTION=null
9793
SESSION_DOMAIN=null
9894
SESSION_DRIVER=redis
9995
SESSION_LIFETIME=120
10096
SESSION_SECURE_COOKIE=null
10197
SESSION_STORE=null
98+
99+
SQS_PREFIX=https://sqs.us-east-1.amazonaws.com/your-account-id
100+
SQS_QUEUE=your-queue-name
101+
SQS_SUFFIX=null

‎tests/fixtures/laravel/expected-config

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ABLY_KEY=null
2+
13
APP_DEBUG=false
24
APP_ENV=testing
35
APP_KEY=null
@@ -6,33 +8,21 @@ APP_URL=http://localhost
68

79
ASSET_URL=null
810

9-
BROADCAST_DRIVER=null
10-
11-
PUSHER_APP_CLUSTER=null
12-
PUSHER_APP_ID=null
13-
PUSHER_APP_KEY=null
14-
PUSHER_APP_SECRET=null
15-
16-
ABLY_KEY=null
17-
18-
CACHE_DRIVER=array
19-
CACHE_PREFIX=null
20-
21-
MEMCACHED_HOST=127.0.0.1
22-
MEMCACHED_PASSWORD=null
23-
MEMCACHED_PERSISTENT_ID=null
24-
MEMCACHED_PORT=11211
25-
MEMCACHED_USERNAME=null
26-
2711
AWS_ACCESS_KEY_ID=null
2812
AWS_BUCKET=null
2913
AWS_DEFAULT_REGION=us-east-1
3014
AWS_ENDPOINT=null
3115
AWS_SECRET_ACCESS_KEY=null
3216
AWS_URL=null
3317

34-
DYNAMODB_CACHE_TABLE=cache
35-
DYNAMODB_ENDPOINT=null
18+
BCRYPT_ROUNDS=10
19+
20+
BROADCAST_DRIVER=null
21+
22+
CACHE_DRIVER=array
23+
CACHE_PREFIX=null
24+
25+
DATABASE_URL=null
3626

3727
DB_CONNECTION=mysql
3828
DB_DATABASE=forge
@@ -43,32 +33,19 @@ DB_PORT=3306
4333
DB_SOCKET=null
4434
DB_USERNAME=null
4535

46-
DATABASE_URL=null
47-
48-
MYSQL_ATTR_SSL_CA=null
49-
50-
REDIS_CACHE_DB=1
51-
REDIS_CLIENT=null
52-
REDIS_CLUSTER=redis
53-
REDIS_DB=0
54-
REDIS_HOST=127.0.0.1
55-
REDIS_PASSWORD=null
56-
REDIS_PORT=6379
57-
REDIS_PREFIX=null
58-
REDIS_QUEUE=default
59-
REDIS_URL=null
36+
DYNAMODB_CACHE_TABLE=cache
37+
DYNAMODB_ENDPOINT=null
6038

6139
FILESYSTEM_DRIVER=local
6240

63-
BCRYPT_ROUNDS=10
64-
6541
LOG_CHANNEL=stack
6642
LOG_LEVEL=debug
6743
LOG_SLACK_WEBHOOK_URL=null
6844
LOG_STDERR_FORMATTER=null
6945

70-
PAPERTRAIL_PORT=null
71-
PAPERTRAIL_URL=null
46+
MAILGUN_DOMAIN=null
47+
MAILGUN_ENDPOINT=api.mailgun.net
48+
MAILGUN_SECRET=null
7249

7350
MAIL_ENCRYPTION=tls
7451
[email protected]
@@ -80,22 +57,45 @@ MAIL_PASSWORD=null
8057
MAIL_PORT=587
8158
MAIL_USERNAME=null
8259

83-
QUEUE_CONNECTION=sync
84-
QUEUE_FAILED_DRIVER=database-uuids
60+
MEMCACHED_HOST=127.0.0.1
61+
MEMCACHED_PASSWORD=null
62+
MEMCACHED_PERSISTENT_ID=null
63+
MEMCACHED_PORT=11211
64+
MEMCACHED_USERNAME=null
8565

86-
SQS_PREFIX=https://sqs.us-east-1.amazonaws.com/your-account-id
87-
SQS_QUEUE=your-queue-name
88-
SQS_SUFFIX=null
66+
MYSQL_ATTR_SSL_CA=null
8967

90-
MAILGUN_DOMAIN=null
91-
MAILGUN_ENDPOINT=api.mailgun.net
92-
MAILGUN_SECRET=null
68+
PAPERTRAIL_PORT=null
69+
PAPERTRAIL_URL=null
9370

9471
POSTMARK_TOKEN=null
9572

73+
PUSHER_APP_CLUSTER=null
74+
PUSHER_APP_ID=null
75+
PUSHER_APP_KEY=null
76+
PUSHER_APP_SECRET=null
77+
78+
QUEUE_CONNECTION=sync
79+
QUEUE_FAILED_DRIVER=database-uuids
80+
81+
REDIS_CACHE_DB=1
82+
REDIS_CLIENT=null
83+
REDIS_CLUSTER=redis
84+
REDIS_DB=0
85+
REDIS_HOST=127.0.0.1
86+
REDIS_PASSWORD=null
87+
REDIS_PORT=6379
88+
REDIS_PREFIX=null
89+
REDIS_QUEUE=default
90+
REDIS_URL=null
91+
9692
SESSION_CONNECTION=null
9793
SESSION_DOMAIN=null
9894
SESSION_DRIVER=array
9995
SESSION_LIFETIME=120
10096
SESSION_SECURE_COOKIE=null
10197
SESSION_STORE=null
98+
99+
SQS_PREFIX=https://sqs.us-east-1.amazonaws.com/your-account-id
100+
SQS_QUEUE=your-queue-name
101+
SQS_SUFFIX=null

0 commit comments

Comments
 (0)