Browse Source

Move util/composer.ohar to bin/

tags/2018.05
Hypolite Petovan 2 years ago
parent
commit
3f71cdf8be
8 changed files with 12 additions and 12 deletions
  1. +1
    -1
      INSTALL.txt
  2. +0
    -0
      bin/composer.phar
  3. +6
    -6
      doc/Composer.md
  4. +1
    -1
      doc/Developers-Intro.md
  5. +1
    -1
      doc/Github.md
  6. +1
    -1
      doc/Install.md
  7. +1
    -1
      doc/Update.md
  8. +1
    -1
      doc/de/Install.md

+ 1
- 1
INSTALL.txt View File

@@ -66,7 +66,7 @@ OR

git clone https://github.com/friendica/friendica [web server folder]
cd [web server folder]
php util/composer.phar install
php bin/composer.phar install

3. Create an empty database and note the access details (hostname, username,
password, database name).


util/composer.phar → bin/composer.phar View File


+ 6
- 6
doc/Composer.md View File

@@ -12,7 +12,7 @@ It's a command-line tool that downloads required libraries into the `vendor` fol

## How to use Composer

If you don't have Composer installed on your system, Friendica ships with a copy of it at `util/composer.phar`.
If you don't have Composer installed on your system, Friendica ships with a copy of it at `bin/composer.phar`.
For the purpose of this help, all examples will use this path to run Composer commands, however feel free to replace them with your own way of calling Composer.
Composer requires PHP CLI and the following examples assume it's available system-wide.

@@ -30,7 +30,7 @@ Here are the typical commands you will have to run to do so:
````
~> git clone https://github.com/friendica/friendica.git friendica
~/friendica> cd friendica
~/friendica> util/composer.phar install
~/friendica> bin/composer.phar install
````

That's it! Composer will take care of fetching all the required libraries in the `vendor` folder and build the autoloader to make those libraries available to Friendica.
@@ -42,7 +42,7 @@ Updating Friendica to the current stable or the latest develop version is easy w
````
~> cd friendica
~/friendica> git pull
~/friendica> util/composer.phar install
~/friendica> bin/composer.phar install
````

And that's it. If any library used by Friendica has been upgraded, Composer will fetch the version currently used by Friendica and refresh the autoloader to ensure the best performances.
@@ -87,13 +87,13 @@ Or you can specify the exact version of the library if you code requires it, and

To add a library, just add its Packagist identifier to the `require` list and set a target version string.

Then you should run `util/composer.phar update` to add it to your local `vendor` folder and update the `composer.lock` file that specifies the current versions of the dependencies.
Then you should run `bin/composer.phar update` to add it to your local `vendor` folder and update the `composer.lock` file that specifies the current versions of the dependencies.

#### Updating an existing dependency

If a package needs to be updated, whether to the next minor version or to the next major version provided you changed the adequate code in Friendica, simply edit `composer.json` to update the target version string of the relevant library.

Then you should run `util/composer.phar update` to update it in your local `vendor` folder and update the `composer.lock` file that specifies the current versions of the dependencies.
Then you should run `bin/composer.phar update` to update it in your local `vendor` folder and update the `composer.lock` file that specifies the current versions of the dependencies.

Please note that you should commit both `composer.json` and `composer.lock` with your work every time you make a change to the former.

@@ -111,7 +111,7 @@ This is because `sudo` doesn't always change the `HOME` environment variable, wh
However, you can temporarily change environment variable for the execution of a single command.
For Composer, this would be:
````
$> COMPOSER_HOME=/var/tmp/composer sudo -u [web user] util/composer.phar [mode]
$> COMPOSER_HOME=/var/tmp/composer sudo -u [web user] bin/composer.phar [mode]
````

## Related


+ 1
- 1
doc/Developers-Intro.md View File

@@ -61,7 +61,7 @@ If you want to have git automatically update the dependencies with composer, you
}
# `composer install` if the `composer.lock` file gets changed
# to update all the php dependencies
check_run composer.lock "util/composer.phar install --no-dev"
check_run composer.lock "bin/composer.phar install --no-dev"

just place it into `.git/hooks/post-merge` and make it executable.



+ 1
- 1
doc/Github.md View File

@@ -13,7 +13,7 @@ Introduction to the workflow with our GitHub repository
3. Fork the Friendica repository from [https://github.com/friendica/friendica.git](https://github.com/friendica/friendica.git).
4. Clone your fork from your GitHub account to your machine.
Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on GitHub
5. Run `util/composer.phar install` in Friendica's folder.
5. Run `bin/composer.phar install` in Friendica's folder.
6. Commit your changes to your fork.
Then go to your GitHub page and create a "Pull request" to notify us to merge your work.



+ 1
- 1
doc/Install.md View File

@@ -47,7 +47,7 @@ The Linux commands to clone the repository into a directory "mywebsite" would be

git clone https://github.com/friendica/friendica.git mywebsite
cd mywebsite
util/composer.phar install
bin/composer.phar install

Make sure the folder *view/smarty3* exists and is writable by the webserver user



+ 1
- 1
doc/Update.md View File

@@ -21,7 +21,7 @@ You can get the latest changes at any time with

cd path/to/friendica
git pull
util/composer.phar install
bin/composer.phar install

The addon tree has to be updated separately like so:



+ 1
- 1
doc/de/Install.md View File

@@ -49,7 +49,7 @@ Wir planen, diese Einschränkung in einer zukünftigen Version zu beheben.

`cd meinewebseite`
`git pull`
`util/composer.phar install`
`bin/composer.phar install`

- Addons installieren
- zunächst solltest du **in** deinem Webseitenordner sein


Loading…
Cancel
Save