File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed
Generator/Behavior/Sluggable Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -132,7 +132,7 @@ public function getConnectionParametersArray($section = 'runtime')
132132 * Only one configuration file is supposed to be found.
133133 * This method also looks for a '.dist' configuration file and loads it.
134134 *
135- * @param string $fileName Configuration file name or directory in which resides the configuration file.
135+ * @param string|null $fileName Configuration file name or directory in which resides the configuration file.
136136 * @param array|null $extraConf Array of configuration properties, to be merged with those loaded from file.
137137 */
138138 protected function load ($ fileName , $ extraConf )
@@ -250,18 +250,18 @@ private function loadFile($fileName)
250250 /**
251251 * Return the directories where to find the configuration file.
252252 *
253- * @param string $fileName
253+ * @param string|null $fileName
254254 * @return array
255255 */
256256 private function getDirs ($ fileName )
257257 {
258- if (is_file ($ fileName )) {
258+ if ($ fileName && is_file ($ fileName )) {
259259 return [];
260260 }
261261
262262 $ currentDir = getcwd ();
263263
264- if (is_dir ($ fileName )) {
264+ if ($ fileName && is_dir ($ fileName )) {
265265 $ currentDir = $ fileName ;
266266 }
267267
Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ public function modifyTable()
7171 */
7272 protected function addUniqueConstraint (Table $ table )
7373 {
74- $ unique = new Unique (); //$this->getColumnForParameter('slug_column')
74+ $ unique = new Unique ();
7575 $ unique ->setName ($ table ->getCommonName () . '_slug ' );
7676 $ unique ->addColumn ($ table ->getColumn ($ this ->getParameter ('slug_column ' )));
7777 if ($ this ->getParameter ('scope_column ' )) {
You can’t perform that action at this time.
0 commit comments