@@ -12,9 +12,9 @@  | 
                                                    ||
| 12 | 12 | |
| 13 | 13 | use craft\base\Element;  | 
                                                        
| 14 | 14 | use craft\base\ElementInterface;  | 
                                                        
| 15 | +use flipbox\craft\salesforce\Force;  | 
                                                        |
| 15 | 16 | use flipbox\craft\salesforce\events\CreatePayloadFromElementEvent;  | 
                                                        
| 16 | 17 | use flipbox\craft\salesforce\fields\Objects;  | 
                                                        
| 17 | -use flipbox\craft\salesforce\Force;  | 
                                                        |
| 18 | 18 | use yii\base\BaseObject;  | 
                                                        
| 19 | 19 | |
| 20 | 20 | /**  | 
                                                        
@@ -8,12 +8,12 @@  | 
                                                    ||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\craft\salesforce\transformers;  | 
                                                        
| 10 | 10 | |
| 11 | +use Psr\Http\Message\ResponseInterface;  | 
                                                        |
| 11 | 12 | use craft\base\Element;  | 
                                                        
| 12 | 13 | use craft\base\ElementInterface;  | 
                                                        
| 14 | +use flipbox\craft\salesforce\Force;  | 
                                                        |
| 13 | 15 | use flipbox\craft\salesforce\events\PopulateElementFromResponseEvent;  | 
                                                        
| 14 | 16 | use flipbox\craft\salesforce\fields\Objects;  | 
                                                        
| 15 | -use flipbox\craft\salesforce\Force;  | 
                                                        |
| 16 | -use Psr\Http\Message\ResponseInterface;  | 
                                                        |
| 17 | 17 | |
| 18 | 18 | /**  | 
                                                        
| 19 | 19 | * @author Flipbox Factory <[email protected]>  | 
                                                        
@@ -250,6 +250,7 @@ discard block  | 
                                                    ||
| 250 | 250 | /**  | 
                                                        
| 251 | 251 | * @inheritdoc  | 
                                                        
| 252 | 252 | * @throws \Throwable  | 
                                                        
| 253 | + * @param callable $transformer  | 
                                                        |
| 253 | 254 | */  | 
                                                        
| 254 | 255 | public function syncToSalesforce(  | 
                                                        
| 255 | 256 | ElementInterface $element,  | 
                                                        
@@ -299,6 +300,7 @@ discard block  | 
                                                    ||
| 299 | 300 | * @throws \Throwable  | 
                                                        
| 300 | 301 | * @throws \craft\errors\ElementNotFoundException  | 
                                                        
| 301 | 302 | * @throws \yii\base\Exception  | 
                                                        
| 303 | + * @param callable $transformer  | 
                                                        |
| 302 | 304 | */  | 
                                                        
| 303 | 305 | public function syncFromSalesforce(  | 
                                                        
| 304 | 306 | ElementInterface $element,  | 
                                                        
@@ -388,7 +390,7 @@ discard block  | 
                                                    ||
| 388 | 390 | }  | 
                                                        
| 389 | 391 | |
| 390 | 392 | /**  | 
                                                        
| 391 | - * @param ResponseInterface|Element $response  | 
                                                        |
| 393 | + * @param ResponseInterface $response  | 
                                                        |
| 392 | 394 | * @param ElementInterface $element  | 
                                                        
| 393 | 395 | * @param string|null $objectId  | 
                                                        
| 394 | 396 | * @return bool  | 
                                                        
@@ -9,6 +9,9 @@ discard block  | 
                                                    ||
| 9 | 9 | namespace flipbox\craft\salesforce\fields;  | 
                                                        
| 10 | 10 | |
| 11 | 11 | use Craft;  | 
                                                        
| 12 | +use Flipbox\Salesforce\Connections\ConnectionInterface;  | 
                                                        |
| 13 | +use Psr\Http\Message\ResponseInterface;  | 
                                                        |
| 14 | +use Psr\SimpleCache\CacheInterface;  | 
                                                        |
| 12 | 15 | use craft\base\Element;  | 
                                                        
| 13 | 16 | use craft\base\ElementInterface;  | 
                                                        
| 14 | 17 | use craft\helpers\ArrayHelper;  | 
                                                        
@@ -17,18 +20,15 @@ discard block  | 
                                                    ||
| 17 | 20 | use flipbox\craft\ember\helpers\SiteHelper;  | 
                                                        
| 18 | 21 | use flipbox\craft\integration\fields\Integrations;  | 
                                                        
| 19 | 22 | use flipbox\craft\integration\queries\IntegrationAssociationQuery;  | 
                                                        
| 23 | +use flipbox\craft\salesforce\Force;  | 
                                                        |
| 20 | 24 | use flipbox\craft\salesforce\criteria\ObjectCriteria;  | 
                                                        
| 21 | 25 | use flipbox\craft\salesforce\fields\actions\SyncItemFrom;  | 
                                                        
| 22 | 26 | use flipbox\craft\salesforce\fields\actions\SyncItemTo;  | 
                                                        
| 23 | 27 | use flipbox\craft\salesforce\fields\actions\SyncTo;  | 
                                                        
| 24 | -use flipbox\craft\salesforce\Force;  | 
                                                        |
| 25 | 28 | use flipbox\craft\salesforce\helpers\TransformerHelper;  | 
                                                        
| 26 | 29 | use flipbox\craft\salesforce\records\ObjectAssociation;  | 
                                                        
| 27 | 30 | use flipbox\craft\salesforce\transformers\PopulateElementErrorsFromResponse;  | 
                                                        
| 28 | 31 | use flipbox\craft\salesforce\transformers\PopulateElementErrorsFromUpsertResponse;  | 
                                                        
| 29 | -use Flipbox\Salesforce\Connections\ConnectionInterface;  | 
                                                        |
| 30 | -use Psr\Http\Message\ResponseInterface;  | 
                                                        |
| 31 | -use Psr\SimpleCache\CacheInterface;  | 
                                                        |
| 32 | 32 | |
| 33 | 33 | /**  | 
                                                        
| 34 | 34 | * @author Flipbox Factory <[email protected]>  | 
                                                        
@@ -9,8 +9,8 @@  | 
                                                    ||
| 9 | 9 | namespace flipbox\craft\salesforce\cp\controllers\settings\view;  | 
                                                        
| 10 | 10 | |
| 11 | 11 | use craft\helpers\UrlHelper;  | 
                                                        
| 12 | -use flipbox\craft\salesforce\connections\SavableConnectionInterface;  | 
                                                        |
| 13 | 12 | use flipbox\craft\salesforce\Force;  | 
                                                        
| 13 | +use flipbox\craft\salesforce\connections\SavableConnectionInterface;  | 
                                                        |
| 14 | 14 | use flipbox\craft\salesforce\records\Connection;  | 
                                                        
| 15 | 15 | use yii\di\Instance;  | 
                                                        
| 16 | 16 | use yii\web\Response;  | 
                                                        
@@ -8,10 +8,10 @@  | 
                                                    ||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\craft\salesforce\validators;  | 
                                                        
| 10 | 10 | |
| 11 | -use flipbox\craft\salesforce\connections\SavableConnectionInterface;  | 
                                                        |
| 11 | +use Flipbox\Salesforce\Connections\ConnectionInterface;  | 
                                                        |
| 12 | 12 | use flipbox\craft\salesforce\Force;  | 
                                                        
| 13 | +use flipbox\craft\salesforce\connections\SavableConnectionInterface;  | 
                                                        |
| 13 | 14 | use flipbox\craft\salesforce\records\Connection;  | 
                                                        
| 14 | -use Flipbox\Salesforce\Connections\ConnectionInterface;  | 
                                                        |
| 15 | 15 | use yii\base\Model;  | 
                                                        
| 16 | 16 | use yii\validators\Validator;  | 
                                                        
| 17 | 17 | |
@@ -8,9 +8,9 @@  | 
                                                    ||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\craft\salesforce\validators;  | 
                                                        
| 10 | 10 | |
| 11 | +use Flipbox\Salesforce\Query\QueryBuilderInterface;  | 
                                                        |
| 11 | 12 | use flipbox\craft\ember\validators\ModelValidator;  | 
                                                        
| 12 | 13 | use flipbox\craft\salesforce\Force;  | 
                                                        
| 13 | -use Flipbox\Salesforce\Query\QueryBuilderInterface;  | 
                                                        |
| 14 | 14 | |
| 15 | 15 | class QueryBuilderValidator extends ModelValidator  | 
                                                        
| 16 | 16 |  { | 
                                                        
@@ -12,8 +12,8 @@  | 
                                                    ||
| 12 | 12 | use craft\base\ElementInterface;  | 
                                                        
| 13 | 13 | use craft\helpers\StringHelper;  | 
                                                        
| 14 | 14 | use flipbox\craft\hubspot\fields\ObjectsFieldInterface;  | 
                                                        
| 15 | -use flipbox\craft\salesforce\fields\Objects;  | 
                                                        |
| 16 | 15 | use flipbox\craft\salesforce\Force;  | 
                                                        
| 16 | +use flipbox\craft\salesforce\fields\Objects;  | 
                                                        |
| 17 | 17 | use flipbox\craft\salesforce\helpers\TransformerHelper;  | 
                                                        
| 18 | 18 | use flipbox\craft\salesforce\transformers\CreateUpsertPayloadFromElement;  | 
                                                        
| 19 | 19 | use yii\web\HttpException;  | 
                                                        
@@ -9,22 +9,22 @@  | 
                                                    ||
| 9 | 9 | namespace flipbox\craft\salesforce;  | 
                                                        
| 10 | 10 | |
| 11 | 11 | use Craft;  | 
                                                        
| 12 | +use Flipbox\Salesforce\Salesforce;  | 
                                                        |
| 12 | 13 | use craft\base\Plugin;  | 
                                                        
| 13 | 14 | use craft\events\RegisterComponentTypesEvent;  | 
                                                        
| 14 | 15 | use craft\events\RegisterTemplateRootsEvent;  | 
                                                        
| 15 | 16 | use craft\events\RegisterUrlRulesEvent;  | 
                                                        
| 16 | 17 | use craft\services\Dashboard;  | 
                                                        
| 17 | 18 | use craft\services\Fields;  | 
                                                        
| 18 | -use craft\web\twig\variables\CraftVariable;  | 
                                                        |
| 19 | 19 | use craft\web\UrlManager;  | 
                                                        
| 20 | 20 | use craft\web\View;  | 
                                                        
| 21 | +use craft\web\twig\variables\CraftVariable;  | 
                                                        |
| 21 | 22 | use flipbox\craft\ember\helpers\UrlHelper;  | 
                                                        
| 22 | 23 | use flipbox\craft\ember\modules\LoggerTrait;  | 
                                                        
| 23 | 24 | use flipbox\craft\psr3\Logger;  | 
                                                        
| 24 | 25 | use flipbox\craft\salesforce\fields\Objects as ObjectsField;  | 
                                                        
| 25 | 26 | use flipbox\craft\salesforce\models\Settings as SettingsModel;  | 
                                                        
| 26 | 27 | use flipbox\craft\salesforce\web\twig\variables\Force as ForceVariable;  | 
                                                        
| 27 | -use Flipbox\Salesforce\Salesforce;  | 
                                                        |
| 28 | 28 | use yii\base\Event;  | 
                                                        
| 29 | 29 | |
| 30 | 30 | /**  |