Skip to content

Commit

Permalink
refactor: w-vision > instride 🔄
Browse files Browse the repository at this point in the history
  • Loading branch information
aarongerig committed Feb 20, 2024
1 parent 1a9e788 commit 9d9661e
Show file tree
Hide file tree
Showing 396 changed files with 1,696 additions and 1,679 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/behat.yml
@@ -1,9 +1,9 @@
name: Behat
on:
push:
branches: [ '4.0' ]
branches: [ '5.0' ]
pull_request:
branches: [ '4.0' ]
branches: [ '5.0' ]

jobs:
behat:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static.yml
@@ -1,9 +1,9 @@
name: Static Tests (Lint, Stan)
on:
push:
branches: [ '4.0' ]
branches: [ '5.0' ]
pull_request:
branches: [ '4.0' ]
branches: [ '5.0' ]

jobs:
lint:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

- Pimcore 11 compatibility
- w-vision > instride rebranding 🔄

### [4.0.0]

- Pimcore X compatibility
Expand Down
2 changes: 1 addition & 1 deletion ISSUE_TEMPLATE.md
Expand Up @@ -4,4 +4,4 @@
| Feature request? | yes/no
| BC Break report? | yes/no
| RFC? | yes/no
| Branch? | master
| Branch? | 5.0
4 changes: 2 additions & 2 deletions LICENSE.md
@@ -1,5 +1,5 @@
# License
Copyright (C) 2016-2018 w-vision AG
Copyright (C) 2016-2024 instride AG

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -12,4 +12,4 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <http://www.gnu.org/licenses/>.
41 changes: 26 additions & 15 deletions README.md
@@ -1,24 +1,35 @@
![DataDefinitions](docs/images/github_banner.png "Data Definitions")

[![Software License](https://img.shields.io/badge/license-GPLv3-brightgreen.svg?style=flat-square)](LICENSE.md)
[![Latest Stable Version](https://img.shields.io/packagist/v/w-vision/data-definitions.svg?style=flat-square)](https://packagist.org/packages/w-vision/data-definitions)
[![Latest Stable Version](https://img.shields.io/packagist/v/instride/data-definitions.svg?style=flat-square)](https://packagist.org/packages/instride/data-definitions)

Data Definitions allows you to define your DataObject Imports and Exports using a nice GUI and re-run the definitions
as often you like. Everything within Data Definitions is extendable.

![Interface](docs/images/mapping.png)

## Requirements
* Pimcore 5.8 or 6.x
* Pimcore X (since Version 4.0)

## Getting started/Installation
* Install via composer
```composer require w-vision/data-definitions```
* Enable via command-line (or inside the pimcore extension manager)
```bin/console pimcore:bundle:enable DataDefinitionsBundle```
* Install via command-line (or inside the pimcore extension manager)
```bin/console pimcore:bundle:install DataDefinitionsBundle```
* Pimcore 11

## Getting started
```bash
# Install via composer
composer require instride/data-definitions
```

```php
// Add to config/bundles.php
return [
// ...
Instride\DataDefinitionsBundle\DataDefinitionsBundle::class => ['all' => true],
];
```

```bash
# Install the bundle via command-line
bin/console pimcore:bundle:install DataDefinitionsBundle
```

* Reload Pimcore
* Open Settings -> Import Definitions or Export Definitions

Expand All @@ -27,8 +38,8 @@ as often you like. Everything within Data Definitions is extendable.
- [Export Definitions](./docs/exports.md)

## License
**w-vision AG**, Sandgruebestrasse 4, 6210 Sursee, Switzerland
[www.w-vision.ch](https://www.w-vision.ch), support@w-vision.ch
Copyright © 2019 w-vision AG. All rights reserved.
**instride AG**, Sandgruebestrasse 4, 6210 Sursee, Switzerland
[instride.ch](https://instride.ch), connect@instride.ch
Copyright © 2024 instride AG. All rights reserved.

For licensing details please visit [LICENSE.md](LICENSE.md)
For licensing details please visit [LICENSE.md](LICENSE.md)
17 changes: 9 additions & 8 deletions bin/console
@@ -1,16 +1,17 @@
#!/usr/bin/env php
<?php

/**
* Pimcore
* Data Definitions.
*
* LICENSE
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Enterprise License (PEL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
* This source file is subject to the GNU General Public License version 3 (GPLv3)
* For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
* files that are distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PEL
* @copyright 2024 instride AG (https://instride.ch)
* @license https://github.com/instride-ch/DataDefinitions/blob/5.0/gpl-3.0.txt GNU General Public License version 3 (GPLv3)
*/

ob_get_clean();
Expand Down
42 changes: 21 additions & 21 deletions composer.json
@@ -1,5 +1,5 @@
{
"name": "w-vision/data-definitions",
"name": "instride/data-definitions",
"type": "pimcore-bundle",
"license": "GPL-3.0-or-later",
"config": {
Expand All @@ -13,29 +13,29 @@
"pimcore-plugin",
"pimcore-bundle"
],
"homepage": "https://github.com/w-vision/DataDefinitions",
"homepage": "https://github.com/instride-ch/DataDefinitions",
"authors": [
{
"name": "w-vision AG",
"email": "support@w-vision.ch",
"homepage": "https://www.w-vision.ch",
"role": "Web Development Agency"
"name": "instride AG",
"email": "connect@instride.ch",
"homepage": "https://instride.ch",
"role": "Digital Agency"
},
{
"name": "Dominik Pfaffenbauer",
"email": "dominik@pfaffenbauer.at",
"homepage": "https://www.pfaffenbauer.at/",
"role": "Developer"
"name": "CORS GmbH",
"email": "office@cors.gmbh",
"homepage": "https://cors.gmbh",
"role": "Digital Agency"
}
],
"require": {
"php": ">=8.0",
"php": ">=8.1",
"ext-json": "*",
"box/spout": "^3.0",
"openspout/openspout": "^3.7",
"coreshop/pimcore-bundle": "^4.0",
"coreshop/resource-bundle": "^4.0",
"coreshop/rule-bundle": "^4.0",
"jms/serializer": "^3.17.1",
"jms/serializer": "^3.17",
"league/csv": "^9.7",
"nyholm/psr7": "^1.5",
"pimcore/admin-ui-classic-bundle": "^1.0",
Expand All @@ -49,10 +49,10 @@
"roave/security-advisories": "dev-latest",
"behat/behat": "^3.8",
"friends-of-behat/symfony-extension": "^2.1",
"phpstan/phpstan": "^1.5.4",
"phpstan/phpstan-doctrine": "^1.3.2",
"phpstan/phpstan-symfony": "^1.1.8",
"phpstan/phpstan-webmozart-assert": "^1.1.2"
"phpstan/phpstan": "^1.5",
"phpstan/phpstan-doctrine": "^1.3",
"phpstan/phpstan-symfony": "^1.1",
"phpstan/phpstan-webmozart-assert": "^1.1"
},
"conflict": {
"guzzlehttp/psr7": "< 2.0"
Expand All @@ -63,12 +63,12 @@
},
"autoload": {
"psr-4": {
"Wvision\\Bundle\\DataDefinitionsBundle\\": "src/DataDefinitionsBundle"
"Instride\\Bundle\\DataDefinitionsBundle\\": "src/DataDefinitionsBundle"
}
},
"autoload-dev": {
"psr-4": {
"Wvision\\Bundle\\DataDefinitionsBundle\\Behat\\": "tests/DataDefinitionsBundle/Behat",
"Instride\\Bundle\\DataDefinitionsBundle\\Behat\\": "tests/DataDefinitionsBundle/Behat",
"Pimcore\\Model\\DataObject\\": [
"var/classes/DataObject",
"var/tmp/behat/var/classes/DataObject"
Expand All @@ -81,11 +81,11 @@
"extra": {
"pimcore": {
"bundles": [
"Wvision\\Bundle\\DataDefinitionsBundle\\DataDefinitionsBundle"
"Instride\\Bundle\\DataDefinitionsBundle\\DataDefinitionsBundle"
]
},
"branch-alias": {
"dev-master": "4.0-dev"
"dev-5.0": "5.0-dev"
}
},
"minimum-stability": "dev",
Expand Down
2 changes: 1 addition & 1 deletion config/services_test.yaml
@@ -1,5 +1,5 @@
services:
data_definitions.behat.filter.simple:
class: Wvision\Bundle\DataDefinitionsBundle\Behat\Service\Filter\SimpleFilter
class: Instride\Bundle\DataDefinitionsBundle\Behat\Service\Filter\SimpleFilter
tags:
- { name: data_definitions.filter, type: simple }
2 changes: 1 addition & 1 deletion docs/export/fetcher.md
@@ -1,7 +1,7 @@
## Fetcher
A fetcher finds Pimcore Objects and returns it. Per Default, Data Definitions only comes with one Fetcher: ObjectsFetcher, which returns all Objects of a Type.

To create your own Loader you need to implement ```Wvision\Bundle\DataDefinitionsBundle\Fetcher\FetcherInterface``` and add a new service
To create your own Loader you need to implement ```Instride\Bundle\DataDefinitionsBundle\Fetcher\FetcherInterface``` and add a new service

```yml
acme_bundle.data_definitions.my_fetcher:
Expand Down
2 changes: 1 addition & 1 deletion docs/export/getter.md
Expand Up @@ -3,7 +3,7 @@ A Getter gets the data to the data object

You can also implement your own Getters.

Todo that, you need to implement the interface ```Wvision\Bundle\DataDefinitionsBundle\Getter\GetterInterface``` and create a service
Todo that, you need to implement the interface ```Instride\Bundle\DataDefinitionsBundle\Getter\GetterInterface``` and create a service

```yml
acme_bundle.data_definitions.my_getter:
Expand Down
2 changes: 1 addition & 1 deletion docs/export/provider.md
Expand Up @@ -5,7 +5,7 @@ Currently, these Export Provider Types are supported:
- JSON
- XML

To create a custom provider, you need to implement ```Wvision\Bundle\DataDefinitionsBundle\Provider\ExportProviderInterface``` namespace and add a new service:
To create a custom provider, you need to implement ```Instride\Bundle\DataDefinitionsBundle\Provider\ExportProviderInterface``` namespace and add a new service:

```yml
acme_bundle.data_definitions.provider.my_provider:
Expand Down
2 changes: 1 addition & 1 deletion docs/import/cleaner.md
Expand Up @@ -6,7 +6,7 @@ A cleaner takes care about the clean-up process. It basically deletes or unpubli
- Reference Cleaner: Deletes only when no references exists, otherwise the object will be unpublished
- None: does basically nothing

To create your own cleaner you need to implement ```Wvision\Bundle\DataDefinitionsBundle\Cleaner\CleanerInterface``` and add a new service
To create your own cleaner you need to implement ```Instride\Bundle\DataDefinitionsBundle\Cleaner\CleanerInterface``` and add a new service

```yml
acme_bundle.data_definitions.my_cleaner:
Expand Down
2 changes: 1 addition & 1 deletion docs/import/filter.md
@@ -1,7 +1,7 @@
## Filter
A Filter, as the name says, filters your data on runtime. Your method gets called on every "row" and you get to decide if you want to import it, or not.

To implement a new filter, you need to implement the interface ```Wvision\Bundle\DataDefinitionsBundle\Filter\FilterInterface``` and add a new service
To implement a new filter, you need to implement the interface ```Instride\Bundle\DataDefinitionsBundle\Filter\FilterInterface``` and add a new service

```yml
acme_bundle.data_definitions.my_filter:
Expand Down
2 changes: 1 addition & 1 deletion docs/import/loader.md
@@ -1,7 +1,7 @@
## Loader
A loader finds a Pimcore Object (or not) and returns it. Per Default, Data Definitions only comes with one Loader: PrimaryKey, which finds your DataObject based on un-interpreted Data based on what you select in the configuration.

To create your own Loader you need to implement ```Wvision\Bundle\DataDefinitionsBundle\Loader\LoaderInterface``` and add a new service
To create your own Loader you need to implement ```Instride\Bundle\DataDefinitionsBundle\Loader\LoaderInterface``` and add a new service

```yml
acme_bundle.data_definitions.my_loader:
Expand Down
4 changes: 2 additions & 2 deletions docs/import/persister.md
Expand Up @@ -3,12 +3,12 @@ A persister takes care about the save process. It basically saves objects. Follo

- `Persister` saves objects

To create your own persister you need to implement `Wvision\Bundle\DataDefinitionsBundle\Persister\PersisterInterface`
To create your own persister you need to implement `Instride\Bundle\DataDefinitionsBundle\Persister\PersisterInterface`
and add a new service:

```yml
acme_bundle.data_definitions.my_persister:
class: AcmeBundle\DataDefinitions\MyPersister
tags:
- { name: data_definitions.persister, type: my-persister }
```
```
2 changes: 1 addition & 1 deletion docs/import/provider.md
Expand Up @@ -9,7 +9,7 @@ Currently, these Import Provider Types are supported:
- Raw (for nested imports)

Because, the data needs to be non-hierarchial, XML and JSON are very limited. You can write your own provider to prepare the data for the plugin. To do that, you simply
need to create a new class and implement ```Wvision\Bundle\DataDefinitionsBundle\Provider\ImportProviderInterface``` namespace and add a new service:
need to create a new class and implement ```Instride\Bundle\DataDefinitionsBundle\Provider\ImportProviderInterface``` namespace and add a new service:

```yml
acme_bundle.data_definitions.provider.my_provider:
Expand Down
4 changes: 2 additions & 2 deletions docs/import/setter.md
Expand Up @@ -10,13 +10,13 @@ A Setter sets the data to the object as it would be needed.

Of course, you can also implement your own Setters. Its basically the same as with Interpreters.

Todo that, you need to implement the interface ```Wvision\Bundle\DataDefinitionsBundle\Setter\SetterInterface``` and create a service
Todo that, you need to implement the interface ```Instride\Bundle\DataDefinitionsBundle\Setter\SetterInterface``` and create a service

```yml
acme_bundle.data_definitions.my_setter:
class: AcmeBundle\DataDefinitions\MySetter
tags:
- { name: data_definitions.setter, type: mysetter, form-type: Wvision\Bundle\DataDefinitionsBundle\Form\Type\NoConfigurationType }
- { name: data_definitions.setter, type: mysetter, form-type: Instride\Bundle\DataDefinitionsBundle\Form\Type\NoConfigurationType }
```

If your Setter does have configuration as well, you need to create a new FormType and add a new Javascript file for the GUI:
Expand Down
4 changes: 2 additions & 2 deletions docs/interpreter.md
Expand Up @@ -123,13 +123,13 @@ Returns input casted to a given type.

Data Definitions provides you with a basic starting set of Interpreters, but you can create custom ones as well.

Todo that, you need to implement the interface ```Wvision\Bundle\DataDefinitionsBundle\Interpreter\InterpreterInterface``` and create a service
Todo that, you need to implement the interface ```Instride\Bundle\DataDefinitionsBundle\Interpreter\InterpreterInterface``` and create a service

```yml
acme_bundle.data_definitions.my_interpreter:
class: AcmeBundle\DataDefinitions\MyInterpreter
tags:
- { name: data_definitions.interpreter, type: myinterpreter, form-type: Wvision\Bundle\DataDefinitionsBundle\Form\Type\NoConfigurationType }
- { name: data_definitions.interpreter, type: myinterpreter, form-type: Instride\Bundle\DataDefinitionsBundle\Form\Type\NoConfigurationType }
```

If your Interpreter does have configuration as well, you need to create a new FormType and add a new Javascript file for the GUI:
Expand Down
2 changes: 1 addition & 1 deletion docs/runner.md
@@ -1,7 +1,7 @@
## Runner
A runner gets called before and after every line is imported from your data-source or exported to your export target. This can help you do clean-up or similar stuff.

To implement a new Runner, you need to implement the interface ```Wvision\Bundle\DataDefinitionsBundle\Runner\RunnerInterface``` and add a new service
To implement a new Runner, you need to implement the interface ```Instride\Bundle\DataDefinitionsBundle\Runner\RunnerInterface``` and add a new service

```yml
acme_bundle.data_definitions.my_runner:
Expand Down
14 changes: 7 additions & 7 deletions phpstan.neon
Expand Up @@ -29,13 +29,13 @@ parameters:
- '/Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::children\(\)/'
- '/Call to an undefined method Pimcore\\Model\\\(.*\)::save\(\)./'
- '/Call to an undefined method Pimcore\\Model\\\(.*\)::delete\(\)./'
- '/Call to an undefined method Wvision\\Bundle\\DataDefinitionsBundle\\Model\\Log\\Listing::load\(\)./'
- '/Call to an undefined method Wvision\\Bundle\\DataDefinitionsBundle\\Model\\Log\\Listing::getTotalCount\(\)./'
- '/Call to an undefined method Wvision\\Bundle\\DataDefinitionsBundle\\Model\\Log::delete\(\)./'
- '/Call to an undefined method Wvision\\Bundle\\DataDefinitionsBundle\\Model\\Log::save\(\)./'
- '/Call to an undefined method Wvision\\Bundle\\DataDefinitionsBundle\\Model\\Log::getById\(\)./'
- '/Call to an undefined method Wvision\\Bundle\\DataDefinitionsBundle\\Model\\ExportDefinition\\Listing::load\(\)./'
- '/Call to an undefined method Wvision\\Bundle\\DataDefinitionsBundle\\Model\\ImportDefinition\\Listing::load\(\)./'
- '/Call to an undefined method Instride\\Bundle\\DataDefinitionsBundle\\Model\\Log\\Listing::load\(\)./'
- '/Call to an undefined method Instride\\Bundle\\DataDefinitionsBundle\\Model\\Log\\Listing::getTotalCount\(\)./'
- '/Call to an undefined method Instride\\Bundle\\DataDefinitionsBundle\\Model\\Log::delete\(\)./'
- '/Call to an undefined method Instride\\Bundle\\DataDefinitionsBundle\\Model\\Log::save\(\)./'
- '/Call to an undefined method Instride\\Bundle\\DataDefinitionsBundle\\Model\\Log::getById\(\)./'
- '/Call to an undefined method Instride\\Bundle\\DataDefinitionsBundle\\Model\\ExportDefinition\\Listing::load\(\)./'
- '/Call to an undefined method Instride\\Bundle\\DataDefinitionsBundle\\Model\\ImportDefinition\\Listing::load\(\)./'

includes:
- vendor/phpstan/phpstan-doctrine/extension.neon
Expand Down

0 comments on commit 9d9661e

Please sign in to comment.