AFOUND-789

AFOUND-789.patch

diff --git a/modules/custom/arte_afp/arte_afp.feeds_importer_default.inc b/modules/custom/arte_afp/arte_afp.feeds_importer_default.inc
index 3eceb92..a15c977 100644
--- a/modules/custom/arte_afp/arte_afp.feeds_importer_default.inc
+++ b/modules/custom/arte_afp/arte_afp.feeds_importer_default.inc
@@ -7,7 +7,7 @@
 /**
  * Implements hook_feeds_importer_default().
  */
-function arte_feeds_afp_importer_default() {
+function arte_afp_feeds_importer_default() {
   $export = array();

   $feeds_importer = new stdClass();
diff --git a/modules/custom/arte_afp/arte_afp.info b/modules/custom/arte_afp/arte_afp.info
index 9e3c865..145c6f6 100644
--- a/modules/custom/arte_afp/arte_afp.info
+++ b/modules/custom/arte_afp/arte_afp.info
@@ -15,6 +15,7 @@ dependencies[] = number
 dependencies[] = strongarm
 dependencies[] = taxonomy
 dependencies[] = text
+dependencies[] = scald_feeds
 features[ctools][] = feeds:feeds_importer_default:1
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
diff --git a/modules/custom/arte_afp/modules/arte_feeds_afp/arte_feeds_afp.drush.inc b/modules/custom/arte_afp/modules/arte_feeds_afp/arte_feeds_afp.drush.inc
index 3b156b0..dad61fb 100644
--- a/modules/custom/arte_afp/modules/arte_feeds_afp/arte_feeds_afp.drush.inc
+++ b/modules/custom/arte_afp/modules/arte_feeds_afp/arte_feeds_afp.drush.inc
@@ -113,7 +113,7 @@ function drush_arte_feeds_afp_afp_import() {
   $destination = 'public://feeds';

   // Load the AFP feed node.
-  $nid = db_query("SELECT nid FROM {node} WHERE type = :type LIMIT 1", array(':type' => "feed_afp"))->fetchField();
+  $nid = db_query("SELECT nid FROM {node} WHERE type = :type LIMIT 1", array(':type' => "afp_feed"))->fetchField();
   if ($nid === FALSE) {
     drush_print(dt('The AFP import node was not found. Creating one...'), 'warning');
     $node = _arte_feeds_afp_create_import_node();
diff --git a/modules/custom/arte_afp/modules/arte_feeds_afp/arte_feeds_afp.module b/modules/custom/arte_afp/modules/arte_feeds_afp/arte_feeds_afp.module
index f060cca..2bac272 100644
--- a/modules/custom/arte_afp/modules/arte_feeds_afp/arte_feeds_afp.module
+++ b/modules/custom/arte_afp/modules/arte_feeds_afp/arte_feeds_afp.module
@@ -209,7 +209,7 @@ function arte_feeds_afp_import_test_data() {
   );

   // Get the feed source and clone importer.
-  $default = arte_feeds_afp_importer_default();
+  $default = arte_afp_feeds_importer_default();
   $default = array_shift($default);
   $default->id = 'arte_feeds_afp_testing_importer';
   $default->config['fetcher'] = $fetcher;
diff --git a/modules/custom/arte_afp/modules/arte_feeds_afp/src/Ftp/FtpConnection.php b/modules/custom/arte_afp/modules/arte_feeds_afp/src/Ftp/FtpConnection.php
index 79ff162..0a4f26d 100644
--- a/modules/custom/arte_afp/modules/arte_feeds_afp/src/Ftp/FtpConnection.php
+++ b/modules/custom/arte_afp/modules/arte_feeds_afp/src/Ftp/FtpConnection.php
@@ -174,8 +174,8 @@ class FtpConnection {
    * @return string
    *   Filename of a temporary file, that is a copy of the file from FTP.
    *
-   * @throws \Drupal\afu_afp_feeds\FileException
-   * @throws \Drupal\afu_afp_feeds\Ftp\FtpException
+   * @throws \Drupal\arte_feeds_afp\FileException
+   * @throws \Drupal\arte_feeds_afp\Ftp\FtpException
    */
   function fileDownload($pathOnFtp, $destination) {

diff --git a/modules/custom/arte_afp/modules/arte_feeds_afp/src/Ftp/FtpSettings.php b/modules/custom/arte_afp/modules/arte_feeds_afp/src/Ftp/FtpSettings.php
index bd68094..0486e04 100644
--- a/modules/custom/arte_afp/modules/arte_feeds_afp/src/Ftp/FtpSettings.php
+++ b/modules/custom/arte_afp/modules/arte_feeds_afp/src/Ftp/FtpSettings.php
@@ -28,10 +28,10 @@ class FtpSettings {
   /**
    * Opens a connection to an FTP server.
    *
-   * @return \Drupal\afu_afp_feeds\Ftp\FtpConnection
+   * @return \Drupal\arte_feeds_afp\Ftp\FtpConnection
    *   The FTP connection as defined in $this->config.
    *
-   * @throws \Drupal\afu_afp_feeds\Ftp\FtpException
+   * @throws \Drupal\arte_feeds_afp\Ftp\FtpException
    */
   public function connect() {
     return FtpConnection::open($this->config['server'], $this->config['port'])