@@ -1,8 +1,6 @@  | 
                                                    ||
| 1 | 1 | <?php  | 
                                                        
| 2 | 2 | namespace Consolidation\SiteAlias;  | 
                                                        
| 3 | 3 | |
| 4 | -use Consolidation\Config\Config;  | 
                                                        |
| 5 | -use Consolidation\Config\ConfigInterface;  | 
                                                        |
| 6 | 4 | use Webmozart\PathUtil\Path;  | 
                                                        
| 7 | 5 | |
| 8 | 6 | /**  | 
                                                        
@@ -80,7 +80,7 @@ discard block  | 
                                                    ||
| 80 | 80 | * are defined by the alias contents.  | 
                                                        
| 81 | 81 | *  | 
                                                        
| 82 | 82 | * @param type $path  | 
                                                        
| 83 | - * @return type  | 
                                                        |
| 83 | + * @return string  | 
                                                        |
| 84 | 84 | */  | 
                                                        
| 85 | 85 | public static function locationFromPath($path)  | 
                                                        
| 86 | 86 |      { | 
                                                        
@@ -315,8 +315,7 @@ discard block  | 
                                                    ||
| 315 | 315 | /**  | 
                                                        
| 316 | 316 | * Process an alias name provided as '@sitename'.  | 
                                                        
| 317 | 317 | *  | 
                                                        
| 318 | - * @param string $sitename  | 
                                                        |
| 319 | - * @return true  | 
                                                        |
| 318 | + * @return boolean  | 
                                                        |
| 320 | 319 | */  | 
                                                        
| 321 | 320 | protected function processSingleItem($item)  | 
                                                        
| 322 | 321 |      { | 
                                                        
@@ -36,7 +36,7 @@ discard block  | 
                                                    ||
| 36 | 36 | /**  | 
                                                        
| 37 | 37 | * Add a location that alias files may be found.  | 
                                                        
| 38 | 38 | *  | 
                                                        
| 39 | - * @param string $path  | 
                                                        |
| 39 | + * @param string $paths  | 
                                                        |
| 40 | 40 | * @return $this  | 
                                                        
| 41 | 41 | */  | 
                                                        
| 42 | 42 | public function addSearchLocation($paths)  | 
                                                        
@@ -105,7 +105,7 @@ discard block  | 
                                                    ||
| 105 | 105 | * of the specified search locations.  | 
                                                        
| 106 | 106 | *  | 
                                                        
| 107 | 107 | * @param string $siteName  | 
                                                        
| 108 | - * @return string|bool  | 
                                                        |
| 108 | + * @return false|string  | 
                                                        |
| 109 | 109 | */  | 
                                                        
| 110 | 110 | public function findSingleSiteAliasFile($siteName)  | 
                                                        
| 111 | 111 |      { | 
                                                        
@@ -54,6 +54,9 @@  | 
                                                    ||
| 54 | 54 | return $this->renderAliases($all);  | 
                                                        
| 55 | 55 | }  | 
                                                        
| 56 | 56 | |
| 57 | + /**  | 
                                                        |
| 58 | + * @return string  | 
                                                        |
| 59 | + */  | 
                                                        |
| 57 | 60 | protected function getLocationsAndAliasName($varArgs)  | 
                                                        
| 58 | 61 |      { | 
                                                        
| 59 | 62 | $aliasName = '';  | 
                                                        
@@ -2,9 +2,6 @@  | 
                                                    ||
| 2 | 2 | namespace Consolidation\SiteAlias;  | 
                                                        
| 3 | 3 | |
| 4 | 4 | use Consolidation\Config\Config;  | 
                                                        
| 5 | -use Consolidation\Config\ConfigInterface;  | 
                                                        |
| 6 | -use Consolidation\Config\Util\ArrayUtil;  | 
                                                        |
| 7 | -use Consolidation\SiteAlias\Util\FsUtils;  | 
                                                        |
| 8 | 5 | |
| 9 | 6 | /**  | 
                                                        
| 10 | 7 | * An alias record is a configuration record containing well-known items.  | 
                                                        
@@ -104,6 +104,7 @@ discard block  | 
                                                    ||
| 104 | 104 | |
| 105 | 105 | /**  | 
                                                        
| 106 | 106 | * Given only a site name, load the default environment from it.  | 
                                                        
| 107 | + * @param string|null $sitename  | 
                                                        |
| 107 | 108 | */  | 
                                                        
| 108 | 109 | protected function loadDefaultEnvFromSitename($sitename)  | 
                                                        
| 109 | 110 |      { | 
                                                        
@@ -206,8 +207,8 @@ discard block  | 
                                                    ||
| 206 | 207 | /**  | 
                                                        
| 207 | 208 | * @param array $siteData list of sites with its respective data  | 
                                                        
| 208 | 209 | *  | 
                                                        
| 209 | - * @param SiteAliasName $aliasName The name of the record being created  | 
                                                        |
| 210 | 210 | * @param $siteData An associative array of envrionment => site data  | 
                                                        
| 211 | + * @param string $sitename  | 
                                                        |
| 211 | 212 | * @return SiteAlias[]  | 
                                                        
| 212 | 213 | */  | 
                                                        
| 213 | 214 | protected function createSiteAliassFromSiteData($sitename, $siteData, $location = '')  | 
                                                        
@@ -373,7 +374,6 @@ discard block  | 
                                                    ||
| 373 | 374 | /**  | 
                                                        
| 374 | 375 | * Given an array of site aliases, find the first one that is  | 
                                                        
| 375 | 376 | * local (has no 'host' item) and also contains a 'self.site.yml' file.  | 
                                                        
| 376 | - * @param array $data  | 
                                                        |
| 377 | 377 | * @return array  | 
                                                        
| 378 | 378 | */  | 
                                                        
| 379 | 379 | protected function findSelfSiteAliases($site_aliases)  | 
                                                        
@@ -420,6 +420,9 @@ discard block  | 
                                                    ||
| 420 | 420 | return $this->loader[$extension];  | 
                                                        
| 421 | 421 | }  | 
                                                        
| 422 | 422 | |
| 423 | + /**  | 
                                                        |
| 424 | + * @param string $extension  | 
                                                        |
| 425 | + */  | 
                                                        |
| 423 | 426 | public function addLoader($extension, DataFileLoaderInterface $loader)  | 
                                                        
| 424 | 427 |      { | 
                                                        
| 425 | 428 | $this->loader[$extension] = $loader;  | 
                                                        
@@ -122,6 +122,7 @@  | 
                                                    ||
| 122 | 122 | |
| 123 | 123 | /**  | 
                                                        
| 124 | 124 | * @inheritdoc  | 
                                                        
| 125 | + * @return string  | 
                                                        |
| 125 | 126 | */  | 
                                                        
| 126 | 127 | public function localRoot()  | 
                                                        
| 127 | 128 |      { | 
                                                        
@@ -1,9 +1,6 @@  | 
                                                    ||
| 1 | 1 | <?php  | 
                                                        
| 2 | 2 | namespace Consolidation\SiteAlias;  | 
                                                        
| 3 | 3 | |
| 4 | -use Consolidation\Config\Config;  | 
                                                        |
| 5 | -use Consolidation\Config\ConfigInterface;  | 
                                                        |
| 6 | -use Consolidation\Config\Util\ArrayUtil;  | 
                                                        |
| 7 | 4 | use Consolidation\SiteAlias\Util\FsUtils;  | 
                                                        
| 8 | 5 | |
| 9 | 6 | /**  | 
                                                        
@@ -33,7 +33,7 @@ discard block  | 
                                                    ||
| 33 | 33 | /**  | 
                                                        
| 34 | 34 | * combine the provided site alias with configuration.  | 
                                                        
| 35 | 35 | *  | 
                                                        
| 36 | - * @return SiteAlias read-only site alias combined with the runtime  | 
                                                        |
| 36 | + * @return SiteAliasWithConfig read-only site alias combined with the runtime  | 
                                                        |
| 37 | 37 | * config (overrides the site alias values) and the default config.  | 
                                                        
| 38 | 38 | */  | 
                                                        
| 39 | 39 | public static function create(SiteAliasInterface $siteAlias, ConfigInterface $defaultConfig, ConfigInterface $runtimeConfig = null)  | 
                                                        
@@ -47,6 +47,7 @@ discard block  | 
                                                    ||
| 47 | 47 | * Determine what object to use for the runtime config. If a specific  | 
                                                        
| 48 | 48 | * runtime config is given, use that. Otherwise, pull it from the default  | 
                                                        
| 49 | 49 | * configuration if available.  | 
                                                        
| 50 | + * @return ConfigInterface  | 
                                                        |
| 50 | 51 | */  | 
                                                        
| 51 | 52 | protected static function determineCorrectRuntimeConfig(ConfigInterface $defaultConfig, ConfigInterface $runtimeConfig)  | 
                                                        
| 52 | 53 |      { |