Wabel / zoho-crm-copy-db

src/ZohoCopyDatabaseCommand.php

Doc Comments -1 removed lines

@@ -45,7 +45,6 @@
     /**
      * @param ZohoDatabaseCopier                $zohoDatabaseCopier
      * @param \Wabel\Zoho\CRM\AbstractZohoDao[] $zohoDaos           The list of Zoho DAOs to copy
-     * @param Lock                              $lock               A lock that can be used to avoid running the same command twice at the same time
      */
     public function __construct(ZohoDatabaseCopier $zohoDatabaseCopier, ZohoDatabaseSyncZoho $zohoDatabaseSync, array $zohoDaos, Lock $lockCopy = null, Lock $lockSync = null)
     {

Spacing +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
         $this
             ->setName('zoho:copy-db')
             ->setDescription('Copies the Zoho database in local DB tables and synchronize Zoho CRM from the Zoho database.')
-            ->addArgument("action",  InputArgument::REQUIRED, "Specify 'copy' or 'sync'")
+            ->addArgument("action", InputArgument::REQUIRED, "Specify 'copy' or 'sync'")
             ->addOption("reset", "r", InputOption::VALUE_NONE, 'Get a fresh copy of Zoho (rather than doing incremental copy)')
             ->addOption("trigger", "t", InputOption::VALUE_NONE, 'Create or update the triggers');
     }
@@ -88,7 +88,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    private function copyDb(InputInterface $input, OutputInterface $output){
+    private function copyDb(InputInterface $input, OutputInterface $output) {
         try {
             if ($this->lockCopy) {
                 $this->lockCopy->acquireLock();
@@ -102,7 +102,7 @@ 
 
             $forceCreateTrigger = false;
 
-            if($input->getOption('trigger')){
+            if ($input->getOption('trigger')) {
                 $forceCreateTrigger = true;
             }
             $twoWaysSync = true;
@@ -127,7 +127,7 @@ 
      * @param InputInterface $input
      * @param OutputInterface $output
      */
-    private function syncDb(InputInterface $input, OutputInterface $output){
+    private function syncDb(InputInterface $input, OutputInterface $output) {
         try {
             if ($this->lockSync) {
                 $this->lockSync->acquireLock();

src/ZohoDatabaseCopier.php

Braces +1 added lines, -2 removed lines

@@ -246,8 +246,7 @@
             foreach ($table->getColumns() as $column) {
                 if (in_array($column->getName(),['id','uid'])) {
                     continue;
-                }
-                else {
+                } else {
                     $field = $fieldsByName[$column->getName()];
                     $getterName = $field['getter'];
                     $data[$column->getName()] = $record->$getterName();

Spacing +6 added lines, -6 removed lines

@@ -89,7 +89,7 @@ 
      */
     private function synchronizeDbModel(AbstractZohoDao $dao, $twoWaysSync, $forceCreateTrigger = false)
     {
-        $tableName = ZohoDatabaseHelper::getTableName($dao,$this->prefix);
+        $tableName = ZohoDatabaseHelper::getTableName($dao, $this->prefix);
         $this->logger->info("Synchronizing DB Model for ".$tableName);
 
         $schema = new Schema();
@@ -205,7 +205,7 @@ 
      */
     private function copyData(AbstractZohoDao $dao, $incrementalSync = true, $twoWaysSync = true)
     {
-        $tableName = ZohoDatabaseHelper::getTableName($dao,$this->prefix);
+        $tableName = ZohoDatabaseHelper::getTableName($dao, $this->prefix);
 
         if ($incrementalSync) {
             $this->logger->info("Copying incremental data for '$tableName'");
@@ -243,7 +243,7 @@ 
             $data = [];
             $types = [];
             foreach ($table->getColumns() as $column) {
-                if (in_array($column->getName(),['id','uid'])) {
+                if (in_array($column->getName(), ['id', 'uid'])) {
                     continue;
                 }
                 else {
@@ -284,12 +284,12 @@ 
         $sqlStatementUid = 'select uid from '.$this->connection->quoteIdentifier($tableName).' where id = :id';
         foreach ($deletedRecordIds as $id) {
             $uid = $this->connection->fetchColumn($sqlStatementUid, ['id' => $id]);
-            $this->connection->delete($tableName, [ 'id' => $id ]);
+            $this->connection->delete($tableName, ['id' => $id]);
             if ($twoWaysSync) {
                 // TODO: we could detect if there are changes to be updated to the server and try to warn with a log message
                 // Also, let's remove the newly created field (because of the trigger) to avoid looping back to Zoho
-                $this->connection->delete('local_delete', [ 'table_name' => $tableName, 'id' => $id ]);
-                $this->connection->delete('local_update', [ 'table_name' => $tableName, 'uid' => $uid ]);
+                $this->connection->delete('local_delete', ['table_name' => $tableName, 'id' => $id]);
+                $this->connection->delete('local_update', ['table_name' => $tableName, 'uid' => $uid]);
             }
         }
 

src/LocalChangesTracker.php

Spacing +2 added lines, -2 removed lines

@@ -50,9 +50,9 @@
         $localDelete = $schema->createTable("local_delete");
         $localDelete->addColumn("table_name", 'string', ['length' => 100]);
         $localDelete->addColumn("uid", 'integer');
-        $localDelete->addColumn("id",  'string', ['length' => 100]);
+        $localDelete->addColumn("id", 'string', ['length' => 100]);
         $localDelete->setPrimaryKey(array("table_name", "uid"));
-        $localDelete->addUniqueIndex(['id','table_name']);
+        $localDelete->addUniqueIndex(['id', 'table_name']);
 
         $dbalTableDiffService = new DbalTableDiffService($this->connection, $this->logger);
         $dbalTableDiffService->createOrUpdateTable($localUpdate);

src/ZohoDatabaseSyncZoho.php

Indentation +3 added lines, -3 removed lines

@@ -106,9 +106,9 @@
                     foreach ($row as $columnName => $columnValue) {
                         if (!in_array($columnName,['id','uid']) || isset($fieldsMatching[$columnName])) {
                             $value = $this->formatValueToBeans($zohoDao->getModule(), $fieldsMatching, $columnName, $columnValue, null, $row['uid']);
-                           if($columnValue){
-                               $zohoBean->{$fieldsMatching[$columnName]['setter']}($value);
-                           }
+                            if($columnValue){
+                                $zohoBean->{$fieldsMatching[$columnName]['setter']}($value);
+                            }
                         }
                     }
                     $zohoBeans[$row['uid']] =  $zohoBean;

Braces +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
                 /* @var $zohoBean ZohoBeanInterface */
                 if(isset($zohoBeans[$row['uid']])){
                     $zohoBean = $zohoBeans[$row['uid']];
-                }else{
+                } else{
                     $zohoBean = new $beanClassName();
                 }
                 if(!$update){

Spacing +23 added lines, -23 removed lines

@@ -54,7 +54,7 @@ 
      * @param AbstractZohoDao $zohoDao
      * @return array
      */
-    private function findMethodValues(AbstractZohoDao $zohoDao){
+    private function findMethodValues(AbstractZohoDao $zohoDao) {
         $fieldsMatching = array();
         foreach ($zohoDao->getFields() as $fieldsDescriptor) {
             foreach (array_values($fieldsDescriptor) as $fieldDescriptor) {
@@ -73,14 +73,14 @@ 
      * @param AbstractZohoDao $zohoDao
      * @param string $localTable
      */
-    public function pushDataToZoho(AbstractZohoDao $zohoDao, $localTable, $update = false){
+    public function pushDataToZoho(AbstractZohoDao $zohoDao, $localTable, $update = false) {
 
             $fieldsMatching = $this->findMethodValues($zohoDao);
-            $tableName = ZohoDatabaseHelper::getTableName($zohoDao,$this->prefix);
+            $tableName = ZohoDatabaseHelper::getTableName($zohoDao, $this->prefix);
             $rowsDeleted = [];
             $statement = $this->connection->createQueryBuilder();
             $statement->select('zcrm.*');
-            if($update){
+            if ($update) {
                 $statement->addSelect('l.field_name as updated_fieldname');
             }
             $statement->from($localTable, 'l')
@@ -95,26 +95,26 @@ 
             while ($row = $results->fetch()) {
                 $beanClassName = $zohoDao->getBeanClassName();
                 /* @var $zohoBean ZohoBeanInterface */
-                if(isset($zohoBeans[$row['uid']])){
+                if (isset($zohoBeans[$row['uid']])) {
                     $zohoBean = $zohoBeans[$row['uid']];
-                }else{
+                } else {
                     $zohoBean = new $beanClassName();
                 }
-                if(!$update){
+                if (!$update) {
                     foreach ($row as $columnName => $columnValue) {
-                        if (!in_array($columnName,['id','uid']) || isset($fieldsMatching[$columnName])) {
+                        if (!in_array($columnName, ['id', 'uid']) || isset($fieldsMatching[$columnName])) {
                             $value = $this->formatValueToBeans($zohoDao->getModule(), $fieldsMatching, $columnName, $columnValue, null, $row['uid']);
-                           if($columnValue){
+                           if ($columnValue) {
                                $zohoBean->{$fieldsMatching[$columnName]['setter']}($value);
                            }
                         }
                     }
-                    $zohoBeans[$row['uid']] =  $zohoBean;
+                    $zohoBeans[$row['uid']] = $zohoBean;
                     $rowsDeleted[] = $row['uid'];
-                } else{
+                } else {
                     $columnName = $row['updated_fieldname'];
                     $zohoBean->setZohoId($row['id']);
-                    if (!in_array($columnName,['id','uid']) || isset($fieldsMatching[$columnName])) {
+                    if (!in_array($columnName, ['id', 'uid']) || isset($fieldsMatching[$columnName])) {
                         $value = $this->formatValueToBeans($zohoDao->getModule(), $fieldsMatching, $columnName, $row[$columnName], $row['id']);
                         $zohoBean->{$fieldsMatching[$columnName]['setter']}($value);
                         $zohoBeans[$row['uid']] = $zohoBean;
@@ -123,9 +123,9 @@ 
                 }
             }
             $zohoDao->save($zohoBeans);
-            if(!$update){
+            if (!$update) {
                 foreach ($zohoBeans as $uid => $zohoBean) {
-                    $this->connection->update($tableName, [ 'id'=>$zohoBean->getZohoId(),'lastActivityTime'=> date("Y-m-d H:i:s") ], ['uid'=>$uid ]);
+                    $this->connection->update($tableName, ['id'=>$zohoBean->getZohoId(), 'lastActivityTime'=> date("Y-m-d H:i:s")], ['uid'=>$uid]);
                 }
             }
             $statementDelete = $this->connection->prepare('delete from '.$localTable.' where uid in ( :rowsDeleted)');
@@ -144,10 +144,10 @@ 
      * @return mixed
      * @throws ZohoCRMException
      */
-    private function formatValueToBeans($moduleName, $fieldsMatching,$columnName,$value,$id=null, $uid = null)
+    private function formatValueToBeans($moduleName, $fieldsMatching, $columnName, $value, $id = null, $uid = null)
     {
-        $idrecord = $id?$id.'[ZOHO]':$uid.'[UID]';
-        if(isset($fieldsMatching[$columnName]) && $value){
+        $idrecord = $id ? $id.'[ZOHO]' : $uid.'[UID]';
+        if (isset($fieldsMatching[$columnName]) && $value) {
             switch ($fieldsMatching[$columnName]['type']) {
                 case 'Date':
                     if ($dateObj = \DateTime::createFromFormat('M/d/Y', $value)) {
@@ -173,8 +173,8 @@ 
      * @param AbstractZohoDao $zohoDao
      * @param string $localTable
      */
-    public function deleteDataToZoho(AbstractZohoDao $zohoDao, $localTable){
-        $tableName = ZohoDatabaseHelper::getTableName($zohoDao,$this->prefix);
+    public function deleteDataToZoho(AbstractZohoDao $zohoDao, $localTable) {
+        $tableName = ZohoDatabaseHelper::getTableName($zohoDao, $this->prefix);
         $statement = $this->connection->createQueryBuilder();
         $statement->select('l.id')
         ->from($localTable, 'l')
@@ -185,7 +185,7 @@ 
         $results = $statement->execute();
         while ($row = $results->fetch()) {
             $zohoDao->delete($row['id']);
-            $this->connection->delete($localTable, ['table_name' => $tableName,'id' => $row['id']]);
+            $this->connection->delete($localTable, ['table_name' => $tableName, 'id' => $row['id']]);
         }
 }
     
@@ -193,7 +193,7 @@ 
      * Run inserted rows to Zoho : local_insert.
      * @param AbstractZohoDao $zohoDao
      */
-    public function pushInsertedRows(AbstractZohoDao $zohoDao){
+    public function pushInsertedRows(AbstractZohoDao $zohoDao) {
         return $this->pushDataToZoho($zohoDao, 'local_insert');
     }
 
@@ -201,7 +201,7 @@ 
      * Run updated rows to Zoho : local_update.
      * @param AbstractZohoDao $zohoDao
      */
-    public function pushUpdatedRows(AbstractZohoDao $zohoDao){
+    public function pushUpdatedRows(AbstractZohoDao $zohoDao) {
         $this->pushDataToZoho($zohoDao, 'local_update', true);
     }
 
@@ -209,7 +209,7 @@ 
      * Run deleted rows to Zoho : local_delete.
      * @param AbstractZohoDao $zohoDao
      */
-    public function pushDeletedRows(AbstractZohoDao $zohoDao){
+    public function pushDeletedRows(AbstractZohoDao $zohoDao) {
         $this->deleteDataToZoho($zohoDao, 'local_delete');
     }
 

src/ZohoDatabaseHelper.php

Doc Comments +1 added lines

@@ -16,6 +16,7 @@
      * Computes the name of the table based on the DAO plural module name.
      *
      * @param AbstractZohoDao $dao
+     * @param string $prefix
      *
      * @return string
      */