TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Etienne Roudeix
2013-11-06 10:28:56 +01:00
parent b9babff070 1ccd2e63ce
commit 0c687408e4
4 changed files with 965 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Command/Install.php
View File

@@ -257,7 +257,7 @@ class Install extends ContainerAwareCommand
function ($answer) {
$answer = trim($answer);
if (is_null($answer)) {
throw new \RuntimeException("You must specify database host");
throw new \RuntimeException("You must specify a database host");
}
return $answer;
@@ -266,12 +266,12 @@ class Install extends ContainerAwareCommand
$connectionInfo["dbName"] = $dialog->askAndValidate(
$output,
$this->decorateInfo("Database Name (if database does not exists, Thelia will try to create it) : "),
$this->decorateInfo("Database name (if database does not exist, Thelia will try to create it) : "),
function ($answer) {
$answer = trim($answer);
if (is_null($answer)) {
throw new \RuntimeException("You must specify database name");
throw new \RuntimeException("You must specify a database name");
}
return $answer;
@@ -280,12 +280,12 @@ class Install extends ContainerAwareCommand
$connectionInfo["username"] = $dialog->askAndValidate(
$output,
$this->decorateInfo("Databse username : "),
$this->decorateInfo("Database username : "),
function ($answer) {
$answer = trim($answer);
if (is_null($answer)) {
throw new \RuntimeException("You must sprcify database username");
throw new \RuntimeException("You must specify a database username");
}
return $answer;

8
core/lib/Thelia/Module/schema/module/module.xsd
View File

@@ -33,9 +33,9 @@
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element type="xs:string" name="name"/>
<xs:element type="xs:string" name="name" minOccurs="1" maxOccurs="1"/>
<xs:element type="xs:string" name="company" minOccurs="0" maxOccurs="1"/>
<xs:element type="xs:string" name="email"/>
<xs:element type="xs:string" name="email" minOccurs="1" maxOccurs="1"/>
<xs:element type="xs:anyURI" name="website" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
@@ -52,13 +52,13 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="prerequis" minOccurs="0" maxOccurs="1">
<xs:element name="required" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>Les plugins qui doivent déjà être présents</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:sequence>
<xs:element name="plugin" maxOccurs="unbounded" minOccurs="0">
<xs:element name="module" maxOccurs="unbounded" minOccurs="0">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">