Skip to content

Commit a05eced

Browse files
committed
update variable syntax in BlockAbstract
1 parent fac28f5 commit a05eced

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/Handlers/Blocks/BlockAbstract.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ abstract class BlockAbstract implements BlockInterface
2929
*
3030
* @var string
3131
*/
32-
protected string $blockDir;
32+
protected string $blocksDir;
3333

3434
/**
3535
* Block URI path
3636
*
3737
* @var string
3838
*/
39-
protected string $blockUri;
39+
protected string $blocksUri;
4040

4141
/**
4242
* Additional block metadata. Place server side render callback here
@@ -57,14 +57,14 @@ abstract class BlockAbstract implements BlockInterface
5757
* Runs on 'init' hook
5858
*
5959
* @param string $blockName
60-
* @param string $blockDir
61-
* @param string $blockUri
60+
* @param string $blocksDir
61+
* @param string $blocksUri
6262
*/
63-
public function __construct(string $blockName, string $blockDir = '', string $blockUri = '')
63+
public function __construct(string $blockName, string $blocksDir = '', string $blocksUri = '')
6464
{
6565
$this->blockName = $blockName;
66-
$this->blockDir = !!empty($blocksDir) ? $blockDir : SK_BLOCKS_DIR;
67-
$this->blockUri = !empty($blockUri) ? $blockUri : SK_BLOCKS_URI;
66+
$this->blocksDir = !!empty($blocksDir) ? $blocksDir : SK_BLOCKS_DIR;
67+
$this->blocksUri = !empty($blocksUri) ? $blocksUri : SK_BLOCKS_URI;
6868

6969
// We should register block assets before block registration
7070
$this->registerBlockAssets();
@@ -86,7 +86,7 @@ public function __construct(string $blockName, string $blockDir = '', string $bl
8686
public function registerBlock(): void
8787
{
8888
register_block_type_from_metadata(
89-
$this->blockDir . $this->blockName,
89+
$this->blocksDir . $this->blockName,
9090
$this->blockArgs
9191
);
9292
}
@@ -106,7 +106,7 @@ public function registerBlock(): void
106106
public function loadBlockView(string $file = '', array $data = [], string $base = null, bool $echo = false): string
107107
{
108108
if ($base === null) {
109-
$base = $this->blockDir . $this->blockName . '/' . SK_BLOCKS_VIEW_DIR;
109+
$base = $this->blocksDir . $this->blockName . '/' . SK_BLOCKS_VIEW_DIR;
110110
}
111111

112112
$viewFilePath = $base . $file . '.php';
@@ -203,16 +203,16 @@ public function generateSpacersClasses(array $spacers): array
203203
*/
204204
public function registerBlockAssets(): void
205205
{
206-
$blockUri = $this->blockUri . $this->blockName . '/build/';
207-
$blockDir = $this->blockDir . $this->blockName . '/build/';
206+
$blocksUri = $this->blocksUri . $this->blockName . '/build/';
207+
$blocksDir = $this->blocksDir . $this->blockName . '/build/';
208208

209209
foreach ($this->blockAssets as $type => $asset) {
210210
if (empty($asset['file'])) {
211211
continue;
212212
}
213213

214-
$filePath = $blockDir . $asset['file'];
215-
$fileUri = $blockUri . $asset['file'];
214+
$filePath = $blocksDir . $asset['file'];
215+
$fileUri = $blocksUri . $asset['file'];
216216

217217
$dependencies = empty($asset['dependencies']) ? [] : $asset['dependencies'];
218218

0 commit comments

Comments
 (0)