Skip to content

Commit 7079bf9

Browse files
jcheronjcheron
committed
[update] to 2.1.0
1 parent c175cb0 commit 7079bf9

File tree

10 files changed

+48
-45
lines changed

10 files changed

+48
-45
lines changed

‎CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
6-
## [Unreleased]
6+
## [Unrelease]
7+
- Nothing
8+
9+
## [2.1.0] - 2019-04-01
710
### Added
811
- Themes manager with bootstrap, Semantic-ui and foundation
912
- `AssetsManager` for css,js, fonts and images integration
@@ -28,6 +31,10 @@ try{
2831
echo $e->getMessage();
2932
}
3033
```
34+
### Documentation
35+
- Dependency injection updates [di doc](https://micro-framework.readthedocs.io/en/latest/controller/di/index.html#di)
36+
- Themes managment [Assets and themes doc](https://micro-framework.readthedocs.io/en/latest/view/index.html#assets)
37+
3138
## [2.0.11] - 2019-03-14
3239
### Added
3340
- Rest [JsonAPI](https://jsonapi.org/format/) implementation

‎README.md

+4-7
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@
1919
- Web admin interface (UbiquityMyAdmin)
2020
- Scaffolding
2121
- Console Admin interface (Devtools)
22-
23-
## Next release is coming (2.1.0)
24-
- Assets & themes management
25-
- Dependency injection refactoring & optimization
22+
- Assets & themes management (since 2.1.0)
2623

2724
# Installation
2825

@@ -33,7 +30,7 @@ composer global require phpmv/ubiquity-devtools
3330
```
3431
* Create a project:
3532
```bash
36-
Ubiquity new firstProject -a -q=semantic
33+
Ubiquity new firstProject -a
3734
```
3835
* Start the server:
3936
```bash
@@ -127,9 +124,9 @@ The generated route **/devs/** provides an entry point for CRUD operations:
127124
## Admin interface
128125
Like the console, the administration interface makes it possible to act on the main components of the framework.
129126

130-
When creating a project, it can be installed with the **-a** and **-q=semantic** options (for Semantic-UI).
127+
When creating a project, it can be installed with the **-a** option.
131128
```bash
132-
ubiquity new firstProject -a -q=semantic
129+
ubiquity new firstProject -a
133130
```
134131
![Admin interface](https://static.kobject.net/ubiquity/images/admin-interface.png "Admin interface")
135132

‎composer.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
},
2626
"extra" : {
2727
"branch-alias" : {
28-
"dev-master" : "2.0.x-dev",
29-
"themes_module" : "2.1.x-dev"
28+
"dev-master" : "2.2.x-dev"
3029
}
3130
},
3231
"require-dev" : {
33-
"phpmv/ubiquity-devtools": "dev-master",
32+
"phpmv/ubiquity-devtools": "^1.2",
3433
"phpmv/ubiquity-codeception": "^1.0"
3534
}
3635
}

‎docs/createproject.rst

+26-26
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,40 @@ A simple project
1111
1212
Ubiquity new projectName
1313
14-
A project with Semantic-UI integration
14+
A project with UbiquityMyAdmin interface
1515

1616
.. code-block:: bash
1717
18-
Ubiquity new projectName -q=semantic
19-
20-
A project with UbiquityMyAdmin interface and Semantic-UI integration
18+
Ubiquity new projectName -a
19+
20+
A project with bootstrap and semantic-ui themes installed
2121

2222
.. code-block:: bash
2323
24-
Ubiquity new projectName -q=semantic -a
24+
Ubiquity new projectName -themes=bootstrap,semantic
2525
2626
Installer arguments
2727
-------------------
2828

29-
+------------+------------+---------------------------------+-----------+-----------------------+
30-
| short name | name | role | default | Allowed values |
31-
+============+============+=================================+===========+=======================+
32-
| b | dbName | Sets the database name. | | |
33-
+------------+------------+---------------------------------+-----------+-----------------------+
34-
| s | serverName | Defines the db server address. | 127.0.0.1 | |
35-
+------------+------------+---------------------------------+-----------+-----------------------+
36-
| p | port | Defines the db server port. | 3306 | |
37-
+------------+------------+---------------------------------+-----------+-----------------------+
38-
| u | user | Defines the db server user. | root | |
39-
+------------+------------+---------------------------------+-----------+-----------------------+
40-
| w | password | Defines the db server password. | '' | |
41-
+------------+------------+---------------------------------+-----------+-----------------------+
42-
| q | phpmv | Integrates phpMv-UI toolkit. | false | semantic,bootstrap,ui |
43-
+------------+------------+---------------------------------+-----------+-----------------------+
44-
| m | all-models | Creates all models from db. | false | |
45-
+------------+------------+---------------------------------+-----------+-----------------------+
46-
| a | admin | Adds UbiquityMyAdmin interface. | false | |
47-
+------------+------------+---------------------------------+-----------+-----------------------+
29+
+------------+------------+---------------------------------+-----------+-------------------------------+
30+
| short name | name | role | default | Allowed values |
31+
+============+============+=================================+===========+===============================+
32+
| b | dbName | Sets the database name. | | |
33+
+------------+------------+---------------------------------+-----------+-------------------------------+
34+
| s | serverName | Defines the db server address. | 127.0.0.1 | |
35+
+------------+------------+---------------------------------+-----------+-------------------------------+
36+
| p | port | Defines the db server port. | 3306 | |
37+
+------------+------------+---------------------------------+-----------+-------------------------------+
38+
| u | user | Defines the db server user. | root | |
39+
+------------+------------+---------------------------------+-----------+-------------------------------+
40+
| w | password | Defines the db server password. | '' | |
41+
+------------+------------+---------------------------------+-----------+-------------------------------+
42+
| h | themes | Install themes. | | semantic,bootstrap,foundation |
43+
+------------+------------+---------------------------------+-----------+-------------------------------+
44+
| m | all-models | Creates all models from db. | false | |
45+
+------------+------------+---------------------------------+-----------+-------------------------------+
46+
| a | admin | Adds UbiquityMyAdmin interface. | false | |
47+
+------------+------------+---------------------------------+-----------+-------------------------------+
4848

4949
Arguments usage
5050
---------------
@@ -59,11 +59,11 @@ Example of creation of the **blog** project, connected to the **blogDb** databas
5959
6060
long names
6161
^^^^^^^^^^^
62-
Example of creation of the **blog** project, connected to the **bogDb** database, with generation of all models and integration of phpMv-toolkit
62+
Example of creation of the **blog** project, connected to the **bogDb** database, with generation of all models and integration of semantic theme
6363

6464
.. code-block:: bash
6565
66-
Ubiquity new blog --dbName=blogDb --all-models=true --phpmv=semantic
66+
Ubiquity new blog --dbName=blogDb --all-models=true --themes=semantic
6767
6868
Testing
6969
-------

‎docs/install.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ For instance, ``Ubiquity new blog`` would create a directory named **blog** cont
2121

2222
.. code-block:: bash
2323
24-
Ubiquity new blog -q=semantic
24+
Ubiquity new blog
2525
2626
The semantic option adds Semantic-UI for the front end.
2727

‎docs/model/generation/db-console.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The models are generated and operational.
4848

4949
.. code-block:: bash
5050
51-
Ubiquity new quick-start -q=semantic -a -m -b=messagerie
51+
Ubiquity new quick-start -a -m -b=messagerie
5252
5353
Checking
5454
--------

‎docs/model/generation/db-html.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You can now see datas.
5555

5656
.. code-block:: bash
5757
58-
Ubiquity new quick-start -q=semantic -a -m -b=messagerie
58+
Ubiquity new quick-start -a -m -b=messagerie
5959
6060
Navigation between data
6161
-----------------------

‎docs/quickstart/quickstart-html.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ Example :
3434
3535
Project creation
3636
----------------
37-
Create the **quick-start** projet with **UbiquityMyAdmin** interface (the **-a** option) and Semantic-UI integration
37+
Create the **quick-start** projet with **UbiquityMyAdmin** interface (the **-a** option)
3838

3939
.. code-block:: bash
4040
41-
Ubiquity new quick-start -q=semantic -a
41+
Ubiquity new quick-start -a
4242
4343
Directory structure
4444
-------------------

‎docs/quickstart/quickstart.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ Example :
3535
3636
Project creation
3737
----------------
38-
Create the **quick-start** projet with Semantic-UI integration
38+
Create the **quick-start** projet
3939

4040
.. code-block:: bash
4141
42-
Ubiquity new quick-start -q=semantic
42+
Ubiquity new quick-start
4343
4444
Directory structure
4545
-------------------

‎src/tests/files/travis/.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ install:
2626
- travis_retry composer install --no-interaction
2727

2828
- mysql -u root mysql < src/tests/unit/db/messagerie.sql
29-
- (yes | ./vendor/bin/Ubiquity new src -b=messagerie -q=semantic -m -a)
29+
- (yes | ./vendor/bin/Ubiquity new src -b=messagerie -m -a)
3030
- cp -f src/tests/files/composer.json src/composer.json && cp -f src/tests/files/.htrouter.php src/.htrouter.php && cp -f src/tests/files/services.php src/app/config/
3131
- cp -f src/tests/files/travis/acceptance.suite.yml src/tests/ && cp -f src/tests/files/travis/codeception.yml src/
3232
- (cd src/ && composer update)

0 commit comments

Comments
 (0)