Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync Fork #1425

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Open your terminal and run the following commands:
cd /path/to/my-project.test

# tell Composer to load the plugin
composer require craftcms/feed-me
composer require semabit/feed-me

# tell Craft to install the plugin
./craft plugin/install feed-me
Expand Down
14 changes: 5 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "craftcms/feed-me",
"name": "semabit/feed-me",
"description": "Import content from XML, RSS, CSV or JSON feeds into entries, categories, Craft Commerce products, and more.",
"type": "craft-plugin",
"keywords": [
Expand All @@ -11,12 +11,8 @@
"license": "proprietary",
"authors": [
{
"name": "Pixel & Tonic",
"homepage": "https://pixelandtonic.com/"
},
{
"name": "Verbb",
"homepage": "https://verbb.io"
"name": "semabit GmbH",
"homepage": "https://semabit.ch/"
}
],
"support": {
Expand Down Expand Up @@ -45,12 +41,12 @@
},
"autoload": {
"psr-4": {
"craft\\feedme\\": "src/"
"semabit\\feedme\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"craft\\feedme\\tests\\": "tests/"
"semabit\\feedme\\tests\\": "tests/"
}
},
"extra": {
Expand Down
2 changes: 1 addition & 1 deletion docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = {
lang: 'en-US',
themeConfig: {
editLinks: true,
docsRepo: 'craftcms/feed-me',
docsRepo: 'semabit/feed-me',
docsDir: 'docs',
smallerSidebarHeadings: true,
widerSidebar: false,
Expand Down
2 changes: 1 addition & 1 deletion docs/get-started/installation-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ cd /path/to/project
```
2. Then tell Composer to load the plugin:
```
composer require craftcms/feed-me
composer require semabit/feed-me
```
3. In the Control Panel, go to Settings → Plugins and click the “Install” button for Feed Me.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"private": true,
"name": "@craftcms/feed-me",
"name": "@semabit/feed-me",
"main": "webpack.config.js",
"browserslist": [
"extends @craftcms/browserslist-config"
Expand Down
25 changes: 12 additions & 13 deletions src/Plugin.php
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?php

namespace craft\feedme;
namespace semabit\feedme;

use Craft;
use craft\base\Model;
use craft\events\RegisterUrlRulesEvent;
use craft\feedme\base\PluginTrait;
use craft\feedme\models\Settings;
use craft\feedme\services\DataTypes;
use craft\feedme\services\Elements;
use craft\feedme\services\Feeds;
use craft\feedme\services\Fields;
use craft\feedme\services\Logs;
use craft\feedme\services\Process;
use craft\feedme\services\Service;
use craft\feedme\web\twig\Extension;
use craft\feedme\web\twig\variables\FeedMeVariable;
use semabit\feedme\base\PluginTrait;
use semabit\feedme\models\Settings;
use semabit\feedme\services\DataTypes;
use semabit\feedme\services\Elements;
use semabit\feedme\services\Feeds;
use semabit\feedme\services\Fields;
use semabit\feedme\services\Logs;
use semabit\feedme\services\Process;
use semabit\feedme\services\Service;
use semabit\feedme\web\twig\Extension;
use semabit\feedme\web\twig\variables\FeedMeVariable;
use craft\helpers\UrlHelper;
use craft\web\twig\variables\CraftVariable;
use craft\web\UrlManager;
Expand Down Expand Up @@ -61,7 +61,6 @@ public static function config(): array
];
}

public string $minVersionRequired = '4.4.8';
public string $schemaVersion = '5.1.0.0';
public bool $hasCpSettings = true;
public bool $hasCpSection = true;
Expand Down
2 changes: 1 addition & 1 deletion src/base/DataType.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace craft\feedme\base;
namespace semabit\feedme\base;

use Cake\Utility\Hash;
use Craft;
Expand Down
2 changes: 1 addition & 1 deletion src/base/DataTypeInterface.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace craft\feedme\base;
namespace semabit\feedme\base;

use craft\base\ComponentInterface;

Expand Down
12 changes: 6 additions & 6 deletions src/base/Element.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace craft\feedme\base;
namespace semabit\feedme\base;

use ArrayAccess;
use Cake\Utility\Hash;
Expand All @@ -10,11 +10,11 @@
use craft\base\Element as BaseElement;
use craft\base\ElementInterface as CraftElementInterface;
use craft\elements\db\ElementQuery;
use craft\feedme\events\ElementEvent;
use craft\feedme\helpers\BaseHelper;
use craft\feedme\helpers\DataHelper;
use craft\feedme\helpers\DateHelper;
use craft\feedme\models\FeedModel;
use semabit\feedme\events\ElementEvent;
use semabit\feedme\helpers\BaseHelper;
use semabit\feedme\helpers\DataHelper;
use semabit\feedme\helpers\DateHelper;
use semabit\feedme\models\FeedModel;
use craft\helpers\Db;
use craft\helpers\ElementHelper;
use craft\helpers\Json;
Expand Down
2 changes: 1 addition & 1 deletion src/base/ElementInterface.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace craft\feedme\base;
namespace semabit\feedme\base;

use craft\base\ComponentInterface;

Expand Down
6 changes: 3 additions & 3 deletions src/base/Field.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php

namespace craft\feedme\base;
namespace semabit\feedme\base;

use ArrayAccess;
use Cake\Utility\Hash;
use Craft;
use craft\base\Component;
use craft\errors\ElementNotFoundException;
use craft\feedme\helpers\DataHelper;
use craft\feedme\Plugin;
use semabit\feedme\helpers\DataHelper;
use semabit\feedme\Plugin;
use craft\helpers\Json;
use Throwable;
use yii\base\Exception;
Expand Down
2 changes: 1 addition & 1 deletion src/base/FieldInterface.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace craft\feedme\base;
namespace semabit\feedme\base;

use craft\base\ComponentInterface;

Expand Down
18 changes: 9 additions & 9 deletions src/base/PluginTrait.php
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?php

namespace craft\feedme\base;
namespace semabit\feedme\base;

use Craft;
use craft\feedme\Plugin;
use craft\feedme\services\DataTypes;
use craft\feedme\services\Elements;
use craft\feedme\services\Feeds;
use craft\feedme\services\Fields;
use craft\feedme\services\Logs;
use craft\feedme\services\Process;
use craft\feedme\services\Service;
use semabit\feedme\Plugin;
use semabit\feedme\services\DataTypes;
use semabit\feedme\services\Elements;
use semabit\feedme\services\Feeds;
use semabit\feedme\services\Fields;
use semabit\feedme\services\Logs;
use semabit\feedme\services\Process;
use semabit\feedme\services\Service;

trait PluginTrait
{
Expand Down
6 changes: 3 additions & 3 deletions src/console/controllers/FeedsController.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace craft\feedme\console\controllers;
namespace semabit\feedme\console\controllers;

use craft\feedme\Plugin;
use craft\feedme\queue\jobs\FeedImport;
use semabit\feedme\Plugin;
use semabit\feedme\queue\jobs\FeedImport;
use craft\helpers\Console;
use yii\console\Controller;
use yii\console\ExitCode;
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/BaseController.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace craft\feedme\controllers;
namespace semabit\feedme\controllers;

use Craft;
use craft\feedme\Plugin;
use semabit\feedme\Plugin;
use craft\web\Controller;
use yii\db\Exception;
use yii\web\Response;
Expand Down
8 changes: 4 additions & 4 deletions src/controllers/FeedsController.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php

namespace craft\feedme\controllers;
namespace semabit\feedme\controllers;

use Cake\Utility\Hash;
use Craft;
use craft\errors\MissingComponentException;
use craft\feedme\models\FeedModel;
use craft\feedme\Plugin;
use craft\feedme\queue\jobs\FeedImport;
use semabit\feedme\models\FeedModel;
use semabit\feedme\Plugin;
use semabit\feedme\queue\jobs\FeedImport;
use craft\helpers\Json;
use craft\helpers\StringHelper;
use craft\web\Controller;
Expand Down
4 changes: 2 additions & 2 deletions src/controllers/LogsController.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

namespace craft\feedme\controllers;
namespace semabit\feedme\controllers;

use Craft;
use craft\feedme\Plugin;
use semabit\feedme\Plugin;
use craft\web\Controller;
use yii\web\Response;

Expand Down
2 changes: 1 addition & 1 deletion src/datatypes/Atom.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace craft\feedme\datatypes;
namespace semabit\feedme\datatypes;

class Atom extends Xml
{
Expand Down
8 changes: 4 additions & 4 deletions src/datatypes/Csv.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace craft\feedme\datatypes;
namespace semabit\feedme\datatypes;

use Cake\Utility\Hash;
use Craft;
use craft\feedme\base\DataType;
use craft\feedme\base\DataTypeInterface;
use craft\feedme\Plugin;
use semabit\feedme\base\DataType;
use semabit\feedme\base\DataTypeInterface;
use semabit\feedme\Plugin;
use craft\helpers\StringHelper;
use Exception;
use League\Csv\Reader;
Expand Down
8 changes: 4 additions & 4 deletions src/datatypes/GoogleSheet.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace craft\feedme\datatypes;
namespace semabit\feedme\datatypes;

use Cake\Utility\Hash;
use Craft;
use craft\feedme\base\DataType;
use craft\feedme\base\DataTypeInterface;
use craft\feedme\Plugin;
use semabit\feedme\base\DataType;
use semabit\feedme\base\DataTypeInterface;
use semabit\feedme\Plugin;
use craft\helpers\Json;
use craft\helpers\Json as JsonHelper;
use Exception;
Expand Down
8 changes: 4 additions & 4 deletions src/datatypes/Json.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

namespace craft\feedme\datatypes;
namespace semabit\feedme\datatypes;

use Cake\Utility\Hash;
use Craft;
use craft\feedme\base\DataType;
use craft\feedme\base\DataTypeInterface;
use craft\feedme\Plugin;
use semabit\feedme\base\DataType;
use semabit\feedme\base\DataTypeInterface;
use semabit\feedme\Plugin;
use craft\helpers\Json as JsonHelper;
use Seld\JsonLint\JsonParser;
use yii\base\InvalidArgumentException;
Expand Down
4 changes: 2 additions & 2 deletions src/datatypes/MissingDataType.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
* @license https://craftcms.github.io/license/
*/

namespace craft\feedme\datatypes;
namespace semabit\feedme\datatypes;

use craft\base\MissingComponentInterface;
use craft\base\MissingComponentTrait;
use craft\feedme\base\DataType;
use semabit\feedme\base\DataType;

/**
* MissingDataType represents a data type with an invalid class.
Expand Down
2 changes: 1 addition & 1 deletion src/datatypes/Rss.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace craft\feedme\datatypes;
namespace semabit\feedme\datatypes;

class Rss extends Xml
{
Expand Down
8 changes: 4 additions & 4 deletions src/datatypes/Xml.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php

namespace craft\feedme\datatypes;
namespace semabit\feedme\datatypes;

use Cake\Utility\Hash;
use Cake\Utility\Xml as XmlParser;
use Craft;
use craft\feedme\base\DataType;
use craft\feedme\base\DataTypeInterface;
use craft\feedme\Plugin;
use semabit\feedme\base\DataType;
use semabit\feedme\base\DataTypeInterface;
use semabit\feedme\Plugin;
use craft\helpers\Json;
use Exception;

Expand Down
Loading