Skip to content

Commit

Permalink
Documentation and tweaks for release
Browse files Browse the repository at this point in the history
  • Loading branch information
johnstevenson committed Nov 11, 2017
1 parent b3abbe4 commit ac2b4fa
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
@@ -1,5 +1,5 @@
## v4.8.0
Not yet released
2017-11-11

* Changed error reporting by forcing all errors to stderr with ini overrides.
* Changed detection of old PHP versions for better error handling.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright (c) 2012-2016 John Stevenson
Copyright (c) 2012-2017 John Stevenson

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
12 changes: 11 additions & 1 deletion README.md
Expand Up @@ -5,6 +5,7 @@ The Windows installer for the [Composer][composer] PHP Dependency Manager. [**Do
## Contents
* [About](#About)
* [Details](#Details)
* [Php Ini File](#Php-Ini_File)
* [Troubleshooting](#Troubleshooting)
* [Uninstalling](#Uninstalling)
* [Install Locations](#Locations)
Expand Down Expand Up @@ -39,7 +40,7 @@ searches common locations on your computer and presents you with its findings. I
will display this value. If not, or you want to choose a different PHP, you must select from the list or hunt around manually.

The installer will then check that PHP and your path are set up correctly. If it finds any errors it will give you
the chance to fix them. It will also offer to either create or modify the `php.ini` file if required settings do not exist.
the chance to fix them. It will also offer to either create or modify the `php.ini` file if required settings do not exist. See [Php Ini File](#Php-Ini-File) for more information.

Next, the installer will ask if you need a proxy server to connect to the internet. If it finds any values in your
*Internet Settings* or your environment, then the proxy url will be displayed.
Expand All @@ -48,6 +49,15 @@ After you have reviewed and accepted your settings, the installer will download
environment has been changed, it is important to close your current terminal and open a new one so that the changes get
loaded. The installer will remind you if this is the case.

<a name="Php-Ini-File"></a>
## Php Ini File
Composer-Setup will either create a new `php.ini` or modify an existing file if any settings needed by Composer are missing:

* `allow_url_fopen` set to on
* `open_ssl` and `mbstring` extensions enabled

When creating a new file, the _php.ini-production_ file is used with `extension_dir` and `date.timezone` values appropriately set. When modifying an existing file, a backup is created in the same directory, named `php.ini~orig`.

<a name="Troubleshooting"></a>
## Troubleshooting
Composer-Setup creates a log file, which may be useful to review if you experience any issues. This is stored in your
Expand Down
3 changes: 2 additions & 1 deletion src/composer.iss
Expand Up @@ -1376,9 +1376,10 @@ begin
Result := '';
UintCode := ExitCode;
Suffix := ' Try reinstalling the program to fix this problem.';
AddStr(Suffix, ' Make sure you have installed the appropriate Visual C++ Redistributable.');
if ExitCode > 0 then
Result := SysErrorMessage(ExitCode)
Result := Format('Reported error: %s', [SysErrorMessage(ExitCode)])
else if UintCode = $C0000135 then
{STATUS_DLL_NOT_FOUND}
Result := 'The program cannot start because a dll was not found.' + Suffix;
Expand Down

0 comments on commit ac2b4fa

Please sign in to comment.