diff --git a/cloudwords.cron.inc b/cloudwords.cron.inc
index b9c6a19..fb7d693 100644
--- a/cloudwords.cron.inc
+++ b/cloudwords.cron.inc
@@ -33,16 +33,16 @@ function _cloudwords_cron_auto_import_translation_preview_bundle(){
$projects = cloudwords_get_api_client()->get_open_projects();
- $existing_ids = \Drupal::database()->query("SELECT pid FROM {cloudwords_project} WHERE status NOT IN (:cancelled)", array(':cancelled' => cloudwords_project_closed_statuses()))->fetchCol();
+ $existing_ids = \Drupal::database()->query("SELECT pid FROM {cloudwords_project} WHERE status NOT IN (:cancelled)", [':cancelled' => cloudwords_project_closed_statuses()])->fetchCol();
- $importables = array();
+ $importables = [];
foreach ($projects as $project) {
if (in_array($project->getId(), $existing_ids)) {
$params = $project->getParams();
foreach ($params['targetLanguages'] as $delta => $lang) {
$language = new CloudwordsLanguage($lang);
- $translated_bundles = array();
+ $translated_bundles = [];
try {
$translated_bundles = cloudwords_get_api_client()->get_translated_bundles($project->getId(), $language->getLanguageCode());
} catch (CloudwordsApiException $e) {}
@@ -56,10 +56,10 @@ function _cloudwords_cron_auto_import_translation_preview_bundle(){
if(!isset($translatable->last_import) ||
(isset($translatable->last_import) && $translatable->last_import < strtotime($translated_bundle['xliff']['createdDate']))){
- $importables[$project->getId().'_'.$language->getLanguageCode()] = array(
+ $importables[$project->getId().'_'.$language->getLanguageCode()] = [
'project' => $project,
'language' => $language
- );
+ ];
// TODO deal with single translatable at a time
//_cloudwords_cron_auto_import_translation_preview_bundle_cron_import_xliff($project, $language, $translatable, $translated_bundle);
@@ -72,7 +72,7 @@ function _cloudwords_cron_auto_import_translation_preview_bundle(){
}
foreach($importables as $importable){
- $form_state = array();
+ $form_state = [];
$form_state['cloudwords_project'] = $importable['project'];
$form_state['cloudwords_language'] = $importable['language'];
$form_state['in_cron'] = true;
@@ -130,7 +130,7 @@ function _cloudwords_cron_auto_project_creation_of_out_of_date_translatables(){
}
// Get list of translatables that are flagged as out of date and are NOT currently in a project
- $properties = array('translation_status' => 2, 'status' => 0);
+ $properties = ['translation_status' => 2, 'status' => 0];
$translatables = cloudwords_get_translatables_by_property($properties);
//this must be run as a particular user to simulate the UI addition of ctids to a project
@@ -141,18 +141,18 @@ function _cloudwords_cron_auto_project_creation_of_out_of_date_translatables(){
$user = \Drupal::entityTypeManager()->getStorage('user')->load(1);
// group by language
- $langCtids = array();
+ $langCtids = [];
foreach($translatables as $translatable){
$langCtids[$translatable->language][] = $translatable->ctid;
}
foreach($langCtids as $langCode => $ctids){
- $form_state = array();
+ $form_state = [];
$form_state['values']['project_name'] = t('auto_!langCode_!date',
- array('!langCode' => $langCode,
+ ['!langCode' => $langCode,
'!date' => date('Y_m_d_H_i_s',time()
)
- )
+ ]
);
$form_state['in_cron'] = true;
@@ -184,10 +184,10 @@ function _cloudwords_cron_release_closed_project_content(){
foreach ($projects as $project) {
if (in_array($project->getId(), $existing_ids)) {
- $project_info = array(
+ $project_info = [
'name' => $project->getName(),
'status' => $project->getStatus()->getCode(),
- );
+ ];
\Drupal::database()->merge('cloudwords_project')->fields($project_info)->key(['id' => $project->getId()])->execute();
foreach ($project->getTargetLanguages() as $language) {
try {
@@ -206,7 +206,7 @@ function _cloudwords_cron_release_closed_project_content(){
}
// release the content for closed projects
- $closed_projects = array();
+ $closed_projects = [];
try {
$closed_projects = cloudwords_get_api_client()->get_closed_projects();
}
diff --git a/cloudwords.install b/cloudwords.install
index 792b7dc..a983339 100644
--- a/cloudwords.install
+++ b/cloudwords.install
@@ -23,7 +23,7 @@ function cloudwords_install() {
* Implements hook_requirements().
*/
function cloudwords_requirements($phase) {
- $requirements = array();
+ $requirements = [];
if ($phase == 'install') {
@@ -32,16 +32,16 @@ function cloudwords_requirements($phase) {
// Check for the cURL library.
if (extension_loaded('curl')) {
$info = curl_version();
- $requirements['cloudwords_curl'] = array(
+ $requirements['cloudwords_curl'] = [
'value' => $info['version'],
'severity' => REQUIREMENT_OK,
- );
+ ];
}
else {
- $requirements['cloudwords_curl'] = array(
+ $requirements['cloudwords_curl'] = [
'severity' => REQUIREMENT_ERROR,
- 'description' => $t('The cURL library for PHP is missing. Check the PHP cURL documentation for information on how to correct this.', array('@url' => 'http://www.php.net/manual/en/book.curl.php')),
- );
+ 'description' => $t('The cURL library for PHP is missing. Check the PHP cURL documentation for information on how to correct this.', ['@url' => 'http://www.php.net/manual/en/book.curl.php']),
+ ];
}
$requirements['cloudwords_curl']['title'] = $t('cURL library support');
}
@@ -147,7 +147,7 @@ function cloudwords_schema() {
'not null' => TRUE,
],
],
- 'primary key' => array('uid', 'pid'),
+ 'primary key' => ['uid', 'pid'],
];
return $schema;
@@ -162,9 +162,9 @@ function cloudwords_update_8001() {
->setLabel(t('status'))
->setDescription(t('The status of a queue item'))
->setDefaultValue(0)
- ->setSettings(array(
+ ->setSettings([
'max_length' => 2,
- ));
+ ]);
\Drupal::entityDefinitionUpdateManager()
->installFieldStorageDefinition('status', 'cloudwords_translatable', 'cloudwords', $storage_definition);
diff --git a/cloudwords.languages.inc b/cloudwords.languages.inc
index 190aa15..9b38be6 100644
--- a/cloudwords.languages.inc
+++ b/cloudwords.languages.inc
@@ -12,7 +12,7 @@
* A language map in the form Cloudwords => Drupal.
*/
function _cloudwords_map_cloudwords_drupal() {
- $map = array(
+ $map = [
'af' => 'af',
'am' => 'am',
'ar' => 'ar',
@@ -112,7 +112,7 @@ function _cloudwords_map_cloudwords_drupal() {
'xh' => 'xh',
'yi' => 'yi',
'zu' => 'zu',
- );
+ ];
\Drupal::moduleHandler()->alter('cloudwords_languages_map', $map);
diff --git a/cloudwords.module b/cloudwords.module
index 32699d4..0b6863d 100644
--- a/cloudwords.module
+++ b/cloudwords.module
@@ -512,7 +512,7 @@ function cloudwords_translatable_load($ctid) {
* @return array|false
* A list of translatables or false if not found.
*/
-function cloudwords_translatable_load_multiple($ctids = array(), $conditions = array(), $reset = FALSE) {
+function cloudwords_translatable_load_multiple($ctids = [], $conditions = [], $reset = FALSE) {
//@todo deal with conditions if necessary, otherwise remove
return \Drupal\cloudwords\Entity\CloudwordsTranslatable::loadMultiple($ctids);
}
diff --git a/handlers/cloudwords_handler_filter_project_user.inc b/handlers/cloudwords_handler_filter_project_user.inc
index 89fb77a..a058165 100644
--- a/handlers/cloudwords_handler_filter_project_user.inc
+++ b/handlers/cloudwords_handler_filter_project_user.inc
@@ -23,24 +23,24 @@ class cloudwords_handler_filter_project_user extends views_handler_filter {
* Provide simple equality operator
*/
function operator_options() {
- return array(
+ return [
'=' => t('The current user'),
// '!=' => t('Is not equal to'),
- );
+ ];
}
/**
* Provide a simple textfield for equality
*/
function value_form(&$form, &$form_state) {
- $form['value'] = array(
+ $form['value'] = [
'#type' => 'select',
'#title' => t('Value'),
'#size' => 30,
- '#options' => array('yes' => t('Yes'), 'no' => t('No')),
+ '#options' => ['yes' => t('Yes'), 'no' => t('No')],
'#default_value' => $this->value,
'#multiple' => FALSE,
- );
+ ];
}
function query() {
diff --git a/includes/cloudwords.serializer.inc b/includes/cloudwords.serializer.inc
index b6fbbe7..2f055b9 100644
--- a/includes/cloudwords.serializer.inc
+++ b/includes/cloudwords.serializer.inc
@@ -117,7 +117,7 @@ protected function addTransUnit($key, $element, \Drupal\cloudwords\Entity\Cloudw
//escape named html entities prior to conversion
$list = get_html_translation_table(HTML_ENTITIES);
- $namedTable = array();
+ $namedTable = [];
foreach($list as $k=>$v){
$namedTable[$v]= "&".str_replace('&', '',$v);
}
@@ -179,7 +179,7 @@ public function import($imported_file) {
return $this->oldImport($xml);
}
- $data = array();
+ $data = [];
foreach ($translatables as $translatable) {
foreach ($translatable->xpath('//*[@restype="x-drupal-field"]') as $field) {
if (isset($field->{'trans-unit'}) && $field->{'trans-unit'}->attributes()->restype == 'x-drupal-failure') {
@@ -210,7 +210,7 @@ public function oldImport($xml) {
// Register the xliff namespace, required for xpath.
$xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');
- $data = array();
+ $data = [];
foreach ($xml->xpath('//xliff:trans-unit') as $unit) {
$data[(string) $unit['id']]['#text'] = (string) $unit->target;
}
@@ -228,7 +228,7 @@ public function oldImport($xml) {
*/
public function serializer_simplexml_load_string($xml_string){
- $numericTable = array();
+ $numericTable = [];
//commonly present restricted characters that can safely be replaced
$numericTable['&'] = '&';
$trans = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
@@ -273,12 +273,12 @@ public function validateImport(\Drupal\cloudwords\CloudwordsDrupalProject $proje
// Register the xliff namespace, required for xpath.
$xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');
- $error_args = array(
+ $error_args = [
'%file' => $imported_file,
'%lang' => $language->getLanguageCode(),
'%name' => $project->getName(),
'%id' => $project->getId(),
- );
+ ];
// Check if our phase information is there.
$phase = $xml->xpath("//xliff:phase[@phase-name='extraction']");
@@ -353,10 +353,10 @@ protected function errorStop($use) {
$type = 'error';
break;
}
- $message = t('%error on line %num. Error code: %code', array(
+ $message = t('%error on line %num. Error code: %code', [
'%error' => trim($error->message),
'%num' => $error->line, '%code' => $error->code,
- ));
+ ]);
drupal_set_message($message, $type, FALSE);
}
libxml_clear_errors();
diff --git a/lib/cloudwords_api.php b/lib/cloudwords_api.php
index 26ead59..136448d 100644
--- a/lib/cloudwords_api.php
+++ b/lib/cloudwords_api.php
@@ -709,8 +709,8 @@ public function setPath($path) {
}
protected function transformLanguage($language) {
- $params = array('display' => $language['display'],
- 'languageCode' => $language['languageCode']);
+ $params = ['display' => $language['display'],
+ 'languageCode' => $language['languageCode']];
return new CloudwordsLanguage($params);
}
@@ -1057,7 +1057,7 @@ protected function transformSourceLanguage($sourceLanguage) {
}
protected function transformTargetLanguages($targetLanguages) {
- $languages = array();
+ $languages = [];
foreach ($targetLanguages as $targetLanguage) {
$languages[] = new CloudwordsLanguage($targetLanguage);
}
diff --git a/lib/cloudwords_client.php b/lib/cloudwords_client.php
index aea66ae..85e71b8 100644
--- a/lib/cloudwords_client.php
+++ b/lib/cloudwords_client.php
@@ -20,11 +20,11 @@
// check package dependencies
if( !function_exists('curl_init') ) {
- $params = array('error_message' => 'The Cloudwords API PHP SDK requires the CURL PHP extension.');
+ $params = ['error_message' => 'The Cloudwords API PHP SDK requires the CURL PHP extension.'];
throw new CloudwordsApiException(CloudwordsApiException::DEPENDENCY_EXCEPTION, $params);
}
if( !function_exists('json_decode') ) {
- $params = array('error_message' => 'The Cloudwords API PHP SDK requires the JSON PHP extension.');
+ $params = ['error_message' => 'The Cloudwords API PHP SDK requires the JSON PHP extension.'];
throw new CloudwordsApiException(CloudwordsApiException::DEPENDENCY_EXCEPTION, $params);
}
@@ -137,7 +137,7 @@ private function put($url, $params, $accept_content_type, $body_content_type) {
}
private function get_headers($body_content_type) {
- $headers = array();
+ $headers = [];
$headers[] = self::AUTHORIZATION_HEADER . $this->auth_token;
if( $body_content_type == self::CONTENT_TYPE_JSON ) {
$headers[] = self::CONTENT_TYPE_HEADER . self::CONTENT_TYPE_JSON;
@@ -153,7 +153,7 @@ private function get_request_data($data, $content_type) {
} else if( $content_type == self::CONTENT_TYPE_MULTIPART_FORM_DATA ) {
return $data;
} else {
- $params = array('content_type' => $content_type);
+ $params = ['content_type' => $content_type];
throw new CloudwordsApiException(CloudwordsApiException::UNSUPPORTED_CONTENT_TYPE_EXCEPTION, $params);
}
}
@@ -163,17 +163,17 @@ private function execute($conn, $url, $request_type) {
curl_setopt($conn, CURLOPT_SSL_VERIFYPEER, FALSE);
$data = curl_exec($conn);
if (curl_errno($conn)) {
- $params = array('error_message' => curl_error($conn));
+ $params = ['error_message' => curl_error($conn)];
throw new CloudwordsApiException(CloudwordsApiException::REQUEST_EXCEPTION, $params);
}
$http_status_code = curl_getinfo($conn, CURLINFO_HTTP_CODE);
if ($http_status_code === 200 || $http_status_code === 201) {
return $data;
} else {
- $params = array('http_status_code' => $http_status_code,
+ $params = ['http_status_code' => $http_status_code,
'request_type' => $request_type,
'request_url' => $url,
- );
+ ];
if ($http_status_code === 404) {
$params['error_message'] = 'Not Found';
$error_response = json_decode($data);
@@ -229,7 +229,7 @@ public function getMaxTotalConnections() {
}
public function get_projects($params = []) {
- $open_projects = array();
+ $open_projects = [];
$project_metadata = $this->get($this->base_url_with_version . '/project.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
return $this->project_factory($project_metadata);
foreach( $projects_metadata as $project_metadata ) {
@@ -240,7 +240,7 @@ public function get_projects($params = []) {
// @todo deprecated - remove
public function get_open_projects() {
- $open_projects = array();
+ $open_projects = [];
$projects_metadata = $this->get($this->base_url_with_version . '/project/open.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
foreach( $projects_metadata as $project_metadata ) {
$open_projects[] = $this->project_factory($project_metadata);
@@ -250,7 +250,7 @@ public function get_open_projects() {
// @todo deprecated - remove
public function get_closed_projects() {
- $closed_projects = array();
+ $closed_projects = [];
$projects_metadata = $this->get($this->base_url_with_version . '/project/closed.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
foreach( $projects_metadata as $project_metadata ) {
$closed_projects[] = $this->project_factory($project_metadata);
@@ -284,7 +284,7 @@ public function update_project($params) {
}
public function upload_project_source($project_id, $zip_file) {
- $params = array('file' => '@' . $zip_file);
+ $params = ['file' => '@' . $zip_file];
$this->curlFileFormat($params);
$source_metadata = $this->put($this->base_url_with_version . '/project/' . $project_id . '/file/source', $params, self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_MULTIPART_FORM_DATA);
return new \Drupal\cloudwords\CloudwordsFile($source_metadata);
@@ -301,14 +301,14 @@ public function download_source_file($project_id) {
}
public function upload_project_reference($project_id, $zip_file) {
- $params = array('file' => '@' . $zip_file);
+ $params = ['file' => '@' . $zip_file];
$this->curlFileFormat($params);
$reference_metadata = $this->post($this->base_url_with_version . '/project/' . $project_id . '/file/reference', $params, self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_MULTIPART_FORM_DATA);
return new \Drupal\cloudwords\CloudwordsFile($reference_metadata);
}
public function update_project_reference($project_id, $document_id, $zip_file) {
- $params = array('file' => '@' . $zip_file);
+ $params = ['file' => '@' . $zip_file];
$this->curlFileFormat($params);
$reference_metadata = $this->put($this->base_url_with_version . '/project/' . $project_id . '/file/reference/' . $document_id, $params, self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_MULTIPART_FORM_DATA);
return new \Drupal\cloudwords\CloudwordsFile($reference_metadata);
@@ -332,7 +332,7 @@ public function create_reviewer_instruction($project_id, $language_code, $conten
* A list of reference files.
*/
public function get_project_references($project_id) {
- $project_references = array();
+ $project_references = [];
$references_metadata = $this->get($this->base_url_with_version . '/project/' . $project_id . '/file/reference.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
if(is_array($references_metadata)) {
foreach ($references_metadata as $reference_metadata) {
@@ -363,7 +363,7 @@ public function download_master_translated_file($project_id) {
}
public function get_project_translated_files($project_id) {
- $project_translated_files = array();
+ $project_translated_files = [];
$files_metadata = $this->get($this->base_url_with_version . '/project/' . $project_id . '/file/translated/language.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
foreach( $files_metadata as $file_metadata ) {
$project_translated_files[] = new \Drupal\cloudwords\CloudwordsFile($file_metadata);
@@ -377,11 +377,11 @@ public function get_project_translated_file($project_id, $language) {
}
public function approve_project_language($project_id, $language) {
- $params = array(
- 'status' => array(
+ $params = [
+ 'status' => [
'code' => 'approved',
- ),
- );
+ ],
+ ];
$file_metadata = $this->put($this->base_url_with_version . '/project/' . $project_id . '/file/translated/language/' . $language . '.json', $params, self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
return new CloudwordsFile($file_metadata);
}
@@ -399,8 +399,8 @@ public function download_file_from_metadata($metadata) {
}
public function request_bids_for_project($project_id, $preferred_vendors, $do_let_cloudwords_choose) {
- $params = array('preferredVendors' => $preferred_vendors,
- 'doLetCloudwordsChoose' => $do_let_cloudwords_choose);
+ $params = ['preferredVendors' => $preferred_vendors,
+ 'doLetCloudwordsChoose' => $do_let_cloudwords_choose];
$bid_request = $this->post($this->base_url_with_version . '/project/' . $project_id . '/bid-request', $params, self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
return new CloudwordsBidRequest($bid_request);
}
@@ -411,7 +411,7 @@ public function get_current_bid_request_for_project($project_id) {
}
public function get_preferred_vendors() {
- $preferred_vendors = array();
+ $preferred_vendors = [];
$vendors = $this->get($this->base_url_with_version . '/vendor/preferred.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
foreach( $vendors as $vendor ) {
$preferred_vendors[] = new CloudwordsVendor($vendor);
@@ -420,7 +420,7 @@ public function get_preferred_vendors() {
}
public function get_source_languages() {
- $source_languages = array();
+ $source_languages = [];
$languages = $this->get($this->base_url_with_version . '/org/settings/project/language/source.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
foreach( $languages as $language ) {
$source_languages[] = new CloudwordsLanguage($language);
@@ -429,7 +429,7 @@ public function get_source_languages() {
}
public function get_target_languages() {
- $target_languages = array();
+ $target_languages = [];
$languages = $this->get($this->base_url_with_version . '/org/settings/project/language/target.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
foreach( $languages as $language ) {
$target_languages[] = new CloudwordsLanguage($language);
@@ -438,7 +438,7 @@ public function get_target_languages() {
}
public function get_intended_uses() {
- $intended_uses = array();
+ $intended_uses = [];
$uses = $this->get($this->base_url_with_version . '/org/settings/project/intended-use.json', self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_JSON);
foreach( $uses as $intended_use ) {
$intended_uses[] = new CloudwordsIntendedUse($intended_use);
@@ -465,13 +465,13 @@ public function get_translated_bundles($project_id, $language_code) {
}
public function upload_source_preview_bundle($project_id, $document_id, $zip_file) {
- $params = array('file' => '@' . $zip_file);
+ $params = ['file' => '@' . $zip_file];
$this->curlFileFormat($params);
return $this->put($this->base_url_with_version . '/project/' . $project_id . '/file/source/document/'.$document_id.'/preview', $params, self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_MULTIPART_FORM_DATA);
}
public function upload_translation_preview_bundle($project_id, $language_code, $document_id, $zip_file) {
- $params = array('file' => '@' . $zip_file);
+ $params = ['file' => '@' . $zip_file];
$this->curlFileFormat($params);
return $this->put($this->base_url_with_version . '/project/' . $project_id . '/file/translated/language/'.$language_code.'/document/'.$document_id.'/preview', $params, self::CONTENT_TYPE_JSON, self::CONTENT_TYPE_MULTIPART_FORM_DATA);
}
diff --git a/lib/cloudwords_html_converter.inc b/lib/cloudwords_html_converter.inc
index b9da4b2..b19839c 100644
--- a/lib/cloudwords_html_converter.inc
+++ b/lib/cloudwords_html_converter.inc
@@ -6,7 +6,7 @@
*/
class CloudwordsConverter {
- protected $elementMap = array(
+ protected $elementMap = [
'b' => 'bold',
'br' => 'lb',
'caption' => 'caption',
@@ -24,9 +24,9 @@ class CloudwordsConverter {
'tfoot' => 'footer',
'tr' => 'row',
'u' => 'underlined',
- );
+ ];
- protected $inlineTags = array(
+ protected $inlineTags = [
'a' => TRUE,
'abbr' => TRUE,
'acronym' => TRUE,
@@ -95,9 +95,9 @@ class CloudwordsConverter {
'u' => TRUE,
'var' => TRUE,
'wbr' => TRUE,
- );
+ ];
- protected $selfClosingTags = array(
+ protected $selfClosingTags = [
'area' => TRUE,
'base' => TRUE,
'basefont' => TRUE,
@@ -110,7 +110,7 @@ class CloudwordsConverter {
'link' => TRUE,
'meta' => TRUE,
'param' => TRUE,
- );
+ ];
protected $inTransUnit = FALSE;
@@ -146,7 +146,7 @@ public function toXLIFF($pretty_print = FALSE) {
$out = $this->doc->createDocumentFragment();
- $domNodeList = array();
+ $domNodeList = [];
for ($i = 0; $i < $wrapper_div->childNodes->length; ++$i) {
$domNodeList[] = $wrapper_div->childNodes->item($i);
}
@@ -173,7 +173,7 @@ protected function sanitizeMixedDomNodeList($doc, &$list){
$NewElement = $doc->createElement('text');
- $test = array(XML_ELEMENT_NODE=> FALSE, XML_TEXT_NODE=>FALSE);
+ $test = [XML_ELEMENT_NODE=> FALSE, XML_TEXT_NODE=>FALSE];
foreach($list as $node){
$test[$node->nodeType] = TRUE;
}
@@ -184,16 +184,16 @@ protected function sanitizeMixedDomNodeList($doc, &$list){
}
//mixed group logic
- $newList = array();
+ $newList = [];
foreach($list as $k => $node){
if (array_key_exists($node->nodeName, $this->inlineTags)||
- array_key_exists($node->nodeName, array('#text' => true))){
+ array_key_exists($node->nodeName, ['#text' => true])){
unset($list[$k]);
$NewElement->appendChild($node->cloneNode(true));
if (!isset($node->nextSibling->nodeName)){
$newList[$k] = $NewElement;
}else if(array_key_exists($node->nextSibling->nodeName, $this->inlineTags)||
- array_key_exists($node->nextSibling->nodeName, array('#text' => true))){
+ array_key_exists($node->nextSibling->nodeName, ['#text' => true])){
//do nothing
}else{
$newList[$k] = $NewElement;
@@ -331,7 +331,7 @@ protected function hasBlockChild(DOMElement $element) {
}
protected function xliffAttrs(DOMElement $element) {
- $attrs = array();
+ $attrs = [];
if (isset($this->inlineTags[$element->tagName])) {
$attrs[] = new DOMAttr('ctype', $this->mapHTMLTagToXLIFF($element));
diff --git a/modules/cloudwords_translation/cloudwords_translation.api.php b/modules/cloudwords_translation/cloudwords_translation.api.php
index 4c7e418..5df329b 100644
--- a/modules/cloudwords_translation/cloudwords_translation.api.php
+++ b/modules/cloudwords_translation/cloudwords_translation.api.php
@@ -36,5 +36,5 @@ function hook_cloudwords_translation_before_node_save(&$node, $data, $source_lan
*/
function hook_cloudwords_translation_after_node_save(&$node, $data, $source_language, $translation_type){
- \Drupal::logger('cloudwords')->notice('Node %nid updated translation', array('%nid' => $node->nid));
+ \Drupal::logger('cloudwords')->notice('Node %nid updated translation', ['%nid' => $node->nid]);
}
diff --git a/modules/cloudwords_translation/cloudwords_translation.pages.inc b/modules/cloudwords_translation/cloudwords_translation.pages.inc
index 75d64fd..7ca44ed 100644
--- a/modules/cloudwords_translation/cloudwords_translation.pages.inc
+++ b/modules/cloudwords_translation/cloudwords_translation.pages.inc
@@ -28,19 +28,19 @@ function cloudwords_translation_node_overview($form, &$form_state, $node) {
else {
// We have no translation source nid, this could be a new set, emulate that.
$tnid = $node->nid;
- $translations = array(entity_language('node', $node) => $node);
+ $translations = [entity_language('node', $node) => $node];
}
$form_state['tnid'] = $tnid;
- $queue = cloudwords_get_translatables_by_property(array(
+ $queue = cloudwords_get_translatables_by_property([
'type' => 'node_content',
'objectid' => $tnid,
- ), 'language');
+ ], 'language');
// Pre-load nodes. Without this, the number of database queries grows linearly
// with the number of languages. Even though translation_node_overview() calls
// node_load(), this helps since the loaded nodes are statically cached.
- $nids = array();
+ $nids = [];
foreach ($translations as $translation) {
$nids[] = $translation->nid;
}
@@ -48,7 +48,7 @@ function cloudwords_translation_node_overview($form, &$form_state, $node) {
$node_set = \Drupal::entityTypeManager()->getStorage('node')->loadMultiple($nids);
}
else {
- $node_set = array();
+ $node_set = [];
}
$primary_node = FALSE;
@@ -65,28 +65,28 @@ function cloudwords_translation_node_overview($form, &$form_state, $node) {
return translation_node_overview($node);
}
- $form['update'] = array(
+ $form['update'] = [
'#type' => 'fieldset',
'#title' => t('Mark for Cloudwords Translation'),
- '#attributes' => array('class' => array('container-inline')),
- );
+ '#attributes' => ['class' => ['container-inline']],
+ ];
- $form['update']['operation'] = array(
+ $form['update']['operation'] = [
'#type' => 'select',
- '#options' => array(
+ '#options' => [
'add' => t('Mark'),
'remove' => t('Unmark'),
- ),
+ ],
'#default_value' => 'add',
'#title_display' => 'invisible',
'#title' => t('Queue operations'),
- );
+ ];
- $form['update']['actions'] = array('#type' => 'actions');
- $form['update']['actions']['submit'] = array(
+ $form['update']['actions'] = ['#type' => 'actions'];
+ $form['update']['actions']['submit'] = [
'#type' => 'submit',
'#value' => t('Update'),
- );
+ ];
// @FIXME
// // @FIXME
@@ -95,24 +95,24 @@ function cloudwords_translation_node_overview($form, &$form_state, $node) {
// $type = variable_get('translation_language_type', LANGUAGE_TYPE_INTERFACE);
- $form['table'] = array(
+ $form['table'] = [
'#type' => 'tableselect',
- '#header' => array(
+ '#header' => [
'label' => t('Language'),
'title' => t('Title'),
'status' => t('Status'),
'cloudwords' => t('Marked for Cloudwords'),
'operations' => t('Operations'),
- ),
- '#options' => array(),
- '#atributes' => array(),
- );
+ ],
+ '#options' => [],
+ '#atributes' => [],
+ ];
$table =& $form['table'];
$rows =& $table['#options'];
foreach (cloudwords_language_list() as $langcode => $language) {
- $options = array();
+ $options = [];
$language_name = $language->name;
if (!isset($queue[$langcode]) && (!isset($translations[$langcode]) || $tnid != $translations[$langcode]->nid)) {
@@ -124,14 +124,14 @@ function cloudwords_translation_node_overview($form, &$form_state, $node) {
$label = $primary_node->title;
}
- $translatable = cloudwords_translatable_create(array(
+ $translatable = cloudwords_translatable_create([
'objectid' => $tnid,
'language' => $langcode,
'label' => $label,
'textgroup' => 'node',
'type' => 'node_content',
'status' => CLOUDWORDS_QUEUE_NOT_IN_QUEUE,
- ));
+ ]);
$translatable->save();
$queue[$langcode] = $translatable;
}
@@ -164,7 +164,7 @@ function cloudwords_translation_node_overview($form, &$form_state, $node) {
}
if ($translation_node->nid == $tnid) {
- $language_name = t('@language_name (source)', array('@language_name' => $language_name));
+ $language_name = t('@language_name (source)', ['@language_name' => $language_name]);
$form['table'][$langcode]['#disabled'] = TRUE;
}
}
@@ -175,7 +175,7 @@ function cloudwords_translation_node_overview($form, &$form_state, $node) {
$text = t('add translation');
$path = 'node/add/' . str_replace('_', '-', $node->type);
$links = language_negotiation_get_switch_links($type, $path);
- $query = array('query' => array('translation' => $node->nid, 'target' => $langcode));
+ $query = ['query' => ['translation' => $node->nid, 'target' => $langcode]];
// @FIXME
// l() expects a Url object, created from a route name or external URI.
// $options[] = empty($links->links[$langcode]['href']) ? l($text, $path, $query) : l($text, $links->links[$langcode]['href'], array_merge_recursive($links->links[$langcode], $query));
@@ -190,13 +190,13 @@ function cloudwords_translation_node_overview($form, &$form_state, $node) {
// $status .= ' - ' . t($text) . '';
}
- $rows[$langcode] = array(
+ $rows[$langcode] = [
'label' => $language_name,
'title' => $title,
'status' => $status,
'cloudwords' => $cloudwords,
'operations' => implode(' | ', $options),
- );
+ ];
}
$form_state['cloudwords_queue'] = $queue;
@@ -234,7 +234,7 @@ function cloudwords_translation_node_overview_submit($form, &$form_state) {
$translatable = $form_state['cloudwords_queue'][$langcode];
if ($translatable->status == CLOUDWORDS_QUEUE_NOT_IN_QUEUE) {
$translatable->queue();
- drupal_set_message(t('Marked %label for translation.', array('%label' => $translatable->label)), 'status', FALSE);
+ drupal_set_message(t('Marked %label for translation.', ['%label' => $translatable->label]), 'status', FALSE);
}
}
break;
@@ -244,7 +244,7 @@ function cloudwords_translation_node_overview_submit($form, &$form_state) {
$translatable = $form_state['cloudwords_queue'][$langcode];
if ($translatable->status == CLOUDWORDS_QUEUE_QUEUED) {
$translatable->dequeue();
- drupal_set_message(t('Unarked %label for translation.', array('%label' => $translatable->label)), 'status', FALSE);
+ drupal_set_message(t('Unarked %label for translation.', ['%label' => $translatable->label]), 'status', FALSE);
}
}
break;
diff --git a/modules/cloudwords_translation/src/CloudwordsEntitySourceController.php b/modules/cloudwords_translation/src/CloudwordsEntitySourceController.php
index 96e6daa..f698c14 100644
--- a/modules/cloudwords_translation/src/CloudwordsEntitySourceController.php
+++ b/modules/cloudwords_translation/src/CloudwordsEntitySourceController.php
@@ -11,9 +11,9 @@
class CloudwordsEntitySourceController implements CloudwordsSourceControllerInterface {
- protected $objectInfo = array();
- protected $stringInfo = array();
- protected $bundle = array();
+ protected $objectInfo = [];
+ protected $stringInfo = [];
+ protected $bundle = [];
protected $type;
/**
@@ -73,9 +73,9 @@ public function bundleLabel(\Drupal\cloudwords\Entity\CloudwordsTranslatable $tr
*/
public function uri(\Drupal\cloudwords\Entity\CloudwordsTranslatable $translatable) {
$entity = \Drupal::entityTypeManager()->getStorage($translatable->getType())->load($translatable->getObjectId());
- return array(
+ return [
'path' =>$entity->url(),
- );
+ ];
}
/**
@@ -86,7 +86,7 @@ public function data(\Drupal\cloudwords\Entity\CloudwordsTranslatable $translata
// Get all the fields that can be translated and arrange their values into
// a specific structure.
- $structure = array('#label' => $translatable->typeLabel());
+ $structure = ['#label' => $translatable->typeLabel()];
//$structure['entity_title']['#label'] = $translatable->getType();
$structure['entity_title']['#label'] = 'Title';
diff --git a/src/CloudwordsDrupalProject.php b/src/CloudwordsDrupalProject.php
index fc508e3..dcd310b 100644
--- a/src/CloudwordsDrupalProject.php
+++ b/src/CloudwordsDrupalProject.php
@@ -22,10 +22,10 @@ public function __construct($params) {
parent::__construct($params);
if ($this->isDrupalCancelled()) {
- $status = array(
+ $status = [
'code' => 'drupal_cancelled',
'display' => 'Cancelled in Drupal',
- );
+ ];
$this->status = $status;
$this->params['status'] = $status;
}
@@ -42,7 +42,7 @@ public function __construct($params) {
*/
public function getCtids($lang_code = NULL) {
$query = \Drupal::database()->select('cloudwords_content', 'cc')
- ->fields('cc', array('ctid'))
+ ->fields('cc', ['ctid'])
->condition('cc.pid', $this->getId());
if ($lang_code) {
@@ -74,10 +74,10 @@ public function getTranslatables($lang_code = NULL) {
* A Cloudwords language object.
*/
public function getLanguageImportStatus(CloudwordsLanguage $language) {
- $args = array(
+ $args = [
':pid' => $this->getId(),
':lang' => $language->getLanguageCode(),
- );
+ ];
return \Drupal::database()->query("SELECT status FROM {cloudwords_project_language} WHERE pid = :pid AND language = :lang", $args)->fetchField();
}
@@ -93,13 +93,13 @@ public function getLanguageImportStatus(CloudwordsLanguage $language) {
public function setLanguageImportStatus(CloudwordsLanguage $language, $code) {
\Drupal::database()->merge('cloudwords_project_language')
- ->key(array(
+ ->key([
'pid' => $this->getId(),
'language' => $language->getLanguageCode(),
- ))
- ->fields(array(
+ ])
+ ->fields([
'status' => $code,
- ))
+ ])
->execute();
}
@@ -128,12 +128,12 @@ public function releaseContent($lang_code = NULL) {
*/
public function setStatus($status) {
\Drupal::database()->merge('cloudwords_project')
- ->key(array(
+ ->key([
'id' => $this->getId(),
- ))
- ->fields(array(
+ ])
+ ->fields([
'status' => $status,
- ))
+ ])
->execute();
}
@@ -145,7 +145,7 @@ public function setStatus($status) {
*/
public function isDrupalCancelled() {
if ($this->isDrupalCancelled === NULL) {
- $this->isDrupalCancelled = \Drupal::database()->query("SELECT 1 FROM {cloudwords_project} WHERE id = :id and status = 'drupal_cancelled'", array(':id' => $this->getId()))->fetchField();
+ $this->isDrupalCancelled = \Drupal::database()->query("SELECT 1 FROM {cloudwords_project} WHERE id = :id and status = 'drupal_cancelled'", [':id' => $this->getId()])->fetchField();
}
return $this->isDrupalCancelled;
}
diff --git a/src/CloudwordsFile.php b/src/CloudwordsFile.php
index c430b66..e7d3594 100644
--- a/src/CloudwordsFile.php
+++ b/src/CloudwordsFile.php
@@ -129,8 +129,8 @@ public function setPath($path) {
}
protected function transformLanguage($language) {
- $params = array('display' => $language['display'],
- 'languageCode' => $language['languageCode']);
+ $params = ['display' => $language['display'],
+ 'languageCode' => $language['languageCode']];
return new CloudwordsLanguage($params);
}
diff --git a/src/CloudwordsFileformatXLIFF.php b/src/CloudwordsFileformatXLIFF.php
index 6fff73e..18d9014 100644
--- a/src/CloudwordsFileformatXLIFF.php
+++ b/src/CloudwordsFileformatXLIFF.php
@@ -113,7 +113,7 @@ protected function addTransUnit($key, $element, CloudwordsTranslatable $translat
//escape named html entities prior to conversion
$list = get_html_translation_table(HTML_ENTITIES);
- $namedTable = array();
+ $namedTable = [];
foreach($list as $v){
$namedTable[$v]= "&".str_replace('&', '',$v);
}
@@ -173,7 +173,7 @@ public function import($imported_file) {
return $this->oldImport($xml);
}
- $data = array();
+ $data = [];
foreach ($translatables as $translatable) {
foreach ($translatable->xpath('//*[@restype="x-drupal-field"]') as $field) {
if (isset($field->{'trans-unit'}) && $field->{'trans-unit'}->attributes()->restype == 'x-drupal-failure') {
@@ -203,7 +203,7 @@ public function oldImport($xml) {
// Register the xliff namespace, required for xpath.
$xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');
- $data = array();
+ $data = [];
foreach ($xml->xpath('//xliff:trans-unit') as $unit) {
$data[(string) $unit['id']]['#text'] = (string) $unit->target;
}
@@ -221,7 +221,7 @@ public function oldImport($xml) {
*/
public function serializer_simplexml_load_string($xml_string){
- $numericTable = array();
+ $numericTable = [];
//commonly present restricted characters that can safely be replaced
$numericTable['&'] = '&';
$trans = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
@@ -266,12 +266,12 @@ public function validateImport(CloudwordsDrupalProject $project, CloudwordsLangu
// Register the xliff namespace, required for xpath.
$xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');
- $error_args = array(
+ $error_args = [
'%file' => $imported_file,
'%lang' => $language->getLanguageCode(),
'%name' => $project->getName(),
'%id' => $project->getId(),
- );
+ ];
// Check if our phase information is there.
$phase = $xml->xpath("//xliff:phase[@phase-name='extraction']");
@@ -346,10 +346,10 @@ protected function errorStop($use) {
$type = 'error';
break;
}
- $message = t('%error on line %num. Error code: %code', array(
+ $message = t('%error on line %num. Error code: %code', [
'%error' => trim($error->message),
'%num' => $error->line, '%code' => $error->code,
- ));
+ ]);
drupal_set_message($message, $type, FALSE);
}
libxml_clear_errors();
diff --git a/src/CloudwordsHTMLXLIFFUnitTest.php b/src/CloudwordsHTMLXLIFFUnitTest.php
index 7386cbc..e4adcbf 100644
--- a/src/CloudwordsHTMLXLIFFUnitTest.php
+++ b/src/CloudwordsHTMLXLIFFUnitTest.php
@@ -7,11 +7,11 @@
class CloudwordsHTMLXLIFFUnitTest extends CloudwordsHTMLXLIFFUnitTestBase {
public static function getInfo() {
- return array(
+ return [
'name' => 'HTML to XLIFF',
'description' => 'Unit tests for converting HTML markup to XLIFF markup.',
'group' => 'Cloudwords',
- );
+ ];
}
function setUp() {
diff --git a/src/CloudwordsPreviewScraper.php b/src/CloudwordsPreviewScraper.php
index f2a7d73..4485cc0 100644
--- a/src/CloudwordsPreviewScraper.php
+++ b/src/CloudwordsPreviewScraper.php
@@ -198,7 +198,7 @@ public function generate_static_linked_files($data) {
$matches = array_merge($matches, $image_hrefs);
- $files = array();
+ $files = [];
$matches = array_unique($matches);
libxml_clear_errors();
@@ -213,9 +213,9 @@ public function generate_static_linked_files($data) {
public function list_static_linked_files($data) {
// checking common files.
- $matches = array();
+ $matches = [];
// Match include("/anything").
- $includes = array();
+ $includes = [];
preg_match_all('/include\(["\'][\/\.]([^"\']*)["\']\)/', $data, $includes);
if (isset($includes[1])) {
$matches += $includes[1];
@@ -225,7 +225,7 @@ public function list_static_linked_files($data) {
// - Finds css files for "@import url()".
// - Finds files within css files - url(images/button.png).
// - Excludes data based images.
- $imports = array();
+ $imports = [];
preg_match_all('/url\(\s*[\'"]?(?!(?:data)+:)([^\'")]+)[\'"]?\s*\)/i', $data, $imports);
if (isset($imports[1])) {
$matches = array_merge($matches, $imports[1]);
@@ -241,25 +241,25 @@ public function list_static_linked_files($data) {
// Match href="/{anything}.{ico|css|pdf|doc}(?{anything})" () querystring is
// optional.
// @TODO probably exclude linked files from archive.. in case of docs and things..
- $hrefs = array();
+ $hrefs = [];
preg_match_all('/href="[\/\.]([^"]*\.(ico|css|pdf|doc|js)(\?[^"]*)?)"/i', $data, $hrefs);
if (isset($hrefs[1])) {
$matches = array_merge($matches, $hrefs[1]);
}
// Match href='/{anything}.{ico|css|pdf|doc}(?{anything})' () querystring is
// optional.
- $hrefs = array();
+ $hrefs = [];
preg_match_all("/href=\'[\/\.]([^']*\.(ico|css|pdf|doc|js)(\?[^']*)?)\'/i", $data, $hrefs);
if (isset($hrefs[1])) {
$matches = array_merge($matches, $hrefs[1]);
}
- $files = array();
+ $files = [];
$matches = array_unique($matches);
//remove extensions
- $exclude_extensions = array('html');
+ $exclude_extensions = ['html'];
foreach($matches as $k => $v){
$url = parse_url($v);
$path = pathinfo($url['path']);
diff --git a/src/CloudwordsProject.php b/src/CloudwordsProject.php
index 55dbc3f..fc719b0 100644
--- a/src/CloudwordsProject.php
+++ b/src/CloudwordsProject.php
@@ -241,7 +241,7 @@ protected function transformSourceLanguage($sourceLanguage) {
}
protected function transformTargetLanguages($targetLanguages) {
- $languages = array();
+ $languages = [];
foreach ($targetLanguages as $targetLanguage) {
$languages[] = new CloudwordsLanguage($targetLanguage);
}
diff --git a/src/CloudwordsProjectListBuilder.php b/src/CloudwordsProjectListBuilder.php
index e63f884..ef7f202 100644
--- a/src/CloudwordsProjectListBuilder.php
+++ b/src/CloudwordsProjectListBuilder.php
@@ -32,9 +32,9 @@ public function buildRow(EntityInterface $entity) {
$row['name'] = Link::createFromRoute(
$entity->label(),
new Url(
- 'entity.cloudwords_project.edit_form', array(
+ 'entity.cloudwords_project.edit_form', [
'cloudwords_project' => $entity->id(),
- )
+ ]
)
);
return $row + parent::buildRow($entity);
diff --git a/src/CloudwordsSanitizeControlCharactersUnitTest.php b/src/CloudwordsSanitizeControlCharactersUnitTest.php
index 30b73dd..7462382 100644
--- a/src/CloudwordsSanitizeControlCharactersUnitTest.php
+++ b/src/CloudwordsSanitizeControlCharactersUnitTest.php
@@ -7,11 +7,11 @@
class CloudwordsSanitizeControlCharactersUnitTest extends CloudwordsSanitizeControlCharactersUnitTestBase {
public static function getInfo() {
- return array(
+ return [
'name' => 'Sanitize XML control characters',
'description' => 'Unit tests for sanitizing xml control characters.',
'group' => 'Cloudwords',
- );
+ ];
}
public function test() {
diff --git a/src/CloudwordsSerializerValidateImportUnitTest.php b/src/CloudwordsSerializerValidateImportUnitTest.php
index 4b6ee60..59c79e8 100644
--- a/src/CloudwordsSerializerValidateImportUnitTest.php
+++ b/src/CloudwordsSerializerValidateImportUnitTest.php
@@ -7,11 +7,11 @@
class CloudwordsSerializerValidateImportUnitTest extends CloudwordsSerializerValidateImportUnitTestBase {
public static function getInfo() {
- return array(
+ return [
'name' => 'Serialize - Validate Import',
'description' => 'Unit tests for validating serializer import. Tests html characters are handled properly.',
'group' => 'Cloudwords',
- );
+ ];
}
public function test() {
diff --git a/src/CloudwordsTranslatableListBuilder.php b/src/CloudwordsTranslatableListBuilder.php
index c3b682f..32906e3 100644
--- a/src/CloudwordsTranslatableListBuilder.php
+++ b/src/CloudwordsTranslatableListBuilder.php
@@ -32,9 +32,9 @@ public function buildRow(EntityInterface $entity) {
$row['name'] = Link::createFromRoute(
$entity->label(),
new Url(
- 'entity.cloudwords_translatable.edit_form', array(
+ 'entity.cloudwords_translatable.edit_form', [
'cloudwords_translatable' => $entity->id(),
- )
+ ]
)
);
return $row + parent::buildRow($entity);
diff --git a/src/CloudwordsTranslatableMetadataController.php b/src/CloudwordsTranslatableMetadataController.php
index e85c8b0..75a92fb 100644
--- a/src/CloudwordsTranslatableMetadataController.php
+++ b/src/CloudwordsTranslatableMetadataController.php
@@ -20,7 +20,7 @@ public function entityPropertyInfo() {
$properties['translation_status']['options list'] = 'cloudwords_exists_options_list';
- $properties['user'] = array(
+ $properties['user'] = [
'label' => t("User"),
'type' => 'user',
'description' => t("The owner of the profile."),
@@ -29,7 +29,7 @@ public function entityPropertyInfo() {
// 'setter permission' => 'administer profiles',
// 'required' => TRUE,
'schema field' => 'uid',
- );
+ ];
return $info;
}
diff --git a/src/Controller/CloudwordsController.php b/src/Controller/CloudwordsController.php
index f0c202f..5af8c28 100644
--- a/src/Controller/CloudwordsController.php
+++ b/src/Controller/CloudwordsController.php
@@ -35,17 +35,17 @@ public function overviewPage() {
$view = views_embed_view('cloudwords_translatable', 'default');
return [
'#markup' => $this->renderer->render($view),
- '#attached' => array(
- 'library' => array(
+ '#attached' => [
+ 'library' => [
'cloudwords/cloudwords.create_project',
- ),
- 'drupalSettings' => array(
- 'cloudwords' => array(
+ ],
+ 'drupalSettings' => [
+ 'cloudwords' => [
'token' => \Drupal::csrfToken()->get('cloudwords'),
'ajaxUrl' => 'admin/cloudwords/ajax'
- )
- ),
- ),
+ ]
+ ],
+ ],
];
}
@@ -60,17 +60,17 @@ public function projectsActivePage() {
$view = views_embed_view('cloudwords_projects', 'block_1');
return [
'#markup' => $this->renderer->render($view),
- '#attached' => array(
- 'library' => array(
+ '#attached' => [
+ 'library' => [
'cloudwords/cloudwords.create_project',
- ),
- 'drupalSettings' => array(
- 'cloudwords' => array(
+ ],
+ 'drupalSettings' => [
+ 'cloudwords' => [
'token' => \Drupal::csrfToken()->get('cloudwords'),
'ajaxUrl' => 'admin/cloudwords/ajax'
- )
- ),
- ),
+ ]
+ ],
+ ],
];
//return $form;
@@ -86,17 +86,17 @@ public function projectsClosedPage() {
$view = views_embed_view('cloudwords_projects', 'block_2');
return [
'#markup' => $this->renderer->render($view),
- '#attached' => array(
- 'library' => array(
+ '#attached' => [
+ 'library' => [
'cloudwords/cloudwords.create_project',
- ),
- 'drupalSettings' => array(
- 'cloudwords' => array(
+ ],
+ 'drupalSettings' => [
+ 'cloudwords' => [
'token' => \Drupal::csrfToken()->get('cloudwords'),
'ajaxUrl' => 'admin/cloudwords/ajax'
- )
- ),
- ),
+ ]
+ ],
+ ],
];
}
/**
@@ -109,16 +109,16 @@ public function ajax() {
$action = \Drupal::request()->request->get('action');
$uid = \Drupal::currentUser()->id();
if ($action == 'remove') {
- cloudwords_project_user_remove($uid, array($id));
+ cloudwords_project_user_remove($uid, [$id]);
} else {
- cloudwords_project_user_add($uid, array($id));
+ cloudwords_project_user_add($uid, [$id]);
}
$count = cloudwords_project_user_count($uid);
- $text = \Drupal::translation()->formatPlural($count, '1 asset in project', '@count assets in project.', array('@count' => $count));
+ $text = \Drupal::translation()->formatPlural($count, '1 asset in project', '@count assets in project.', ['@count' => $count]);
$response = new Response();
- $response->setContent(json_encode(array('id' => $id, 'text'=>$text)));
+ $response->setContent(json_encode(['id' => $id, 'text'=>$text]));
$response->headers->set('Content-Type', 'application/json');
return $response;
}
diff --git a/src/Entity/CloudwordsProject.php b/src/Entity/CloudwordsProject.php
index 75b3a36..ffcd492 100644
--- a/src/Entity/CloudwordsProject.php
+++ b/src/Entity/CloudwordsProject.php
@@ -40,9 +40,9 @@ class CloudwordsProject extends ContentEntityBase implements CloudwordsProjectIn
*/
public static function preCreate(EntityStorageInterface $storage_controller, array &$values) {
parent::preCreate($storage_controller, $values);
- $values += array(
+ $values += [
'user_id' => \Drupal::currentUser()->id(),
- );
+ ];
}
/**
@@ -146,41 +146,41 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
->setSetting('target_type', 'user')
->setSetting('handler', 'default')
->setTranslatable(TRUE)
- ->setDisplayOptions('view', array(
+ ->setDisplayOptions('view', [
'label' => 'hidden',
'type' => 'author',
'weight' => 0,
- ))
- ->setDisplayOptions('form', array(
+ ])
+ ->setDisplayOptions('form', [
'type' => 'entity_reference_autocomplete',
'weight' => 5,
- 'settings' => array(
+ 'settings' => [
'match_operator' => 'CONTAINS',
'size' => '60',
'autocomplete_type' => 'tags',
'placeholder' => '',
- ),
- ))
+ ],
+ ])
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['name'] = BaseFieldDefinition::create('string')
->setLabel(t('Name'))
->setDescription(t('The name of the Cloudwords project.'))
- ->setSettings(array(
+ ->setSettings([
'max_length' => 50,
'text_processing' => 0,
- ))
+ ])
->setDefaultValue('')
- ->setDisplayOptions('view', array(
+ ->setDisplayOptions('view', [
'label' => 'above',
'type' => 'string',
'weight' => -4,
- ))
- ->setDisplayOptions('form', array(
+ ])
+ ->setDisplayOptions('form', [
'type' => 'string_textfield',
'weight' => -4,
- ))
+ ])
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
diff --git a/src/Entity/CloudwordsProjectViewsData.php b/src/Entity/CloudwordsProjectViewsData.php
index cd6c549..009a00b 100644
--- a/src/Entity/CloudwordsProjectViewsData.php
+++ b/src/Entity/CloudwordsProjectViewsData.php
@@ -16,44 +16,44 @@ class CloudwordsProjectViewsData extends EntityViewsData implements EntityViewsD
public function getViewsData() {
$data = parent::getViewsData();
- $data['cloudwords_project']['table']['base'] = array(
+ $data['cloudwords_project']['table']['base'] = [
'field' => 'id',
'title' => $this->t('Cloudwords project'),
'help' => $this->t('The Cloudwords project ID.'),
- );
+ ];
- $data['cloudwords_project']['status'] = array(
+ $data['cloudwords_project']['status'] = [
'title' => 'Status',
'help' => 'Displays the translation status of an item.',
- 'field' => array(
+ 'field' => [
'id' => 'cloudwords_project_status_field',
- ),
- 'filter' => array(
+ ],
+ 'filter' => [
'id' => 'cloudwords_project_translation_status_filter',
- ),
- );
+ ],
+ ];
- $data['cloudwords_project']['source_language'] = array(
+ $data['cloudwords_project']['source_language'] = [
'title' => 'Source language',
'help' => 'The project source language.',
- 'field' => array(
+ 'field' => [
'id' => 'cloudwords_project_source_language_field',
- ),
+ ],
// 'filter' => array(
// 'id' => 'cloudwords_project_source_language_filter',
// ),
- );
+ ];
- $data['cloudwords_project']['target_languages'] = array(
+ $data['cloudwords_project']['target_languages'] = [
'title' => 'Target Languages',
'help' => 'The project target languages.',
- 'field' => array(
+ 'field' => [
'id' => 'cloudwords_project_target_languages_field',
- ),
+ ],
// 'filter' => array(
// 'id' => 'cloudwords_project_target_languages_filter',
// ),
- );
+ ];
return $data;
}
diff --git a/src/Entity/CloudwordsTranslatable.php b/src/Entity/CloudwordsTranslatable.php
index c1d8203..d5927e1 100644
--- a/src/Entity/CloudwordsTranslatable.php
+++ b/src/Entity/CloudwordsTranslatable.php
@@ -48,7 +48,7 @@ class CloudwordsTranslatable extends ContentEntityBase implements CloudwordsTran
/**
* Overrides Entity::__construct().
*/
- public function __construct(array $values, $entity_type, $bundle = FALSE, $translations = array()) {
+ public function __construct(array $values, $entity_type, $bundle = FALSE, $translations = []) {
parent::__construct($values, $entity_type, $bundle, $translations);
$this->translatableInfo = cloudwords_translatable_info($this->getType());
$this->sourceController = cloudwords_get_source_controller($this->getType());
@@ -60,9 +60,9 @@ public function __construct(array $values, $entity_type, $bundle = FALSE, $trans
*/
public static function preCreate(EntityStorageInterface $storage_controller, array &$values) {
parent::preCreate($storage_controller, $values);
- $values += array(
+ $values += [
'user_id' => \Drupal::currentUser()->id(),
- );
+ ];
}
/**
@@ -224,89 +224,89 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
->setSetting('target_type', 'user')
->setSetting('handler', 'default')
->setTranslatable(TRUE)
- ->setDisplayOptions('view', array(
+ ->setDisplayOptions('view', [
'label' => 'hidden',
'type' => 'author',
'weight' => 0,
- ))
- ->setDisplayOptions('form', array(
+ ])
+ ->setDisplayOptions('form', [
'type' => 'entity_reference_autocomplete',
'weight' => 5,
- 'settings' => array(
+ 'settings' => [
'match_operator' => 'CONTAINS',
'size' => '60',
'autocomplete_type' => 'tags',
'placeholder' => '',
- ),
- ))
+ ],
+ ])
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['name'] = BaseFieldDefinition::create('string')
->setLabel(t('Name'))
->setDescription(t('The name of the Cloudwords translatable entity.'))
- ->setSettings(array(
+ ->setSettings([
'max_length' => 50,
'text_processing' => 0,
- ))
+ ])
->setDefaultValue('')
- ->setDisplayOptions('view', array(
+ ->setDisplayOptions('view', [
'label' => 'above',
'type' => 'string',
'weight' => -4,
- ))
- ->setDisplayOptions('form', array(
+ ])
+ ->setDisplayOptions('form', [
'type' => 'string_textfield',
'weight' => -4,
- ))
+ ])
->setDisplayConfigurable('form', TRUE)
->setDisplayConfigurable('view', TRUE);
$fields['textgroup'] = BaseFieldDefinition::create('string')
->setLabel(t('textgroup'))
->setDescription(t(''))
- ->setSettings(array(
+ ->setSettings([
'max_length' => 50,
'text_processing' => 0,
- ));
+ ]);
$fields['objectid'] = BaseFieldDefinition::create('integer')
->setLabel(t('objectid'))
->setDescription(t(''))
- ->setSettings(array(
+ ->setSettings([
'max_length' => 50,
- ));
+ ]);
$fields['type'] = BaseFieldDefinition::create('string')
->setLabel(t('type'))
->setDescription(t('Object type for this string'))
- ->setSettings(array(
+ ->setSettings([
'max_length' => 50,
'text_processing' => 0,
- ));
+ ]);
$fields['bundle'] = BaseFieldDefinition::create('string')
->setLabel(t('Entity bundle'))
->setDescription(t('The Entity bundle'))
- ->setSettings(array(
+ ->setSettings([
'max_length' => 50,
'text_processing' => 0,
- ));
+ ]);
$fields['language'] = BaseFieldDefinition::create('language')
->setLabel(t('language'))
->setDescription(t('The language to translate to'))
- ->setSettings(array(
+ ->setSettings([
'max_length' => 12,
- ));
+ ]);
$fields['status'] = BaseFieldDefinition::create('integer')
->setLabel(t('status'))
->setDescription(t('The status of a queue item'))
->setDefaultValue(0)
- ->setSettings(array(
+ ->setSettings([
'max_length' => 2,
- ));
+ ]);
$fields['translation_status'] = BaseFieldDefinition::create('string')
->setLabel(t('translation_status'))
@@ -316,9 +316,9 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
$fields['translated_document_id'] = BaseFieldDefinition::create('integer')
->setLabel(t('translated_document_id'))
->setDescription(t('Cloudwords translated document id.'))
- ->setSettings(array(
+ ->setSettings([
'max_length' => 50,
- ));
+ ]);
$fields['created'] = BaseFieldDefinition::create('created')
->setLabel(t('Created'))
@@ -343,13 +343,13 @@ public function cloudwordsLanguage() {
public function setProjectTranslationStatus($project, $status) {
\Drupal::database()->merge('cloudwords_content')
- ->key(array(
+ ->key([
'pid' => $project->getId(),
'ctid' => $this->id(),
- ))
- ->fields(array(
+ ])
+ ->fields([
'status' => $status,
- ))
+ ])
->execute();
}
@@ -375,7 +375,7 @@ public function setProjectTranslationStatus($project, $status) {
* @return array
* A structured data array.
*/
- public function getData(array $key = array(), $index = null) {
+ public function getData(array $key = [], $index = null) {
//@todo use construct
$this->translatableInfo = cloudwords_translatable_info($this->getType());
$this->sourceController = cloudwords_get_source_controller($this->getType());
@@ -388,7 +388,7 @@ public function getData(array $key = array(), $index = null) {
return $this->data;
}
if ($index) {
- $key = array_merge($key, array($index));
+ $key = array_merge($key, [$index]);
}
//return drupal_array_get_nested_value($this->data, $key);
return NestedArray::getValue($this->data, $key);
@@ -399,16 +399,16 @@ public function saveData(array $data) {
$this->sourceController->save($this);
}
- protected function addTranslatedDataRecursive($translation, array $key = array()) {
+ protected function addTranslatedDataRecursive($translation, array $key = []) {
if (isset($translation['#text'])) {
- $values = array(
+ $values = [
'#translation' => $translation,
- );
+ ];
$this->updateData($key, $values);
return;
}
foreach (Element::children($translation) as $item) {
- $this->addTranslatedDataRecursive($translation[$item], array_merge($key, array($item)));
+ $this->addTranslatedDataRecursive($translation[$item], array_merge($key, [$item]));
}
}
@@ -424,18 +424,18 @@ protected function addTranslatedDataRecursive($translation, array $key = array()
* @param $values
* Nested array of values to set.
*/
- public function updateData($key, $values = array()) {
+ public function updateData($key, $values = []) {
foreach ($values as $index => $value) {
// In order to preserve existing values, we can not aplly the values array
// at once. We need to apply each containing value on its own.
// If $value is an array we need to advance the hierarchy level.
if (is_array($value)) {
- $this->updateData(array_merge(cloudwords_ensure_keys_array($key), array($index)), $value);
+ $this->updateData(array_merge(cloudwords_ensure_keys_array($key), [$index]), $value);
}
// Apply the value.
else {
//drupal_array_set_nested_value($this->data, array_merge(cloudwords_ensure_keys_array($key), array($index)), $value);
- NestedArray::setValue($this->data, array_merge(cloudwords_ensure_keys_array($key), array($index)), $value);
+ NestedArray::setValue($this->data, array_merge(cloudwords_ensure_keys_array($key), [$index]), $value);
}
}
}
diff --git a/src/Entity/CloudwordsTranslatableViewsData.php b/src/Entity/CloudwordsTranslatableViewsData.php
index 1131787..f8af9d5 100644
--- a/src/Entity/CloudwordsTranslatableViewsData.php
+++ b/src/Entity/CloudwordsTranslatableViewsData.php
@@ -16,64 +16,64 @@ class CloudwordsTranslatableViewsData extends EntityViewsData implements EntityV
public function getViewsData() {
$data = parent::getViewsData();
- $data['cloudwords_translatable']['table']['base'] = array(
+ $data['cloudwords_translatable']['table']['base'] = [
'field' => 'id',
'title' => $this->t('Cloudwords translatable'),
'help' => $this->t('The Cloudwords translatable ID.'),
- );
+ ];
// $data['cloudwords_translatable']['language']['field']['id'] = 'language';
// $data['cloudwords_translatable']['language']['field']['options callback'] = 'cloudwords_textgroup_options_list';
- $data['cloudwords_translatable']['translation_status'] = array(
+ $data['cloudwords_translatable']['translation_status'] = [
'title' => 'Translation Status',
'help' => 'Displays the translation status of an item.',
- 'field' => array(
+ 'field' => [
'id' => 'cloudwords_translatable_translation_status_field',
- ),
- 'filter' => array(
+ ],
+ 'filter' => [
'id' => 'cloudwords_translatable_translation_status_filter',
- ),
- );
+ ],
+ ];
- $data['cloudwords_translatable']['status'] = array(
+ $data['cloudwords_translatable']['status'] = [
'title' => 'Queue Status',
'help' => 'Displays the queue status of of a translatable.',
- 'filter' => array(
+ 'filter' => [
'id' => 'cloudwords_translatable_status_filter',
- ),
- );
+ ],
+ ];
- $data['cloudwords_translatable']['language'] = array(
+ $data['cloudwords_translatable']['language'] = [
'title' => 'Target Language',
- 'field' => array(
+ 'field' => [
'id' => 'cloudwords_translatable_target_language_field',
- ),
- 'filter' => array(
+ ],
+ 'filter' => [
'id' => 'cloudwords_translatable_target_language_filter',
- ),
- );
+ ],
+ ];
- $data['cloudwords_translatable']['added_to_project'] = array(
+ $data['cloudwords_translatable']['added_to_project'] = [
'title' => 'Added to Project',
'help' => 'Field to show whether or not an asset has been added to the current project.',
- 'field' => array(
+ 'field' => [
'id' => 'cloudwords_translatable_added_to_project_field',
- ),
- 'filter' => array(
+ ],
+ 'filter' => [
'id' => 'cloudwords_translatable_added_to_project_filter',
- ),
- );
+ ],
+ ];
- $data['cloudwords_translatable']['bundle'] = array(
+ $data['cloudwords_translatable']['bundle'] = [
'title' => 'Entity Bundle',
'help' => 'Field to show entity bundle.',
- 'field' => array(
+ 'field' => [
'id' => 'cloudwords_translatable_bundle_field',
- ),
- 'filter' => array(
+ ],
+ 'filter' => [
'id' => 'cloudwords_translatable_bundle_filter',
- ),
- );
+ ],
+ ];
$data['cloudwords_translatable']['textgroup']['filter']['id'] = 'cloudwords_translatable_textgroup_filter';
diff --git a/src/Form/CloudwordsFileReplaceForm.php b/src/Form/CloudwordsFileReplaceForm.php
index f73a464..db35ceb 100644
--- a/src/Form/CloudwordsFileReplaceForm.php
+++ b/src/Form/CloudwordsFileReplaceForm.php
@@ -24,21 +24,21 @@ public function getFormId() {
}
public function buildForm(array $form, \Drupal\Core\Form\FormStateInterface $form_state, \Drupal\cloudwords\CloudwordsDrupalProject $cloudwords_project = NULL, \Drupal\cloudwords\CloudwordsFile $cloudwords_file = NULL) {
- $form['#title'] = $this->t("Replace %file ", array('%file' => $cloudwords_file->getFilename()));
+ $form['#title'] = $this->t("Replace %file ", ['%file' => $cloudwords_file->getFilename()]);
$form_state->set(['cloudwords_project'], $cloudwords_project);
$form_state->set(['cloudwords_file'], $cloudwords_file);
if($cloudwords_project->getStatus()->getCode() == 'project_closed'){
- $form['project_closed_markup'] = array(
+ $form['project_closed_markup'] = [
'#markup' => $this->t('Project is closed. Materials cannot be replaced. '),
'#weight' => '1000',
- );
+ ];
- $form['cancel'] = array(
+ $form['cancel'] = [
'#markup' => Link::fromTextAndUrl($this->t('Click here to go back to project'), Url::fromUri('internal:/admin/cloudwords/projects/' . $cloudwords_project->getId()))->toString(),
'#weight' => '1000',
- );
+ ];
return $form;
}
@@ -57,10 +57,10 @@ public function buildForm(array $form, \Drupal\Core\Form\FormStateInterface $for
'#value' => $this->t('Upload'),
];
- $form['actions']['cancel'] = array(
+ $form['actions']['cancel'] = [
'#markup' => Link::fromTextAndUrl($this->t('Cancel'), Url::fromUri('internal:/admin/cloudwords/projects/' . $cloudwords_project->getId()))->toString(),
'#weight' => '1000',
- );
+ ];
return $form;
diff --git a/src/Form/CloudwordsFormAlter.php b/src/Form/CloudwordsFormAlter.php
index 95bf44a..1dee952 100644
--- a/src/Form/CloudwordsFormAlter.php
+++ b/src/Form/CloudwordsFormAlter.php
@@ -16,7 +16,7 @@ class CloudwordsFormAlter {
public function ajaxSelectCallback(array &$form, \Drupal\Core\Form\FormStateInterface $form_state) {
$ajax_response = new AjaxResponse();
- $ajax_response->addCommand(new InvokeCommand('#edit-user-name--description', 'css', array('color', 'red')));
+ $ajax_response->addCommand(new InvokeCommand('#edit-user-name--description', 'css', ['color', 'red']));
// Return the AjaxResponse Object.
return $ajax_response;
diff --git a/src/Form/CloudwordsProjectCancelForm.php b/src/Form/CloudwordsProjectCancelForm.php
index 385137c..b55f0d4 100644
--- a/src/Form/CloudwordsProjectCancelForm.php
+++ b/src/Form/CloudwordsProjectCancelForm.php
@@ -40,7 +40,7 @@ public function getFormId() {
* {@inheritdoc}
*/
public function getQuestion() {
- return $this->t('Are you sure you want to cancel %project?', array('%project' => $this->project_name));
+ return $this->t('Are you sure you want to cancel %project?', ['%project' => $this->project_name]);
}
/**
diff --git a/src/Form/CloudwordsProjectCreateForm.php b/src/Form/CloudwordsProjectCreateForm.php
index 9668266..3afd1a3 100644
--- a/src/Form/CloudwordsProjectCreateForm.php
+++ b/src/Form/CloudwordsProjectCreateForm.php
@@ -38,10 +38,10 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$private_files = PrivateStream::basePath();
if (!$client->getAuthToken()) {
- drupal_set_message($this->t('Cloudwords Authorization Token must be set in the Cloudwords module settings here.', array('@url' => \Drupal\Core\Url::fromRoute('cloudwords.settings_form')->toString())), 'error');
+ drupal_set_message($this->t('Cloudwords Authorization Token must be set in the Cloudwords module settings here.', ['@url' => \Drupal\Core\Url::fromRoute('cloudwords.settings_form')->toString()]), 'error');
}
if (!$private_files) {
- drupal_set_message($this->t('The private file system path must be configured before you can create a project.', array('@url' => \Drupal\Core\Url::fromRoute('system.file_system_settings')->toString())), 'error');
+ drupal_set_message($this->t('The private file system path must be configured before you can create a project.', ['@url' => \Drupal\Core\Url::fromRoute('system.file_system_settings')->toString()]), 'error');
}
unset($_SESSION['cloudwords_project']);
$default_value = '';
@@ -53,7 +53,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
// $form_state['project'] = $_SESSION['cloudwords_project'];
// }
//
- $form['project_name'] = array(
+ $form['project_name'] = [
'#type' => 'textfield',
'#title' => $this->t('Name'),
'#size' => 50,
@@ -62,36 +62,36 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#description' => $this->t('What do you want to call this project?'),
'#default_value' => $default_value,
'#disabled' => !$private_files,
- );
+ ];
if($departments){
- $options = array();
+ $options = [];
foreach($departments as $department){
$options[$department['id']] = $department['name'];
}
- $form['department'] = array(
+ $form['department'] = [
'#type' => 'select',
'#title' => $this->t('Department'),
'#required' => TRUE,
'#description' => $this->t('Select a department'),
'#options' => $options,
- );
+ ];
}
- $form['reference'] = array(
+ $form['reference'] = [
'#type' => 'file',
'#title' => $this->t('Project reference materials'),
'#description' => $this->t('Upload additional reference materials as a zip file.'),
'#file_info' => NULL,
'#size' => 10,
'#disabled' => !$private_files,
- );
+ ];
$languages = cloudwords_language_list();
// $info = cloudwords_translatable_info();
- $rows = array();
- $map = array();
- $added = array();
+ $rows = [];
+ $map = [];
+ $added = [];
$uid = \Drupal::currentUser()->id();
if ($cache = cloudwords_project_user_get($uid)) {
$translatables = \Drupal::database()->select('cloudwords_translatable', 'ct')
@@ -120,7 +120,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
if (!isset($added[$t_type][$t_objectid])) {
//$type_info = $info[$t_type];
// Gather target languages. Wrap every 4 languages.
- $langs = array();
+ $langs = [];
$key = 0;
foreach ($map[$t_type][$t_objectid] as $delta => $lang) {
if ($delta % 4 === 0) {
@@ -134,13 +134,13 @@ public function buildForm(array $form, FormStateInterface $form_state) {
$targetLanguage = implode('
', $langs);
// Build row.
- $rows[] = array(
+ $rows[] = [
$translatable->getEditLink(),
$targetLanguage,
$translatable->getTextGroupLabel(),
$translatable->getTypeLabel(),
$translatable->getTranslationStatusLabel(),
- );
+ ];
// Mark that we've added this id.
$added[$t_type][$t_objectid] = TRUE;
@@ -148,44 +148,44 @@ public function buildForm(array $form, FormStateInterface $form_state) {
}
}
- $header = array(
+ $header = [
$this->t('Source name'),
$this->t('Language'),
$this->t('Group'),
$this->t('Type'),
$this->t('Translation exists'),
- );
+ ];
if ($rows) {
- $form['submit'] = array(
+ $form['submit'] = [
'#type' => 'submit',
'#value' => $this->t('Submit'),
'#disabled' => !$private_files,
- );
+ ];
}
- $form['table_wrapper'] = array(
+ $form['table_wrapper'] = [
'#type' => 'fieldset',
'#title' => $this->t('Review content'),
- );
+ ];
- $form['table_wrapper']['table'] = array(
+ $form['table_wrapper']['table'] = [
'#theme' => 'table',
'#header' => $header,
'#rows' => $rows,
- '#attributes' => array('id' => 'cloudwords-project-table'),
+ '#attributes' => ['id' => 'cloudwords-project-table'],
'#empty' => $this->t('Nothing added to project.'),
- );
+ ];
// $form['pager'] = array(
// '#theme' => 'pager',
// );
if ($rows) {
- $form['actions'] = array('#type' => 'actions');
- $form['actions']['submit'] = array(
+ $form['actions'] = ['#type' => 'actions'];
+ $form['actions']['submit'] = [
'#type' => 'submit',
'#value' => $this->t('Submit'),
'#disabled' => !$private_files,
- );
+ ];
}
$form['submit'] = [
@@ -226,7 +226,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
// If there is a file uploaded, save it.
if (!empty($_FILES['files']['name']['reference'])) {
- if (!($file = file_save_upload('reference', array('file_validate_extensions' => array('zip')), $upload_dir))) {
+ if (!($file = file_save_upload('reference', ['file_validate_extensions' => ['zip']], $upload_dir))) {
$form_state->setErrorByName('reference', $this->t('Please upload a zip file.'));
}
else {
@@ -250,20 +250,20 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
try {
if ($form_state->get('project') == null) {
$error_message = 'There was an error creating the project. Please check that your settings are correct.';
- $params = array(
+ $params = [
'name' => $form_state->getValue('project_name'),
'notes' => 'The content for this project has been generated by the Cloudwords for Drupal integration. Please read the following to understand how to properly translate this content: https://cloudwords.zendesk.com/entries/23056462',
'sourceLanguage' => 'en',
'projectContentType' => 'Drupal',
- 'uiFeatures' => array(
+ 'uiFeatures' => [
'change_source_language' => false,
'change_target_languages' => false,
'change_source_material' => true,
'clone_project' => false,
- ),
- );
+ ],
+ ];
if($form_state->getValue('department') !== null){
- $params['department'] = array('id'=> (int) $form_state->getValue('department'));
+ $params['department'] = ['id'=> (int) $form_state->getValue('department')];
}
$project = $client->create_project($params);
@@ -291,17 +291,17 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
$_SESSION['cloudwords_project'] = $project;
- $project_info = array(
+ $project_info = [
'id' => $project->getId(),
'name' => $project->getName(),
'status' => $project->getStatus()->getCode(),
'user_id' => \Drupal::currentUser()->id(),
'created' => REQUEST_TIME,
'source_language' => $project->getSourceLanguage()->getLanguageCode(),
- );
+ ];
- if (\Drupal::database()->query("SELECT id FROM {cloudwords_project} WHERE id = :id", array(':id' => $project->getId()))->fetchField()) {
- \Drupal::database()->merge('cloudwords_project')->fields($project_info)->key(array('id'))->execute();
+ if (\Drupal::database()->query("SELECT id FROM {cloudwords_project} WHERE id = :id", [':id' => $project->getId()])->fetchField()) {
+ \Drupal::database()->merge('cloudwords_project')->fields($project_info)->key(['id'])->execute();
}
else {
\Drupal::database()->insert('cloudwords_project')->fields($project_info)->execute();
@@ -314,14 +314,14 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
->condition('pid', $project->getId())
->execute();
- $batch = array(
+ $batch = [
'title' => $this->t('Building project ...'),
'operations' => [],
'init_message' => $this->t('Loading items to be processed'),
'progress_message' => $this->t('Saving items as XML.'),
'error_message' => $this->t('An error occurred during processing.'),
'finished' => [$this, 'cloudwords_project_finished'],
- );
+ ];
$uid = \Drupal::currentUser()->id();
if($form_state->get('ctids') !== null){
@@ -398,11 +398,11 @@ public static function cloudwords_project_create_batch_serialize($ctids, \Drupal
$destination = 'private://cloudwords/projects/' . $project->getName();
if (!isset($context['results']['files'])) {
- $context['results']['files'] = array();
+ $context['results']['files'] = [];
}
if (!isset($context['results']['translable_bundles'])) {
- $context['results']['translable_bundles'] = array();
+ $context['results']['translable_bundles'] = [];
}
$file_storage =& $context['results']['files'];
@@ -456,7 +456,7 @@ public static function cloudwords_project_create_batch_serialize($ctids, \Drupal
$translatable->status = CLOUDWORDS_QUEUE_IN_PROJECT;
$translatable->save();
- $context['results']['translable_bundles'][] = array('file_name' => $file, 'translatable' => $translatable);
+ $context['results']['translable_bundles'][] = ['file_name' => $file, 'translatable' => $translatable];
// Count the number processed.
if (empty($context['results']['processed'])) {
@@ -471,7 +471,7 @@ public static function cloudwords_project_create_finilize_files(\Drupal\cloudwor
$serializer = new \Drupal\cloudwords\CloudwordsFileformatXLIFF();
$destination = 'private://cloudwords/projects/' . $project->getName();
// Find our xml files.
- $valid_files = array();
+ $valid_files = [];
if ($items = @scandir($destination)) {
foreach ($items as $item) {
if (is_file("$destination/$item") && strpos($item, '.') !== 0) {
@@ -491,12 +491,12 @@ public static function cloudwords_project_create_finilize_files(\Drupal\cloudwor
public static function cloudwords_project_create_update_target_languages(\Drupal\cloudwords\CloudwordsDrupalProject $project, &$context) {
// Update the target languages.
// @todo handle if the source language is not english
- $params = array(
+ $params = [
'id' => $project->getId(),
'name' => $project->getName(),
'targetLanguages' => array_values($context['results']['target_languages']),
'sourceLanguage' => 'en',
- );
+ ];
try {
$project = cloudwords_get_api_client()->update_project($params);
foreach($project->getTargetLanguages() as $language) {
@@ -520,7 +520,7 @@ public static function cloudwords_project_create_upload_zip(\Drupal\cloudwords\C
}
// Find our xml files.
- $valid_files = array();
+ $valid_files = [];
if ($items = @scandir($destination)) {
foreach ($items as $item) {
if (is_file("$destination/$item") && strpos($item, '.') !== 0) {
@@ -552,7 +552,7 @@ public static function cloudwords_project_create_upload_zip(\Drupal\cloudwords\C
public static function cloudwords_project_create_update_reviewer_instructions(\Drupal\cloudwords\CloudwordsDrupalProject $project, &$context) {
global $base_url;
- $language_list = array();
+ $language_list = [];
foreach(\Drupal::languageManager()->getlanguages() as $k => $v){
$language_list[$k] = $v->getName();
}
@@ -585,11 +585,11 @@ public static function cloudwords_project_create_source_preview_bundle(\Drupal\c
}
if (!isset($context['results']['source_bundle_documents'])) {
- $context['results']['source_bundle_documents'] = array();
+ $context['results']['source_bundle_documents'] = [];
}
if (!isset($context['results']['source_bundle_archives'])) {
- $context['results']['source_bundle_archives'] = array();
+ $context['results']['source_bundle_archives'] = [];
}
// Get source bundles to map
@@ -703,7 +703,7 @@ public static function cloudwords_project_finished($success, $results, $operatio
$message = \Drupal::translation()->formatPlural($results['processed'],
'Uploaded %count item.',
'Uploaded %count items.',
- array('%count' => $results['processed'])
+ ['%count' => $results['processed']]
);
drupal_set_message($message);
diff --git a/src/Form/CloudwordsProjectForm.php b/src/Form/CloudwordsProjectForm.php
index f90f26f..18bc6ed 100644
--- a/src/Form/CloudwordsProjectForm.php
+++ b/src/Form/CloudwordsProjectForm.php
@@ -60,21 +60,21 @@ public function buildForm(array $form, FormStateInterface $form_state, \Drupal\c
'#title' => $this->t('Project Details'),
'#tree' => TRUE,
];
- $form['project_details']['metadata']['source_language'] = array(
+ $form['project_details']['metadata']['source_language'] = [
'#markup' => $this->t('Source language') . ': ' . $cloudwords_project->getSourceLanguage()->getDisplay() . '
',
- );
- $form['project_details']['metadata']['status'] = array(
+ ];
+ $form['project_details']['metadata']['status'] = [
'#markup' => $this->t('Status') . ': ' . $cloudwords_project->getStatus()->getCode() . '
',
- );
- $form['project_details']['metadata']['description'] = array(
+ ];
+ $form['project_details']['metadata']['description'] = [
'#markup' => $this->t('Description') . ': ' . $cloudwords_project->getDescription() . '
',
- );
- $form['project_details']['metadata']['notes'] = array(
+ ];
+ $form['project_details']['metadata']['notes'] = [
'#markup' => $this->t('Notes') . ': ' . $cloudwords_project->getNotes() . '
',
- );
- $form['project_details']['metadata']['delivery_due_date'] = array(
+ ];
+ $form['project_details']['metadata']['delivery_due_date'] = [
'#markup' => $this->t('Delivery due date') . ': ' . \_cloudwords_format_display_date($cloudwords_project->getDeliveryDueDate()) . '
',
- );
+ ];
$options = ['attributes' => ['target' => '_blank']];
@@ -85,11 +85,11 @@ public function buildForm(array $form, FormStateInterface $form_state, \Drupal\c
];
if ($cloudwords_project->isActive()) {
- $form['project_details']['metadata']['cancel'] = array(
+ $form['project_details']['metadata']['cancel'] = [
'#type' => 'submit',
'#value' => $this->t('Cancel'),
'#submit' => array('\Drupal\cloudwords\form\CloudwordsProjectForm::cloudwords_cancel_project_redirect'),
- );
+ ];
}
// Build language table.
@@ -197,7 +197,7 @@ public function buildForm(array $form, FormStateInterface $form_state, \Drupal\c
$references = $client->get_project_references($cloudwords_project->getId());
}
catch (CloudwordsApiException $e) {
- $references = array();
+ $references = [];
}
$reference_rows = [];
diff --git a/src/Form/CloudwordsProjectLanguageImportForm.php b/src/Form/CloudwordsProjectLanguageImportForm.php
index ec59597..24eb045 100644
--- a/src/Form/CloudwordsProjectLanguageImportForm.php
+++ b/src/Form/CloudwordsProjectLanguageImportForm.php
@@ -201,7 +201,7 @@ public static function cloudwords_import_batch($isArchive, $temp_file, $file_nam
$context['results']['temp_file'] = $temp_file;
$context['results']['project'] = $project;
$context['results']['language'] = $language;
- $context['results']['processed_translatables'] = array();
+ $context['results']['processed_translatables'] = [];
$context['results']['successful'] = 0;
$context['results']['failed'] = 0;
$context['results']['in_cron'] = $in_cron;
@@ -224,7 +224,7 @@ public static function cloudwords_import_batch($isArchive, $temp_file, $file_nam
if (!in_array($ctid, $to_be_imported)) {
$context['results']['success'] = FALSE;
$context['results']['failed']++;
- drupal_set_message(t('%file contains an invalid id: %id', array('%file' => $file, '%id' => $ctid)), 'error');
+ drupal_set_message(t('%file contains an invalid id: %id', ['%file' => $file, '%id' => $ctid]), 'error');
}
else {
$translatable = $translatables[$ctid];
@@ -238,7 +238,7 @@ public static function cloudwords_import_batch($isArchive, $temp_file, $file_nam
$translatable->setProjectTranslationStatus($project, CLOUDWORDS_LANGUAGE_IMPORTED);
$context['results']['successful']++;
$context['results']['processed_translatables'][] = $translatable;
- $context['message'] = t('Importing %label (%type).', array('%label' => $translatable->label, '%type' => $translatable->typeLabel()));
+ $context['message'] = t('Importing %label (%type).', ['%label' => $translatable->label, '%type' => $translatable->typeLabel()]);
}
catch (Exception $e) {
drupal_set_message(t($e->getMessage()), 'error');
@@ -250,7 +250,7 @@ public static function cloudwords_import_batch($isArchive, $temp_file, $file_nam
}
}
else {
- drupal_set_message(t('%file failed to validate.', array('%file' => $file)), 'error');
+ drupal_set_message(t('%file failed to validate.', ['%file' => $file]), 'error');
$context['results']['success'] = FALSE;
$project->setLanguageImportStatus($language, CLOUDWORDS_LANGUAGE_FAILED);
}
@@ -262,13 +262,13 @@ public static function cloudwords_import_batch($isArchive, $temp_file, $file_nam
* @todo Cleanup after error.
*/
public static function cloudwords_import_batch_finished($success, $results, $operations, $time) {
- $results += array('success' => TRUE);
+ $results += ['success' => TRUE];
if ($success) {
if ($results['successful']) {
$message = \Drupal::translation()->formatPlural($results['successful'],
'Saved %count item.',
'Saved %count items.',
- array('%count' => $results['successful'])
+ ['%count' => $results['successful']]
);
drupal_set_message($message);
}
@@ -277,7 +277,7 @@ public static function cloudwords_import_batch_finished($success, $results, $ope
$message = \Drupal::translation()->formatPlural($results['failed'],
'Failed saving %count item.',
'Failed saving %count items.',
- array('%count' => $results['failed'])
+ ['%count' => $results['failed']]
);
drupal_set_message($message, 'error');
}
diff --git a/src/Form/CloudwordsTranslatableAddToProjectCheckbox.php b/src/Form/CloudwordsTranslatableAddToProjectCheckbox.php
index e5c1329..73d4a1e 100644
--- a/src/Form/CloudwordsTranslatableAddToProjectCheckbox.php
+++ b/src/Form/CloudwordsTranslatableAddToProjectCheckbox.php
@@ -22,10 +22,10 @@ class CloudwordsTranslatableAddToProjectCheckbox extends FormBase {
*/
public function buildForm(array $form, FormStateInterface $form_state, $entity = null) {
$uid = \Drupal::currentUser()->id();
- $form['cloudwords_translatable_'.$entity->id()] = array(
+ $form['cloudwords_translatable_'.$entity->id()] = [
'#type' => 'checkbox',
'#return_value' => $entity->id(),
- );
+ ];
if ($cache = cloudwords_project_user_get($uid)) {
if(in_array($entity->id(), $cache)){
diff --git a/src/ParamConverter/CloudwordsLanguageParamConverter.php b/src/ParamConverter/CloudwordsLanguageParamConverter.php
index 0503352..69b283a 100644
--- a/src/ParamConverter/CloudwordsLanguageParamConverter.php
+++ b/src/ParamConverter/CloudwordsLanguageParamConverter.php
@@ -12,10 +12,10 @@ public function convert($value, $definition, $name, array $defaults) {
$list = cloudwords_language_list();
if (isset($map[$value])) {
- return new \Drupal\cloudwords\CloudwordsLanguage(array(
+ return new \Drupal\cloudwords\CloudwordsLanguage([
'languageCode' => $value,
'display' => $list[$map[$value]],
- ));
+ ]);
}
return FALSE;
diff --git a/src/ParamConverter/CloudwordsProjectParamConverter.php b/src/ParamConverter/CloudwordsProjectParamConverter.php
index fd9dfbb..efd0879 100644
--- a/src/ParamConverter/CloudwordsProjectParamConverter.php
+++ b/src/ParamConverter/CloudwordsProjectParamConverter.php
@@ -7,7 +7,7 @@
class CloudwordsProjectParamConverter implements ParamConverterInterface {
public function convert($value, $definition, $name, array $defaults) {
- $projects = &drupal_static(__FUNCTION__, array());
+ $projects = &drupal_static(__FUNCTION__, []);
try {
if (!isset($projects[$value])) {
$projects[$value] = cloudwords_get_api_client()->get_project($value);
@@ -16,10 +16,10 @@ public function convert($value, $definition, $name, array $defaults) {
}
catch (CloudwordsApiException $e) {
// Log API error
- Logger('cloudwords')->error($e->getErrorMessage(), array());
+ Logger('cloudwords')->error($e->getErrorMessage(), []);
// Project not found, return empty object
- return new CloudwordsDrupalProject(array());
+ return new CloudwordsDrupalProject([]);
}
}
diff --git a/src/Plugin/views/area/CreateProjectButtonArea.php b/src/Plugin/views/area/CreateProjectButtonArea.php
index 8c63c81..9e30e80 100644
--- a/src/Plugin/views/area/CreateProjectButtonArea.php
+++ b/src/Plugin/views/area/CreateProjectButtonArea.php
@@ -48,7 +48,7 @@ public function render($empty = FALSE) {
'class' => ['cloudwords-button']
],
];
- $text = \Drupal::translation()->formatPlural($count, '1 asset in project', '@count assets in project.', array('@count' => $count));
+ $text = \Drupal::translation()->formatPlural($count, '1 asset in project', '@count assets in project.', ['@count' => $count]);
$output['fieldset']['text'] = [
'#type' => 'markup',
'#markup' => $text,
diff --git a/src/cloudwords_handler_filter_project_user.php b/src/cloudwords_handler_filter_project_user.php
index e6f40b3..df56404 100644
--- a/src/cloudwords_handler_filter_project_user.php
+++ b/src/cloudwords_handler_filter_project_user.php
@@ -14,24 +14,24 @@ class cloudwords_handler_filter_project_user extends views_handler_filter {
* Provide simple equality operator
*/
function operator_options() {
- return array(
+ return [
'=' => t('The current user'),
// '!=' => t('Is not equal to'),
- );
+ ];
}
/**
* Provide a simple textfield for equality
*/
function value_form(&$form, &$form_state) {
- $form['value'] = array(
+ $form['value'] = [
'#type' => 'select',
'#title' => t('Value'),
'#size' => 30,
- '#options' => array('yes' => t('Yes'), 'no' => t('No')),
+ '#options' => ['yes' => t('Yes'), 'no' => t('No')],
'#default_value' => $this->value,
'#multiple' => FALSE,
- );
+ ];
}
function query() {
diff --git a/tests/cloudwords_serializer_validate_import.test b/tests/cloudwords_serializer_validate_import.test
index 740b762..90fd436 100644
--- a/tests/cloudwords_serializer_validate_import.test
+++ b/tests/cloudwords_serializer_validate_import.test
@@ -27,11 +27,11 @@ class CloudwordsSerializerValidateImportUnitTestBase extends DrupalWebTestCase {
class CloudwordsSerializerValidateImportUnitTest extends CloudwordsSerializerValidateImportUnitTestBase {
public static function getInfo() {
- return array(
+ return [
'name' => 'Serialize - Validate Import',
'description' => 'Unit tests for validating serializer import. Tests html characters are handled properly.',
'group' => 'Cloudwords',
- );
+ ];
}
public function test() {
diff --git a/tests/cloudwords_xliff_html_converter.test b/tests/cloudwords_xliff_html_converter.test
index 21a5f14..c4d4fcf 100644
--- a/tests/cloudwords_xliff_html_converter.test
+++ b/tests/cloudwords_xliff_html_converter.test
@@ -27,11 +27,11 @@ class CloudwordsHTMLXLIFFUnitTestBase extends DrupalWebTestCase {
class CloudwordsHTMLXLIFFUnitTest extends CloudwordsHTMLXLIFFUnitTestBase {
public static function getInfo() {
- return array(
+ return [
'name' => 'HTML to XLIFF',
'description' => 'Unit tests for converting HTML markup to XLIFF markup.',
'group' => 'Cloudwords',
- );
+ ];
}
function setUp() {