Skip to content

Commit 6e0d22a

Browse files
committed
Merge pull request #41 from cakephp/project-anything-goes
The app folder name is not a namespace
2 parents eb9ff7d + bc6394b commit 6e0d22a

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"cakephp/cakephp": "3.0.x-dev"
2323
},
2424
"require-dev": {
25-
"cakephp/cakephp-codesniffer": "2.0.*-dev",
25+
"cakephp/cakephp-codesniffer": "dev-master",
2626
"phpunit/phpunit": "*"
2727
},
2828
"autoload": {

src/Shell/Task/ProjectTask.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,7 @@ public function main()
5454
$project = $this->in($prompt, null, $suggestedPath);
5555
}
5656

57-
$namespace = basename($project);
58-
if (!preg_match('/^\w[\w\d_]+$/', $namespace)) {
59-
$err = 'Project Name/Namespace must start with a letter' .
60-
' and can only contain letters, digits and underscore';
61-
$this->err($err);
62-
$this->args = [];
63-
return $this->main();
64-
}
65-
66-
if ($project && !Folder::isAbsolute($project) && isset($_SERVER['PWD'])) {
57+
if (!Folder::isAbsolute($project) && isset($_SERVER['PWD'])) {
6758
$project = $_SERVER['PWD'] . DS . $project;
6859
}
6960

0 commit comments

Comments
 (0)