Skip to content

Commit

Permalink
Template cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
actions-user committed Nov 15, 2023
1 parent 6700dbf commit 5aa585f
Show file tree
Hide file tree
Showing 21 changed files with 260 additions and 123 deletions.
89 changes: 0 additions & 89 deletions .github/workflows/template-cleanup.yml

This file was deleted.

4 changes: 2 additions & 2 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Copyright (C) 1999-2021 Ibexa AS (formerly eZ Systems AS). All rights reserved.
Copyright (C) 1999-2023 Ibexa AS (formerly eZ Systems AS). All rights reserved.

This source code is available separately under the following licenses:

A - Ibexa Business Use License Agreement (Ibexa BUL),
version 2.4 or later versions (as license terms may be updated from time to time)
version 2.3 or later versions (as license terms may be updated from time to time)
Ibexa BUL is granted by having a valid Ibexa DXP (formerly eZ Platform Enterprise) subscription,
as described at: https://www.ibexa.co/product
For the full Ibexa BUL license text, please see:
Expand Down
51 changes: 22 additions & 29 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
Copyright (C) 1999-2021 Ibexa AS (formerly eZ Systems AS). All rights reserved.
Copyright (C) 1999-2023 Ibexa AS. All rights reserved.
This source code is provided under the license bundled below.

This source code is available separately under the following licenses:

A - Ibexa Business Use License Agreement (Ibexa BUL),
version 2.4 or later versions (as license terms may be updated from time to time)
Ibexa BUL is granted by having a valid Ibexa DXP (formerly eZ Platform Enterprise) subscription,
as described at: https://www.ibexa.co/product
For the full Ibexa BUL license text, please see:
- LICENSE-bul file placed in the root of this source code, or
- https://www.ibexa.co/software-information/licenses-and-agreements (latest version applies)

AND

B - Ibexa Trial and Test License Agreement (Ibexa TTL),
version 2.2 or later versions (as license terms may be updated from time to time)
Full Ibexa TTL license text below, or online on: https://www.ibexa.co/software-information/licenses-and-agreements (latest version applies)
The source code is available separately under the Ibexa BUL 2.3 License,
granted by having a valid Ibexa Digital Experience Platform (DXP) subscription:
- https://www.ibexa.co/products
- https://www.ibexa.co/software-information/licenses-and-agreements/ibexa-business-use-license-agreement-ibexa-bul-version-2.3

To get access to the full source code under TTL license below,
reach out to Ibexa AS for evaluation access:
- https://www.ibexa.co/about-ibexa/contact-us

----------------------------------------------------------

Expand All @@ -25,14 +18,14 @@ Ibexa Trial and Test License Agreement ("Ibexa TTL") Version 2.2
IMPORTANT: Please read the following license agreement carefully.

This license agreement is between Ibexa AS (Norwegian business
registration no. 981 601 564, formerly eZ Systems AS), a Norwegian company
("Licensor" or "Ibexa"), and a test or trial user ("Licensee" or "you").
By installing all or any portion of the software (or authorizing any other
person to do so), you accept the terms and conditions of this license.
If you acquired the software without an opportunity to review this license
and do not accept the license, you must: (a) not use the software and (b)
return or delete the software, with your certification of deletion, within
thirty (30) days of the acquire date.
registration no. 981 601 564), a Norwegian company ("Licensor" or "Ibexa"),
and a test or trial user ("Licensee" or "you"). By installing all or any
portion of the software (or authorizing any other person to do so), you
accept the terms and conditions of this license. If you acquired the
software without an opportunity to review this license and do not accept
the license, you must: (a) not use the software and (b) return or delete
the software, with your certification of deletion, within thirty (30)
days of the acquire date.

This license agreement is entered into in connection with Licensee's
participation in testing a new version of Licensor software and is valid
Expand All @@ -44,9 +37,9 @@ The parties hereby agree to the following software license terms:
1. Definitions

"Licensed Software" means the Ibexa Digital Experience Platform (DXP)
or other Ibexa software product (such as eZ Platform Enterprise Edition,
eZ Publish Platform) downloaded, ordered or otherwise legally acquired
(licensed) by you from Ibexa (or other party authorized by Ibexa).
or other software product (such as Ibexa Commerce) downloaded, ordered or
otherwise legally acquired (licensed) by Licensee from Licensor (or
other party authorized by the Licensor) under these terms.

"Licensed Copy" means one sample of the Licensed Software.

Expand Down Expand Up @@ -285,8 +278,8 @@ Licensee at the address provided to Licensor (or authorized
representative) at the time of order, and to Licensor at

Attn: Software Licensing Dept/CLA,
Ibexa AS,
Solligata 2,
Ibexa AS
Solligata 2
0254 Oslo
Norway

Expand Down
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
Ibexa DXP \<Package name\>
====================
# notifications

This package is part of [Ibexa DXP](https://ibexa.co).

To use this package, [install Ibexa DXP](https://doc.ibexa.co/en/latest/install/).

<!-- This package contains the ... functionality for [Ibexa DXP](ibexa.co). -->

## COPYRIGHT
Copyright (C) 1999-2022 Ibexa AS (formerly eZ Systems AS). All rights reserved.

Copyright (C) 1999-2023 Ibexa AS (formerly eZ Systems AS). All rights reserved.

## LICENSE

This source code is available separately under the following licenses:

A - Ibexa Business Use License Agreement (Ibexa BUL),
Expand Down
63 changes: 63 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"name": "ibexa/notifications",
"license": "proprietary",
"type": "ibexa-bundle",
"keywords": [
"ibexa-dxp"
],
"repositories": [
{ "type": "composer", "url": "https://updates.ibexa.co" }
],
"require": {
"php": "^7.4 || ^8.0",
"ibexa/core": "^4.5.x-dev",
"symfony/config": "^5.4",
"symfony/dependency-injection": "^5.4",
"symfony/event-dispatcher": "^5.4",
"symfony/event-dispatcher-contracts": "^2.2",

This comment has been minimized.

Copy link
@wizhippo

wizhippo Feb 14, 2024

Can we get this bumped to ^3.0?

Why was 2.2 selected?

Other packages like vich upload bundle conflict with such a low version.

"symfony/http-foundation": "^5.4",
"symfony/http-kernel": "^5.4",
"symfony/yaml": "^5.4"
},
"require-dev": {
"phpunit/phpunit": "^9",
"ibexa/code-style": "^1.1",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-phpunit": "^1.3",
"phpstan/phpstan-symfony": "^1.3",
"qossmic/deptrac-shim": "^0.24.0 || ^1.0.2"
},
"autoload": {
"psr-4": {
"Ibexa\\Bundle\\Notifications\\": "src/bundle/",
"Ibexa\\Contracts\\Notifications\\": "src/contracts/",
"Ibexa\\Notifications\\": "src/lib/"
}
},
"autoload-dev": {
"psr-4": {
"Ibexa\\Tests\\Bundle\\Notifications\\": "tests/bundle/",
"Ibexa\\Tests\\Integration\\Notifications\\": "tests/integration/",
"Ibexa\\Tests\\Notifications\\": "tests/lib/"
}
},
"scripts": {
"fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots",
"check-cs": "@fix-cs --dry-run",
"test": "phpunit -c phpunit.xml.dist",
"phpstan": "phpstan analyse -c phpstan.neon",
"deptrac": "php vendor/bin/deptrac analyse"
},
"scripts-descriptions": {
"fix-cs": "Automatically fixes code style in all files",
"check-cs": "Run code style checker for all files",
"test": "Run automatic tests",
"phpstan": "Run static code analysis",
"deptrac": "Run Deptrac architecture testing"
},
"extra": {
"branch-alias": {
"dev-main": "4.5.x-dev"
}
}
}
26 changes: 26 additions & 0 deletions deptrac.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
deptrac:
paths:
- ./src
layers:
- name: Bundle
collectors:
- type: directory
value: bundle/.*
- name: Contracts
collectors:
- type: directory
value: contracts/.*
- name: Library
collectors:
- type: directory
value: lib/.*
ruleset:
Bundle:
- Bundle
- Contracts
- Library
Contracts:
- Contracts
Library:
- Contracts
- Library
16 changes: 16 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "notifications",
"repository": "[email protected]:ibexa/notifications.git",
"private": true,
"prettier": "eslint-config-ibexa/prettier",
"dependencies": {},
"devDependencies": {
"eslint-config-ibexa": "https://github.com/ibexa/eslint-config-ibexa.git#v1.0.0"
},
"scripts": {
"test": "yarn prettier-test && yarn eslint-test",
"fix": "yarn prettier-test --write && yarn eslint-test --fix",
"eslint-test": "eslint \"./src/bundle/Resources/**/*.js\" \"./src/bundle/ui-dev/**/*.js\"",
"prettier-test": "yarn prettier \"./src/bundle/Resources/**/*.{js,scss}\" \"./src/bundle/ui-dev/**/*.js\" --check"
}
}
9 changes: 9 additions & 0 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
includes:
- vendor/phpstan/phpstan-phpunit/extension.neon
- vendor/phpstan/phpstan-symfony/extension.neon

parameters:
level: 8
paths:
- src
- tests
23 changes: 23 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
failOnWarning="true"
colors="true">
<testsuites>
<testsuite name="bundle">
<directory>tests/bundle</directory>
</testsuite>
<testsuite name="integration">
<directory>tests/integration</directory>
</testsuite>
<testsuite name="lib">
<directory>tests/lib</directory>
</testsuite>
</testsuites>
</phpunit>
Loading

0 comments on commit 5aa585f

Please sign in to comment.