Skip to content

Commit 1da5e19

Browse files
author
Ian Jenkins
committed
Minor tidying
1 parent 86f0ba8 commit 1da5e19

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

src/Processor/ProcessorInterface.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface ProcessorInterface
77
/**
88
* @param bool $asString
99
*
10-
* @return mixed
10+
* @return string|bool
1111
*/
1212
public function generate($asString = false);
13-
}
13+
}

src/Sunscreen.php

+8-14
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
class Sunscreen implements SunscreenInterface
1111
{
12+
const DS = DIRECTORY_SEPARATOR;
13+
1214
/**
1315
* @param PackageEvent $event
1416
*/
@@ -17,7 +19,7 @@ public static function postPackageInstall(PackageEvent $event)
1719
$mainPackage = $event->getComposer()->getPackage();
1820
$installedPackage = $event->getOperation()->getPackage();
1921
$extra = $installedPackage->getExtra();
20-
$baseDir = $event->getComposer()->getConfig()->get('vendor-dir') . '/..';
22+
$baseDir = $event->getComposer()->getConfig()->get('vendor-dir') . self::DS . '..';
2123

2224
$mainNamespace = self::extractNamespaceFromPackage($mainPackage);
2325
$src = self::extractSourceDirectoryFromPackage($mainPackage);
@@ -42,29 +44,21 @@ public static function postPackageInstall(PackageEvent $event)
4244

4345
if (!empty($interfaces)) {
4446
foreach ($interfaces as $interface) {
45-
$interfaceProcessor = new InterfaceProcessor(
46-
$interface,
47-
$mainNamespace,
48-
$baseDir . DIRECTORY_SEPARATOR . $src
49-
);
47+
$interfaceProcessor = new InterfaceProcessor($interface, $mainNamespace, $baseDir . self::DS . $src);
5048
$interfaceProcessor->generate();
5149

52-
$adapterProcessor = new AdapterProcessor(
53-
$interface,
54-
$mainNamespace,
55-
$baseDir . DIRECTORY_SEPARATOR . $src
56-
);
50+
$adapterProcessor = new AdapterProcessor($interface, $mainNamespace, $baseDir . self::DS . $src);
5751
$adapterProcessor->generate();
5852
}
5953
}
6054

6155
if (!empty($classes)) {
6256
foreach ($classes as $class) {
63-
$classProcessor = new ClassProcessor($class, $mainNamespace, $baseDir . DIRECTORY_SEPARATOR . $src);
57+
$classProcessor = new ClassProcessor($class, $mainNamespace, $baseDir . self::DS . $src);
6458
$classProcessor->generate();
6559

66-
$adapterProcessor = new AdapterProcessor($class, $mainNamespace, $baseDir . DIRECTORY_SEPARATOR . $src);
67-
$adapterProcessor->generate();
60+
$adapterProcessor = new AdapterProcessor($class, $mainNamespace, $baseDir . self::DS . $src);
61+
$adapterProcessor->generate();
6862
}
6963
}
7064
}

0 commit comments

Comments
 (0)