Skip to content

Commit fd99300

Browse files
committed
Remove usage of SharedFile, SharedFolder and ClusterSharedFolder
With this change, SharedFile, SharedFolder and ClusterSharedFolder are deprecated.
1 parent ae9b7d5 commit fd99300

File tree

7 files changed

+27
-43
lines changed

7 files changed

+27
-43
lines changed

src/ApplicationTemplate/Magento1.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
namespace Hypernode\DeployConfiguration\ApplicationTemplate;
44

5-
use Hypernode\DeployConfiguration\ClusterSharedFolder;
65
use Hypernode\DeployConfiguration\Configuration;
76
use Hypernode\DeployConfiguration\Command;
8-
use Hypernode\DeployConfiguration\SharedFolder;
97

108
class Magento1 extends Configuration
119
{
@@ -37,9 +35,9 @@ private function initializeDefaultConfiguration(): void
3735
]);
3836

3937
$this->setSharedFolders([
40-
new SharedFolder('var'),
41-
new ClusterSharedFolder('media'),
42-
new ClusterSharedFolder('sitemap'),
38+
'var',
39+
'media',
40+
'sitemap',
4341
]);
4442
}
4543
}

src/ApplicationTemplate/Magento2.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
namespace Hypernode\DeployConfiguration\ApplicationTemplate;
44

5-
use Hypernode\DeployConfiguration\ClusterSharedFolder;
65
use Hypernode\DeployConfiguration\Configuration;
76
use Hypernode\DeployConfiguration\Command;
8-
use Hypernode\DeployConfiguration\SharedFolder;
97

108
class Magento2 extends Configuration
119
{
@@ -47,10 +45,10 @@ private function initializeDefaultConfiguration(array $localesFrontend = null, a
4745
]);
4846

4947
$this->setSharedFolders([
50-
new SharedFolder('var/log'),
51-
new SharedFolder('var/report'),
52-
new ClusterSharedFolder('var/session'),
53-
new ClusterSharedFolder('pub/media'),
48+
'var/log',
49+
'var/report',
50+
'var/session',
51+
'pub/media',
5452
]);
5553

5654
$this->addDeployExclude('phpserver/');

src/ApplicationTemplate/Shopware6.php

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Hypernode\DeployConfiguration\ApplicationTemplate;
44

5-
use Hypernode\DeployConfiguration\ClusterSharedFolder;
65
use Hypernode\DeployConfiguration\Command\Build\Composer;
76
use Hypernode\DeployConfiguration\Command\Build\Shopware6\BuildAdministration;
87
use Hypernode\DeployConfiguration\Command\Build\Shopware6\BuildStorefront;
@@ -11,7 +10,6 @@
1110
use Hypernode\DeployConfiguration\Command\Deploy\Shopware6\CacheClear;
1211
use Hypernode\DeployConfiguration\Command\Deploy\Shopware6\ThemeCompile;
1312
use Hypernode\DeployConfiguration\Configuration;
14-
use Hypernode\DeployConfiguration\SharedFolder;
1513

1614
class Shopware6 extends Configuration
1715
{
@@ -56,11 +54,11 @@ private function initializeDefaultConfiguration(): void
5654
]);
5755

5856
$this->setSharedFolders([
59-
new SharedFolder('var/log'),
60-
new ClusterSharedFolder('config/jwt'),
61-
new ClusterSharedFolder('public/sitemap'),
62-
new ClusterSharedFolder('public/media'),
63-
new ClusterSharedFolder('public/thumbnail'),
57+
'var/log',
58+
'config/jwt',
59+
'public/sitemap',
60+
'public/media',
61+
'public/thumbnail',
6462
]);
6563
}
6664
}

src/ClusterSharedFolder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace Hypernode\DeployConfiguration;
66

77
/**
8-
* Folder will be shared over releases and all servers within cluster
8+
* @deprecated This class has been deprecated as DaaS configurations have been removed.
99
*/
1010
class ClusterSharedFolder extends SharedFolder
1111
{

src/Configuration.php

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ class Configuration
4545

4646
/**
4747
* Shared folders between deploys. Commonly used for `media`, `var/import` folders etc.
48-
* @var SharedFolder[]
48+
* @var string[]
4949
*/
5050
private $sharedFolders = [];
5151

5252
/**
5353
* Files shared between deploys. Commonly used for database configurations etc.
5454
*
55-
* @var SharedFile[]
55+
* @var string[]
5656
*/
5757
private $sharedFiles = [];
5858

@@ -162,8 +162,7 @@ public function getStages(): array
162162
}
163163

164164
/**
165-
* @param SharedFolder[]|string[] $folders
166-
* @return $this
165+
* @param string[] $folders
167166
*/
168167
public function setSharedFolders(array $folders): self
169168
{
@@ -174,30 +173,22 @@ public function setSharedFolders(array $folders): self
174173
return $this;
175174
}
176175

177-
/**
178-
* @param SharedFolder|string $folder
179-
* @return $this
180-
*/
181-
public function addSharedFolder($folder): self
176+
public function addSharedFolder(string $folder): self
182177
{
183-
if (!$folder instanceof SharedFolder) {
184-
$folder = new SharedFolder($folder);
185-
}
186178
$this->sharedFolders[] = $folder;
187179
return $this;
188180
}
189181

190182
/**
191-
* @return SharedFolder[]
183+
* @return string[]
192184
*/
193185
public function getSharedFolders(): array
194186
{
195187
return $this->sharedFolders;
196188
}
197189

198190
/**
199-
* @param SharedFile[]|string[] $files
200-
* @return $this
191+
* @param string[] $files
201192
*/
202193
public function setSharedFiles(array $files): self
203194
{
@@ -208,21 +199,14 @@ public function setSharedFiles(array $files): self
208199
return $this;
209200
}
210201

211-
/**
212-
* @param SharedFile|string $file
213-
* @return $this
214-
*/
215-
public function addSharedFile($file): self
202+
public function addSharedFile(string $file): self
216203
{
217-
if (!$file instanceof SharedFile) {
218-
$file = new SharedFile($file);
219-
}
220204
$this->sharedFiles[] = $file;
221205
return $this;
222206
}
223207

224208
/**
225-
* @return SharedFile[]
209+
* @return string[]
226210
*/
227211
public function getSharedFiles(): array
228212
{

src/SharedFile.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
namespace Hypernode\DeployConfiguration;
66

7+
/**
8+
* @deprecated This class has been deprecated, instead of new SharedFile('/path/to/file'), just use '/path/to/file'.
9+
*/
710
class SharedFile
811
{
912
/**

src/SharedFolder.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
namespace Hypernode\DeployConfiguration;
66

7+
/**
8+
* @deprecated This class has been deprecated, instead of new SharedFolder('/path/to/folder'), just use '/path/to/folder'.
9+
*/
710
class SharedFolder
811
{
912
/**

0 commit comments

Comments
 (0)