deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed MySQL references (MySQL changed to DB)

Browse source
This commit is contained in:
Dmitry Khomutov 2017-01-29 18:53:00 +07:00
parent 5396d580b3
commit afd99c12b5
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
21 changed files with 80 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -73,7 +73,7 @@ Installing
----------
You will need PHP 5.6+ (with OpenSSL support and enabled functions: `exec()`, `shell_exec()` and `proc_open()`)
with web-server (Nginx or Apache2), MySQL (or MariaDB) database and Composer.
with web-server (Nginx or Apache2), DB (MySQL/MariaDB or PostgreSQL) database and Composer.
* Go to the directory in which you want to install PHP Censor, for example: `/var/www`;
@ -83,7 +83,7 @@ with web-server (Nginx or Apache2), MySQL (or MariaDB) database and Composer.
* Install dependencies using Composer: `composer install`;
* Create empty MySQL database for application;
* Create empty database for application;
* Install Beanstalkd queue (`aptitude install beanstalkd`);
@ -135,7 +135,7 @@ cd /path/to/php-censor
For Phar plugin tests set 'phar.readonly' setting to Off (0) in `php.ini` config. Otherwise tests will be skipped.
For database B8Framework tests create empty 'b8_test' MySQL database on 'localhost' with user/password: `root/root`.
For database B8Framework tests create empty 'b8_test' database on 'localhost' with user/password: `root/root`.
Otherwise database tests will be skipped.
Documentation

1
composer.json
View file

@ -39,7 +39,6 @@
"require": {
"php": ">=5.6.0",
"ext-pdo": "*",
"ext-pdo_mysql": "*",
"swiftmailer/swiftmailer": "5.4.*",
"symfony/yaml": "2.8.*",

2
docs/en/config.md
View file

@ -53,7 +53,7 @@ As mentioned earlier, PHP Censor is powered by plugins, there are several phases
* `setup` - This phase is designed to initialise the build procedure.
* `test` - The tests that should be run during the build. Plugins run during this phase will contribute to the success or failure of the build.
* `complete` - Always called when the `test` phase completes, regardless of success or failure. **Note** that is you do any mysql stuff here, you will need to add the mysql credentials to this section as well, as it runs in a separate instance.
* `complete` - Always called when the `test` phase completes, regardless of success or failure. **Note** that is you do any DB stuff here, you will need to add the DB credentials to this section as well, as it runs in a separate instance.
* `success` - Called upon success of the `test` phase.
* `failure` - Called upon failure of the `test` phase.
* `fixed` - Called upon success of the `test` phase if the previous build of the branch was a success.

2
docs/en/configuring.md
View file

@ -16,5 +16,5 @@ php-censor:
default_user_id: 1
```
where you can get the `default_user_id by` logging into the mysql database and selecting your user ID from the `users` table in
where you can get the `default_user_id` by logging into the database and selecting your user ID from the `users` table in
the PHP Censor database.

2
docs/en/installing.md
View file

@ -8,7 +8,7 @@ What you'll need
* A web server (Nginx or Apache)
* [Composer](https://getcomposer.org/download/)
* [Git](http://git-scm.com/downloads)
* A MySQL server to connect to.
* A DB server to connect to (MySQL/MariaDB or PostgreSQL).
* The following functions need to be enabled: `exec()`, `shell_exec()` and `proc_open()` in php.ini.
* PHP must have OpenSSL support enabled.

2
docs/en/workers/worker.md
View file

@ -6,7 +6,7 @@ Unless already running a build, the worker will pick up and start running new bu
creation.
The worker is the recommended way to run PHP Censor builds. You can run several workers all watching one queue,
allowing jobs to be run simultaneously without the overhead of polling your MySQL database.
allowing jobs to be run simultaneously without the overhead of polling your database.
If you can't run Beanstalkd on your server, or would prefer to run builds on a regular schedule, you should consider
using the [running builds via Cron](workers/cron.md).

4
src/PHPCensor/Command/InstallCommand.php
View file

@ -84,7 +84,7 @@ class InstallCommand extends Command
$output->writeln('');
// ----
// Get MySQL connection information and verify that it works:
// Get DB connection information and verify that it works:
// ----
$connectionVerified = false;
@ -354,7 +354,7 @@ class InstallCommand extends Command
}
/**
* Try and connect to MySQL using the details provided.
* Try and connect to DB using the details provided.
* @param array $db
* @param OutputInterface $output
* @return bool

5
src/PHPCensor/Console/Application.php
View file

@ -35,13 +35,16 @@ class Application extends BaseApplication
'php-censor' => [
'adapter' => $databaseSettings['type'],
'host' => $databaseSettings['servers']['write'][0]['host'],
'port' => $databaseSettings['port'],
'name' => $databaseSettings['name'],
'user' => $databaseSettings['username'],
'pass' => $databaseSettings['password'],
],
],
];
if (!empty($databaseSettings['port'])) {
$phinxSettings['environments']['php-censor']['port'] = (integer)$databaseSettings['port'];
}
$phinxConfig = new PhinxConfig($phinxSettings);

10
src/PHPCensor/Languages/lang.da.php
View file

@ -309,11 +309,11 @@ Kontrollér venligst nedenstående fejl før du fortsætter.',
'enter_password' => 'Administrator-adgangskode: ',
'enter_app_url' => 'Din PHP Censor URL (eksempelvis "http://php-censor.local"): ',
'enter_db_host' => 'Indtast dit MySQL-hostnavn [localhost]: ',
'enter_db_name' => 'Indtast dit MySQL database-navn [php-censor-db]: ',
'enter_db_user' => 'Indtast dit MySQL-brugernavn [php-censor-user]: ',
'enter_db_pass' => 'Indtast dit MySQL-password: ',
'could_not_connect' => 'PHP Censor kunne ikke forbinde til MySQL med de angivning oplysninger. Forsøg igen.',
'enter_db_host' => 'Indtast dit DB-hostnavn [localhost]: ',
'enter_db_name' => 'Indtast dit DB database-navn [php-censor-db]: ',
'enter_db_user' => 'Indtast dit DB-brugernavn [php-censor-user]: ',
'enter_db_pass' => 'Indtast dit DB-password: ',
'could_not_connect' => 'PHP Censor kunne ikke forbinde til DB med de angivning oplysninger. Forsøg igen.',
'setting_up_db' => 'Indlæser database...',
'user_created' => 'Brugerkonto oprettet!',
'failed_to_create' => 'PHP Censor kunne ikke oprette din administrator-konto.',

10
src/PHPCensor/Languages/lang.de.php
View file

@ -332,11 +332,11 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
'enter_password' => 'Passwort des Administrators: ',
'enter_app_url' => 'Ihre PHP Censor-URL (z.B. "http://php-censor.local"): ',
'enter_db_host' => 'Bitte geben Sie Ihren MySQL-Host ein [localhost]: ',
'enter_db_name' => 'Bitte geben Sie Ihren MySQL-Namen ein [php-censor-db]: ',
'enter_db_user' => 'Bitte geben Sie Ihren MySQL-Benutzernamen ein [php-censor-user]: ',
'enter_db_pass' => 'Bitte geben Sie Ihr MySQL-Passwort ein: ',
'could_not_connect' => 'PHP Censor konnte wegen folgender Details nicht mit MySQL verbinden. Bitte versuchen Sie es erneut.',
'enter_db_host' => 'Bitte geben Sie Ihren DB-Host ein [localhost]: ',
'enter_db_name' => 'Bitte geben Sie Ihren DB-Namen ein [php-censor-db]: ',
'enter_db_user' => 'Bitte geben Sie Ihren DB-Benutzernamen ein [php-censor-user]: ',
'enter_db_pass' => 'Bitte geben Sie Ihr DB-Passwort ein: ',
'could_not_connect' => 'PHP Censor konnte wegen folgender Details nicht mit DB verbinden. Bitte versuchen Sie es erneut.',
'setting_up_db' => 'Ihre Datenbank wird aufgesetzt... ',
'user_created' => 'Benutzerkonto wurde erstellt!',
'failed_to_create' => 'PHP Censor konnte Ihr Administratorenkonto nicht erstellen.',

10
src/PHPCensor/Languages/lang.el.php
View file

@ -311,11 +311,11 @@ Services</a> του Bitbucket αποθετηρίου σας.',
'enter_password' => 'Κωδικός πρόσβασης διαχειριστή: ',
'enter_app_url' => 'Ο URL σύνδεσμος σας για το PHP Censor ("http://php-censor.local" για παράδειγμα): ',
'enter_db_host' => 'Παρακαλώ εισάγετε τον MySQL οικοδεσπότη σας [localhost]: ',
'enter_db_name' => 'Παρακαλώ εισάγετε το όνομα της MySQL βάσης δεδομένων σας [php-censor-db]: ',
'enter_db_user' => 'Παρακαλώ εισάγετε το όνομα χρήστη της MySQL σας [php-censor-user]: ',
'enter_db_pass' => 'Παρακαλώ εισάγετε τον κωδικό χρήστη της MySQL σας: ',
'could_not_connect' => 'Το PHP Censor δεν μπόρεσε να συνδεθεί με την MySQL με τα στοχεία που δώσατε. Παρακαλώ δοκιμάστε ξανά.',
'enter_db_host' => 'Παρακαλώ εισάγετε τον DB οικοδεσπότη σας [localhost]: ',
'enter_db_name' => 'Παρακαλώ εισάγετε το όνομα της DB βάσης δεδομένων σας [php-censor-db]: ',
'enter_db_user' => 'Παρακαλώ εισάγετε το όνομα χρήστη της DB σας [php-censor-user]: ',
'enter_db_pass' => 'Παρακαλώ εισάγετε τον κωδικό χρήστη της DB σας: ',
'could_not_connect' => 'Το PHP Censor δεν μπόρεσε να συνδεθεί με την DB με τα στοχεία που δώσατε. Παρακαλώ δοκιμάστε ξανά.',
'setting_up_db' => 'Γίνεται ρύθμιση της βάσης δεδομένων σας ...',
'user_created' => 'Λογαριασμός χρήστη δημιουργήθηκε!',
'failed_to_create' => 'Το PHP Censor απέτυχε να δημιουργήσει το λογαριασμό διαχειριστή σας.',

12
src/PHPCensor/Languages/lang.en.php
View file

@ -362,12 +362,12 @@ PHP Censor',
'enter_password' => 'Admin Password: ',
'enter_app_url' => 'Your PHP Censor URL ("http://php-censor.local" for example): ',
'enter_db_host' => 'Please enter your MySQL host [localhost]: ',
'enter_db_port' => 'Please enter your MySQL port [3306]: ',
'enter_db_name' => 'Please enter your MySQL database name [php-censor-db]: ',
'enter_db_user' => 'Please enter your MySQL username [php-censor-user]: ',
'enter_db_pass' => 'Please enter your MySQL password: ',
'could_not_connect' => 'PHP Censor could not connect to MySQL with the details provided. Please try again.',
'enter_db_host' => 'Please enter your DB host [localhost]: ',
'enter_db_port' => 'Please enter your DB port [3306]: ',
'enter_db_name' => 'Please enter your DB database name [php-censor-db]: ',
'enter_db_user' => 'Please enter your DB username [php-censor-user]: ',
'enter_db_pass' => 'Please enter your DB password: ',
'could_not_connect' => 'PHP Censor could not connect to DB with the details provided. Please try again.',
'setting_up_db' => 'Setting up your database... ',
'user_created' => 'User account created!',
'failed_to_create' => 'PHP Censor failed to create your admin account.',

10
src/PHPCensor/Languages/lang.es.php
View file

@ -306,11 +306,11 @@ PHP Censor',
'enter_password' => 'Contraseña de Admin:',
'enter_app_url' => 'La URL de PHP Censor ("Por ejemplo: http://php-censor.local"): ',
'enter_db_host' => 'Por favor, ingresa el servidor MySQL [localhost]: ',
'enter_db_name' => 'Por favor, ingresa el nombre de la base de datos MySQL [php-censor-db]: ',
'enter_db_user' => 'Por favor, ingresa el usuario MySQL [php-censor-user]: ',
'enter_db_pass' => 'Por favor, ingresa la contraseña MySQL: ',
'could_not_connect' => 'PHP Censor no pudo conectarse a MySQL con los datos dados. Por favor, intenta nuevamente.',
'enter_db_host' => 'Por favor, ingresa el servidor DB [localhost]: ',
'enter_db_name' => 'Por favor, ingresa el nombre de la base de datos DB [php-censor-db]: ',
'enter_db_user' => 'Por favor, ingresa el usuario DB [php-censor-user]: ',
'enter_db_pass' => 'Por favor, ingresa la contraseña DB: ',
'could_not_connect' => 'PHP Censor no pudo conectarse a DB con los datos dados. Por favor, intenta nuevamente.',
'setting_up_db' => 'Configurando base de datos... ',
'user_created' => '¡Cuenta de usuario creada!',
'failed_to_create' => 'PHP Censor no pudo crear la cuenta de admin.',

10
src/PHPCensor/Languages/lang.fr.php
View file

@ -326,11 +326,11 @@ PHP Censor',
'enter_password' => 'Mot de passe de l\'admin: ',
'enter_app_url' => 'Votre URL vers PHP Censor (par exemple "http://php-censor.local"): ',
'enter_db_host' => 'Merci d\'entrer le nom d\'hôte MySQL [localhost]: ',
'enter_db_name' => 'Merci d\'entrer le nom de la base MySQL [php-censor-db]: ',
'enter_db_user' => 'Merci d\'entrer le nom d\'utilisateur MySQL [php-censor-user]: ',
'enter_db_pass' => 'Merci d\'entrer le mot de passe MySQL: ',
'could_not_connect' => 'PHP Censor ne peut pas se connecter à MySQL à partir des informations fournies. Veuillez réessayer..',
'enter_db_host' => 'Merci d\'entrer le nom d\'hôte DB [localhost]: ',
'enter_db_name' => 'Merci d\'entrer le nom de la base DB [php-censor-db]: ',
'enter_db_user' => 'Merci d\'entrer le nom d\'utilisateur DB [php-censor-user]: ',
'enter_db_pass' => 'Merci d\'entrer le mot de passe DB: ',
'could_not_connect' => 'PHP Censor ne peut pas se connecter à DB à partir des informations fournies. Veuillez réessayer..',
'setting_up_db' => 'Paramétrage de la base de données... ',
'user_created' => 'Le compte utilisateur a été créé !',
'failed_to_create' => 'PHP Censor n\'a pas réussi à créer votre compte admin.',

10
src/PHPCensor/Languages/lang.it.php
View file

@ -312,11 +312,11 @@ PHP Censor',
'enter_password' => 'Password dell\'amministratore: ',
'enter_app_url' => 'L\'URL di PHP Censor ("http://php-censor.locale" ad esempio): ',
'enter_db_host' => 'Per favore inserisci l\'host MySQL [localhost]: ',
'enter_db_name' => 'Per favore inserisci il nome MySQL [php-censor-db]: ',
'enter_db_user' => 'Per favore inserisci l\'username MySQL [php-censor-user]: ',
'enter_db_pass' => 'Per favore inserisci la password MySQL: ',
'could_not_connect' => 'PHP Censor non può connettersi a MySQL con le informazioni fornite. Per favore prova ancora.',
'enter_db_host' => 'Per favore inserisci l\'host DB [localhost]: ',
'enter_db_name' => 'Per favore inserisci il nome DB [php-censor-db]: ',
'enter_db_user' => 'Per favore inserisci l\'username DB [php-censor-user]: ',
'enter_db_pass' => 'Per favore inserisci la password DB: ',
'could_not_connect' => 'PHP Censor non può connettersi a DB con le informazioni fornite. Per favore prova ancora.',
'setting_up_db' => 'Configurzione del tuo database... ',
'user_created' => 'Account utente creato!',
'failed_to_create' => 'PHP Censor non è riuscito a creare il tuo account amministrativo.',

10
src/PHPCensor/Languages/lang.nl.php
View file

@ -311,11 +311,11 @@ Gelieve de fouten na te kijken vooraleer verder te gaan.',
'enter_password' => 'Administrator wachtwoord: ',
'enter_app_url' => 'Je PHP Censor URL (bijvoorbeeld "http://php-censor.local"): ',
'enter_db_host' => 'Vul je MySQL host in [localhost]: ',
'enter_db_name' => 'Vul je MySQL databasenaam in [php-censor-db]: ',
'enter_db_user' => 'Vul je MySQL gebruikersnaam in [php-censor-user]: ',
'enter_db_pass' => 'Vul je MySQL watchtwoord in: ',
'could_not_connect' => 'PHP Censor kon met deze gegevens geen verbinding maken met MySQL. Gelieve opnieuw te proberen.',
'enter_db_host' => 'Vul je DB host in [localhost]: ',
'enter_db_name' => 'Vul je DB databasenaam in [php-censor-db]: ',
'enter_db_user' => 'Vul je DB gebruikersnaam in [php-censor-user]: ',
'enter_db_pass' => 'Vul je DB watchtwoord in: ',
'could_not_connect' => 'PHP Censor kon met deze gegevens geen verbinding maken met DB. Gelieve opnieuw te proberen.',
'setting_up_db' => 'Database wordt aangemaakt...',
'user_created' => 'Gebruikersprofiel aangemaakt!',
'failed_to_create' => 'PHP Censor kon je administratorprofiel niet aanmaken.',

10
src/PHPCensor/Languages/lang.pl.php
View file

@ -312,11 +312,11 @@ Przejrzyj powyższą listę błędów przed kontynuowaniem.',
'enter_password' => 'Hasło Admina: ',
'enter_app_url' => 'URL PHP Censor (na przykład "http://php-censor.local"): ',
'enter_db_host' => 'Wpisz hosta MySQL [host lokalny]: ',
'enter_db_name' => 'Wpisz nazwę bazy danych MySQL [php-censor-db]: ',
'enter_db_user' => 'Wpisz nazwę użytkownika MySQL [php-censor-user]: ',
'enter_db_pass' => 'Wpisz hasło MySQL: ',
'could_not_connect' => 'Z podanymi ustawieniami PHP Censor nie udało się połączyć z MySQL. Spróbuj ponownie.',
'enter_db_host' => 'Wpisz hosta DB [host lokalny]: ',
'enter_db_name' => 'Wpisz nazwę bazy danych DB [php-censor-db]: ',
'enter_db_user' => 'Wpisz nazwę użytkownika DB [php-censor-user]: ',
'enter_db_pass' => 'Wpisz hasło DB: ',
'could_not_connect' => 'Z podanymi ustawieniami PHP Censor nie udało się połączyć z DB. Spróbuj ponownie.',
'setting_up_db' => 'Ustawianie Twojej bazy danych...',
'user_created' => 'Utworzono konto użytkownika!',
'failed_to_create' => 'PHP Censor nie udało się założyc Twojego konta administratora.',

10
src/PHPCensor/Languages/lang.pt-br.php
View file

@ -333,11 +333,11 @@ PHP Censor',
'enter_password' => 'Admin Password: ',
'enter_app_url' => 'Your PHP Censor URL ("http://php-censor.local" for example): ',
'enter_db_host' => 'Please enter your MySQL host [localhost]: ',
'enter_db_name' => 'Please enter your MySQL database name [php-censor-db]: ',
'enter_db_user' => 'Please enter your MySQL username [php-censor-user]: ',
'enter_db_pass' => 'Please enter your MySQL password: ',
'could_not_connect' => 'PHP Censor could not connect to MySQL with the details provided. Please try again.',
'enter_db_host' => 'Please enter your DB host [localhost]: ',
'enter_db_name' => 'Please enter your DB database name [php-censor-db]: ',
'enter_db_user' => 'Please enter your DB username [php-censor-user]: ',
'enter_db_pass' => 'Please enter your DB password: ',
'could_not_connect' => 'PHP Censor could not connect to DB with the details provided. Please try again.',
'setting_up_db' => 'Setting up your database... ',
'user_created' => 'User account created!',
'failed_to_create' => 'PHP Censor failed to create your admin account.',

12
src/PHPCensor/Languages/lang.ru.php
View file

@ -351,12 +351,12 @@ PHP Censor',
'enter_password' => 'Пароль администратора: ',
'enter_app_url' => 'URL-адрес вашего PHP Censor (например: "http://php-censor.local"): ',
'enter_db_host' => 'Пожалуйста, введите хост MySQL [localhost]: ',
'enter_db_port' => 'Пожалуйста, введите порт MySQL [3306]: ',
'enter_db_name' => 'Пожалуйста, введите имя базы данных MySQL [php-censor-db]: ',
'enter_db_user' => 'Пожалуйста, введите пользователя MySQL [php-censor-user]: ',
'enter_db_pass' => 'Пожалуйста, введите пароль MySQL: ',
'could_not_connect' => 'PHP Censor не может подключится к MySQL с переданными параметрами. Пожалуйста, попробуйте еще раз.',
'enter_db_host' => 'Пожалуйста, введите хост DB [localhost]: ',
'enter_db_port' => 'Пожалуйста, введите порт DB [3306]: ',
'enter_db_name' => 'Пожалуйста, введите имя базы данных DB [php-censor-db]: ',
'enter_db_user' => 'Пожалуйста, введите пользователя DB [php-censor-user]: ',
'enter_db_pass' => 'Пожалуйста, введите пароль DB: ',
'could_not_connect' => 'PHP Censor не может подключится к DB с переданными параметрами. Пожалуйста, попробуйте еще раз.',
'setting_up_db' => 'Установка базы данных... ',
'user_created' => 'Аккаунт пользователя создан!',
'failed_to_create' => 'PHP Censor не удалось создать аккаунт администратора.',

10
src/PHPCensor/Languages/lang.uk.php
View file

@ -311,11 +311,11 @@ PHP Censor',
'enter_password' => 'Пароль адміністратора: ',
'enter_app_url' => 'URL адреса вашого PHP Censor (наприклад, "http://php-censor.local"): ',
'enter_db_host' => 'Будь ласка, введіть хост MySQL [localhost]: ',
'enter_db_name' => 'Будь ласка, введить ім’я бази даних MySQL [php-censor-db]: ',
'enter_db_user' => 'Будь ласка, введить ім’я користувача MySQL [php-censor-user]: ',
'enter_db_pass' => 'Будь ласка, введить ваш пароль MySQL: ',
'could_not_connect' => 'PHP Censor не може підключитися до MySQL із наданими параметрами. Будь ласка, спробуйте ще раз.',
'enter_db_host' => 'Будь ласка, введіть хост DB [localhost]: ',
'enter_db_name' => 'Будь ласка, введить ім’я бази даних DB [php-censor-db]: ',
'enter_db_user' => 'Будь ласка, введить ім’я користувача DB [php-censor-user]: ',
'enter_db_pass' => 'Будь ласка, введить ваш пароль DB: ',
'could_not_connect' => 'PHP Censor не може підключитися до DB із наданими параметрами. Будь ласка, спробуйте ще раз.',
'setting_up_db' => 'Налаштування вашої бази даних...',
'user_created' => 'Аккаунт користувача створено!',
'failed_to_create' => 'PHP Censor не вдалося створити ваш аккаунт адміністратора.',

10
src/PHPCensor/Languages/lang.zh.php
View file

@ -326,11 +326,11 @@ PHP Censor',
'enter_password' => 'Admin Password: ',
'enter_app_url' => 'Your PHP Censor URL ("http://php-censor.local" for example): ',
'enter_db_host' => 'Please enter your MySQL host [localhost]: ',
'enter_db_name' => 'Please enter your MySQL database name [php-censor-db]: ',
'enter_db_user' => 'Please enter your MySQL username [php-censor-user]: ',
'enter_db_pass' => 'Please enter your MySQL password: ',
'could_not_connect' => 'PHP Censor could not connect to MySQL with the details provided. Please try again.',
'enter_db_host' => 'Please enter your DB host [localhost]: ',
'enter_db_name' => 'Please enter your DB database name [php-censor-db]: ',
'enter_db_user' => 'Please enter your DB username [php-censor-user]: ',
'enter_db_pass' => 'Please enter your DB password: ',
'could_not_connect' => 'PHP Censor could not connect to DB with the details provided. Please try again.',
'setting_up_db' => 'Setting up your database... ',
'user_created' => 'User account created!',
'failed_to_create' => 'PHP Censor failed to create your admin account.',